changeset 106264:5fa7590f242f

(eshell/cd): Don't throw to a tag outside the scope. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557572
author Glenn Morris <rgm@gnu.org>
date Thu, 26 Nov 2009 03:09:58 +0000
parents e08955916fa6
children fbb51bb535e8
files lisp/ChangeLog lisp/eshell/em-dirs.el
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Nov 26 03:08:30 2009 +0000
+++ b/lisp/ChangeLog	Thu Nov 26 03:09:58 2009 +0000
@@ -1,3 +1,7 @@
+2009-11-26  Glenn Morris  <rgm@gnu.org>
+
+	* eshell/em-dirs.el (eshell/cd): Don't throw to a tag outside the scope.
+
 2009-11-25  Johan Bockgård  <bojohan@gnu.org>
 
 	* vc-annotate.el (vc-annotate-revision-previous-to-line):
--- a/lisp/eshell/em-dirs.el	Thu Nov 26 03:08:30 2009 +0000
+++ b/lisp/eshell/em-dirs.el	Thu Nov 26 03:09:58 2009 +0000
@@ -401,8 +401,8 @@
 	       (eshell-printn result)))
 	(run-hooks 'eshell-directory-change-hook)
 	(if eshell-list-files-after-cd
-	    (throw 'eshell-replace-command
-		   (eshell-parse-command "ls" (cdr args))))
+	    ;; Let-bind eshell-last-command around this?
+	    (eshell-plain-command "ls" (cdr args)))
 	nil))))
 
 (put 'eshell/cd 'eshell-no-numeric-conversions t)