From: John Wiegley <johnw@newartisans.com>
Date: Fri, 27 May 2005 02:15:36 +0000 (+0000)
Subject: (eshell-get-target): If `eshell-buffer-shorthand' is in use, and the
X-Git-Tag: emacs-pretest-22.0.90~9506
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c041409339fbd92ca875ba034bcf8ca3410330e;p=emacs.git

(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 fc0fbad4eb6..2795764f959 100644
--- 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 6944770dbc9..1161013cf58 100644
--- 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