[Emacs-diffs] Changes to emacs/lisp/shell.el,v

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 07/08/29 13:34:42

Index: shell.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/shell.el,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -b -r1.153 -r1.154
--- shell.el    22 Aug 2007 19:47:57 -0000      1.153
+++ shell.el    29 Aug 2007 13:34:42 -0000      1.154
@@ -542,15 +542,16 @@
   (interactive
    (list
     (and current-prefix-arg
+        (prog1
         (read-buffer "Shell buffer: "
                      (generate-new-buffer-name "*shell*"))
-        (file-remote-p default-directory)
+          (if (file-remote-p default-directory)
         ;; It must be possible to declare a local default-directory.
         (setq default-directory
               (expand-file-name
                (read-file-name
                 "Default directory: " default-directory default-directory
-                t nil 'file-directory-p))))))
+                      t nil 'file-directory-p))))))))
   (setq buffer (get-buffer-create (or buffer "*shell*")))
   ;; Pop to buffer, so that the buffer's window will be correctly set
   ;; when we call comint (so that comint sets the COLUMNS env var properly).