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

[Richard M . Stallman]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.782 emacs/lisp/files.el:1.783
*** emacs/lisp/files.el:1.782   Sat Aug  6 22:13:42 2005
--- emacs/lisp/files.el Tue Aug  9 13:35:03 2005
***************
*** 1464,1470 ****
              buf)
          ;; Create a new buffer.
          (setq buf (create-file-buffer filename))
-         (set-buffer-major-mode buf)
          ;; find-file-noselect-1 may use a different buffer.
          (find-file-noselect-1 buf filename nowarn
                                rawfile truename number))))))
--- 1464,1469 ----
***************
*** 1538,1543 ****
--- 1537,1543 ----
          (progn
            (set-buffer-multibyte nil)
            (setq buffer-file-coding-system 'no-conversion)
+           (set-buffer-major-mode buf)
            (make-local-variable 'find-file-literally)
            (setq find-file-literally t))
        (after-find-file error (not nowarn)))
***************
*** 1727,1733 ****
  or from Lisp without specifying the optional argument FIND-FILE;
  in that case, this function acts as if `enable-local-variables' were t."
    (interactive)
!   (or find-file (funcall (or default-major-mode 'fundamental-mode)))
    (let ((enable-local-variables (or (not find-file) enable-local-variables)))
      (report-errors "File mode specification error: %s"
        (set-auto-mode))
--- 1727,1733 ----
  or from Lisp without specifying the optional argument FIND-FILE;
  in that case, this function acts as if `enable-local-variables' were t."
    (interactive)
!   (funcall (or default-major-mode 'fundamental-mode))
    (let ((enable-local-variables (or (not find-file) enable-local-variables)))
      (report-errors "File mode specification error: %s"
        (set-auto-mode))
***************
*** 3450,3458 ****
         (recursive-edit)
         ;; Return nil to ask about BUF again.
         nil)
!      "display the current buffer")
      (?d diff-buffer-with-file
!       "show difference to last saved version"))
    "ACTION-ALIST argument used in call to `map-y-or-n-p'.")
  (put 'save-some-buffers-action-alist 'risky-local-variable t)
  
--- 3450,3458 ----
         (recursive-edit)
         ;; Return nil to ask about BUF again.
         nil)
!      "view this file")
      (?d diff-buffer-with-file
!       "view changes in file"))
    "ACTION-ALIST argument used in call to `map-y-or-n-p'.")
  (put 'save-some-buffers-action-alist 'risky-local-variable t)
  
***************
*** 4844,4850 ****
          ((eq method 'add)
           (concat "/:" (apply operation arguments)))
          ((eq method 'quote)
!          (prog1 (apply operation arguments)
             (setq buffer-file-name (concat "/:" buffer-file-name))))
          ((eq method 'unquote-then-quote)
           (let (res)
--- 4844,4851 ----
          ((eq method 'add)
           (concat "/:" (apply operation arguments)))
          ((eq method 'quote)
!          (unwind-protect
!              (apply operation arguments)
             (setq buffer-file-name (concat "/:" buffer-file-name))))
          ((eq method 'unquote-then-quote)
           (let (res)