From: Glenn Morris Date: Thu, 26 Nov 2009 03:09:58 +0000 (+0000) Subject: (eshell/cd): Don't throw to a tag outside the scope. X-Git-Tag: emacs-pretest-23.1.90~214 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7629c4e74505fcb3d569d5b6fae85e304594986a;p=emacs.git (eshell/cd): Don't throw to a tag outside the scope. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557572 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 598fc925a25..e675c4fdd1b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-11-26 Glenn Morris + + * eshell/em-dirs.el (eshell/cd): Don't throw to a tag outside the scope. + 2009-11-25 Johan Bockgård * vc-annotate.el (vc-annotate-revision-previous-to-line): diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index cc95d810213..5815430bf31 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -401,8 +401,8 @@ in the minibuffer: (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)