5 files changed, 14 insertions, 14 deletions
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index 37fa939cc10..ef59f6d1d35 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -63,10 +63,13 @@ which commands are considered visual in nature."
   :type '(repeat string)
   :group 'eshell-term)
 
-(defcustom eshell-term-name "eterm"
+;; If you change this from term-term-name, you need to ensure that the
+;; value you choose exists in the system's terminfo database.  (Bug#12485)
+(defcustom eshell-term-name term-term-name
   "Name to use for the TERM variable when running visual commands.
 See `term-term-name' in term.el for more information on how this is
 used."
+  :version "24.3"	       ; eterm -> term-term-name = eterm-color
   :type 'string
   :group 'eshell-term)
 
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 515a23f81d7..5a10721387b 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1216,11 +1216,12 @@ COMMAND may result in an alias being executed, or a plain command."
   (let* ((sym (intern-soft (concat "eshell/" name)))
 	 (file (symbol-file sym 'defun)))
     ;; If the function exists, but is defined in an eshell module
-    ;; that's not currently enabled, don't report it as found
+    ;; that's not currently enabled, don't report it as found.
     (if (and file
-	     (string-match "\\(em\\|esh\\)-\\(.*\\)\\(\\.el\\)?\\'" file))
+	     (setq file (file-name-base file))
+	     (string-match "\\`\\(em\\|esh\\)-\\([[:alnum:]]+\\)\\'" file))
 	(let ((module-sym
-	       (intern (file-name-base (concat "eshell-" (match-string 2 file))))))
+	       (intern (concat "eshell-" (match-string 2 file)))))
 	  (if (and (functionp sym)
 		   (or (null module-sym)
 		       (eshell-using-module module-sym)
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 8a9107e5470..673632400f2 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -193,14 +193,14 @@ This is used by `eshell-watch-for-password-prompt'."
   :type '(choice (const nil) function)
   :group 'eshell-mode)
 
+(define-obsolete-variable-alias 'eshell-status-in-modeline
+  'eshell-status-in-mode-line "24.3")
+
 (defcustom eshell-status-in-mode-line t
   "If non-nil, let the user know a command is running in the mode line."
   :type 'boolean
   :group 'eshell-mode)
 
-(define-obsolete-variable-alias 'eshell-status-in-modeline
-  'eshell-status-in-mode-line "24.3")
-
 (defvar eshell-first-time-p t
   "A variable which is non-nil the first time Eshell is loaded.")
 
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index fa0336232f9..01df5fced62 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -275,6 +275,7 @@ Prepend remote identification of `default-directory', if any."
 
 (defmacro eshell-for (for-var for-list &rest forms)
   "Iterate through a list."
+  (declare (obsolete dolist "24.1"))
   (declare (indent 2))
   `(let ((list-iter ,for-list))
      (while list-iter
@@ -282,9 +283,6 @@ Prepend remote identification of `default-directory', if any."
 	 ,@forms)
        (setq list-iter (cdr list-iter)))))
 
-
-(make-obsolete 'eshell-for 'dolist "24.1")
-
 (defun eshell-flatten-list (args)
   "Flatten any lists within ARGS, so that there are no sublists."
   (let ((new-list (list t)))
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index c663de3f40d..a9a854221a4 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -243,16 +243,14 @@ shells such as bash, zsh, rc, 4dos."
 
 (defun eshell-add-to-window-buffer-names ()
   "Add `eshell-buffer-name' to `same-window-buffer-names'."
+  (declare (obsolete nil "24.3"))
   (add-to-list 'same-window-buffer-names eshell-buffer-name))
-(make-obsolete 'eshell-add-to-window-buffer-names
-	       "no longer needed." "24.3")
 
 (defun eshell-remove-from-window-buffer-names ()
   "Remove `eshell-buffer-name' from `same-window-buffer-names'."
+  (declare (obsolete nil "24.3"))
   (setq same-window-buffer-names
 	(delete eshell-buffer-name same-window-buffer-names)))
-(make-obsolete 'eshell-remove-from-window-buffer-names
-	       "no longer needed." "24.3")
 
 (defcustom eshell-load-hook nil
   "A hook run once Eshell has been loaded."