(eshell-get-target): If `eshell-buffer-shorthand' is in use, and the

target is `t' or `nil' (which are the most common values), don't
assume that the symbol target is a buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc0fbad4eb6fa98fdec5c12f731b757332ce60ca..2795764f959b9b0a209cae28274d938cf0950d52 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2005-05-26  John Wiegley  <johnw@newartisans.com>
+
+       * eshell/em-cmpl.el (eshell-complete-parse-arguments): If the
+       character before a space at the end of a line is \, assume the
+       space is part of the last argument rather than a final argument
+       separator.
+
+       * eshell/esh-io.el (eshell-get-target): If
+       `eshell-buffer-shorthand' is in use, and the target is `t' or
+       `nil' (which are the most common values), don't assume that the
+       symbol target is a buffer.
+
 2005-05-26  Luc Teirlinck  <teirllm@auburn.edu>
 
        * calendar/calendar.el (calendar-mode-line-format):

diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 6944770dbc9ac1f514b6e761b3a7744f5ac08ee7..1161013cf584ee59ce3a2da4d2fab14d0a8ccff3 100644 (file)
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -353,7 +353,8 @@ it defaults to `insert'."
    ((or (bufferp target)
        (and (boundp 'eshell-buffer-shorthand)
             (symbol-value 'eshell-buffer-shorthand)
-            (symbolp target)))
+            (symbolp target)
+            (not (memq target '(t nil)))))
     (let ((buf (if (bufferp target)
                   target
                 (get-buffer-create