merge from trunk

2 files changed, 14 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df9fce72dd9..f633f5f5de7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-08-23  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (interpreter-mode-alist): Use tcl-mode for expect scripts.
+
+        * files.el (create-file-buffer): Handle the vital case of a file
+        whose basename is all spaces.  (Bug#15162)
+
 2013-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * textmodes/fill.el (fill-match-adaptive-prefix): Don't throw away
diff --git a/lisp/files.el b/lisp/files.el
index efd89605b1b..9adbca10369 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1604,12 +1604,16 @@ killed."
 FILENAME (sans directory) is used unchanged if that name is free;
 otherwise a string <2> or <3> or ... is appended to get an unused name.
 Spaces at the start of FILENAME (sans directory) are removed."
+  ;; ^ Because buffers whose name begins with a space are treated as
+  ;; internal Emacs buffers.
   (let ((lastname (file-name-nondirectory filename)))
     (if (string= lastname "")
         (setq lastname filename))
     (save-match-data
-      (string-match "^ *\\(.*\\)" lastname)
-      (generate-new-buffer (match-string 1 lastname)))))
+      (if (string-match "\\` +\\(.*\\)" lastname)
+          (if (zerop (length (setq lastname (match-string 1 lastname))))
+              (setq lastname "SPC"))))  ; bug#15162
+    (generate-new-buffer lastname)))
 
 (defun generate-new-buffer (name)
   "Create and return a buffer with a name based on NAME.
@@ -2451,6 +2455,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
      ("wishx" . tcl-mode)
      ("tcl" . tcl-mode)
      ("tclsh" . tcl-mode)
+     ("expect" . tcl-mode)
      ("scm" . scheme-mode)
      ("ash" . sh-mode)
      ("bash" . sh-mode)