2004-05-13 John Wiegley <johnw@newartisans.com>

	* eshell/esh-test.el (eshell-test): Call the function
	`emacs-version' rather than trying to build a custom version
	string.

2 files changed, 10 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d6077e9fe1..756b2abb63b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-13  John Wiegley  <johnw@newartisans.com>
+
+        * iswitchb.el (iswitchb-use-virtual-buffers): Only turn on
+        `recentf-mode' if this variable has been customized to t.
+
+        * eshell/esh-test.el (eshell-test): Call the function
+        `emacs-version' rather than trying to build a custom version
+        string.
+
 2004-05-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * net/telnet.el (telnet-mode): Use define-derived-mode.
diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el
index 54edf5e35ab..076505da14e 100644
--- a/lisp/eshell/esh-test.el
+++ b/lisp/eshell/esh-test.el
@@ -167,13 +167,7 @@
       (local-set-key [(control ?m)] 'eshell-test-goto-func)
       (local-set-key [return] 'eshell-test-goto-func)
 
-      (insert "Testing Eshell under "
-              (format "GNU Emacs %s (%s%s)"
-                      emacs-version
-                      system-configuration
-                      (cond ((featurep 'motif) ", Motif")
-                            ((featurep 'x-toolkit) ", X toolkit")
-                            (t ""))))
+      (insert "Testing Eshell under " (emacs-version))
       (switch-to-buffer test-buffer)
       (delete-other-windows))
     (eshell-for funcname (sort (all-completions "eshell-test--"