[Emacs-diffs] Changes to emacs/lisp/files.el

[Richard M . Stallman]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.777 emacs/lisp/files.el:1.778
*** emacs/lisp/files.el:1.777   Mon Jul  4 23:08:54 2005
--- emacs/lisp/files.el Fri Jul  8 22:53:47 2005
***************
*** 2544,2549 ****
--- 2544,2553 ----
          (setq truename (file-truename filename))
          (if find-file-visit-truename
              (setq filename truename))))
+     (if filename
+       (let ((new-name (file-name-nondirectory buffer-file-name)))
+         (if (string= new-name "")
+             (error "Empty file name"))))
      (let ((buffer (and filename (find-buffer-visiting filename))))
        (and buffer (not (eq buffer (current-buffer)))
           (not no-query)
***************
*** 2557,2564 ****
      (setq buffer-file-name filename)
      (if filename                      ; make buffer name reflect filename.
        (let ((new-name (file-name-nondirectory buffer-file-name)))
-         (if (string= new-name "")
-             (error "Empty file name"))
          (if (eq system-type 'vax-vms)
              (setq new-name (downcase new-name)))
          (setq default-directory (file-name-directory buffer-file-name))
--- 2561,2566 ----
***************
*** 4004,4010 ****
    (while list
      (let* ((buffer (car list))
           (name (buffer-name buffer)))
!       (and (not (string-equal name ""))
           (/= (aref name 0) ? )
           (yes-or-no-p
            (format "Buffer %s %s.  Kill? "
--- 4006,4014 ----
    (while list
      (let* ((buffer (car list))
           (name (buffer-name buffer)))
!       (and name                               ; Can be nil for an indirect 
buffer
!                                       ; if we killed the base buffer.
!          (not (string-equal name ""))
           (/= (aref name 0) ? )
           (yes-or-no-p
            (format "Buffer %s %s.  Kill? "