-;;; em-banner.el --- sample module that displays a login banner
+;;; em-banner.el --- sample module that displays a login banner -*- lexical-binding:t -*-
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;; 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2016 Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;;; Code:
(eval-when-compile
- (require 'cl)
- (require 'esh-mode)
- (require 'eshell))
+ (require 'cl-lib))
(require 'esh-util)
+(require 'esh-mode)
+(require 'eshell)
;;;###autoload
-(eshell-defgroup eshell-banner nil
+(progn
+(defgroup eshell-banner nil
"This sample module displays a welcome banner at login.
It exists so that others wishing to create their own Eshell extension
modules may have a simple template to begin with."
:tag "Login banner"
;; :link '(info-link "(eshell)Login banner")
- :group 'eshell-module)
+ :group 'eshell-module))
;;; User Variables:
(defcustom eshell-banner-message "Welcome to the Emacs shell\n\n"
- "*The banner message to be displayed when Eshell is loaded.
+ "The banner message to be displayed when Eshell is loaded.
This can be any sexp, and should end with at least two newlines."
:type 'sexp
:group 'eshell-banner)
(put 'eshell-banner-message 'risky-local-variable t)
-(defcustom eshell-banner-load-hook '(eshell-banner-initialize)
- "*A list of functions to run when `eshell-banner' is loaded."
+(defcustom eshell-banner-load-hook nil
+ "A list of functions to run when `eshell-banner' is loaded."
+ :version "24.1" ; removed eshell-banner-initialize
:type 'hook
:group 'eshell-banner)
;; `insert', because `insert' doesn't know how to interact with the
;; I/O code used by Eshell
(unless eshell-non-interactive-p
- (assert eshell-mode)
- (assert eshell-banner-message)
+ (cl-assert eshell-mode)
+ (cl-assert eshell-banner-message)
(let ((msg (eval eshell-banner-message)))
- (assert msg)
+ (cl-assert msg)
(eshell-interactive-print msg))))
-(eshell-deftest banner banner-displayed
- "Startup banner is displayed at point-min"
- (assert eshell-banner-message)
- (let ((msg (eval eshell-banner-message)))
- (assert msg)
- (goto-char (point-min))
- (looking-at msg)))
-
(provide 'em-banner)
;; Local Variables:
;; generated-autoload-file: "esh-groups.el"
;; End:
-;; arch-tag: e738b4ef-8671-42ae-a757-291779b92491
;;; em-banner.el ends here