[Emacs-diffs] emacs/lisp ChangeLog eshell/em-dirs.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/11/26 03:10:16

Modified files:
        lisp           : ChangeLog 
        lisp/eshell    : em-dirs.el 

Log message:
        (eshell/cd): Don't throw to a tag outside the scope.
        http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557572

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16744&r2=1.16745
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/eshell/em-dirs.el?cvsroot=emacs&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16744
retrieving revision 1.16745
diff -u -b -r1.16744 -r1.16745
--- ChangeLog   26 Nov 2009 03:08:30 -0000      1.16744
+++ ChangeLog   26 Nov 2009 03:09:58 -0000      1.16745
@@ -1,3 +1,7 @@
+2009-11-26  Glenn Morris  <address@hidden>
+
+       * eshell/em-dirs.el (eshell/cd): Don't throw to a tag outside the scope.
+
 2009-11-25  Johan Bockgård  <address@hidden>
 
        * vc-annotate.el (vc-annotate-revision-previous-to-line):

Index: eshell/em-dirs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/eshell/em-dirs.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- eshell/em-dirs.el   13 Sep 2009 02:16:28 -0000      1.30
+++ eshell/em-dirs.el   26 Nov 2009 03:10:08 -0000      1.31
@@ -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)