[Emacs-diffs] /srv/bzr/emacs/trunk r106046: * lisp/eshell/eshell.el (eshell-command): History have to be saved only in interactive use to avoid error.

[thierry volpiatto]

------------------------------------------------------------
revno: 106046
committer: thierry volpiatto <address@hidden
branch nick: trunk
timestamp: Tue 2011-10-11 07:41:39 +0200
message:
  * lisp/eshell/eshell.el (eshell-command): History have to be saved only in 
interactive use to avoid error.
modified:
  lisp/ChangeLog
  lisp/eshell/eshell.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-11 05:17:04 +0000
+++ b/lisp/ChangeLog    2011-10-11 05:41:39 +0000
@@ -1,3 +1,8 @@
+2011-10-11  Thierry Volpiatto  <address@hidden>
+
+       * lisp/eshell/eshell.el (eshell-command): History have to be saved 
+       only in interactive use to avoid error.
+       
 2011-10-11  Stefan Monnier  <address@hidden>
 
        * minibuffer.el (completion-file-name-table): Fix last change,

=== modified file 'lisp/eshell/eshell.el'
--- a/lisp/eshell/eshell.el     2011-10-08 06:08:00 +0000
+++ b/lisp/eshell/eshell.el     2011-10-11 05:41:39 +0000
@@ -349,11 +349,9 @@
     (minibuffer-with-setup-hook #'(lambda ()
                                     (eshell-mode)
                                     (eshell-return-exits-minibuffer))
-      (unwind-protect
-           (unless command
-             (setq command (read-from-minibuffer "Emacs shell command: ")))
-        (when command
-          (eshell-add-input-to-history command)))))
+      (unless command
+        (setq command (read-from-minibuffer "Emacs shell command: "))
+        (eshell-add-input-to-history command))))
   (unless command
     (error "No command specified!"))
   ;; redirection into the current buffer is achieved by adding an