From e8f30180f4fad05b793829966e4cb78539f38d33 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 9 Aug 2005 13:35:12 +0000 Subject: [PATCH] (find-file-noselect): Don't call set-buffer-major-mode. (find-file-noselect-1): Call it here, only if RAWFILE. (normal-mode): Always set some major mode. (save-some-buffers-action-alist): Change some explanation strings. (file-name-non-special): In the `quote' method, use unwind-protect. --- lisp/ChangeLog | 19 +++++++++++++++++++ lisp/files.el | 11 ++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bdf55d10e9f..1fa27e44974 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,22 @@ +2005-08-09 Richard M. Stallman + + * files.el (find-file-noselect): Don't call set-buffer-major-mode. + (find-file-noselect-1): Call it here, only if RAWFILE. + (normal-mode): Always set some major mode. + (save-some-buffers-action-alist): Change some explanation strings. + (file-name-non-special): In the `quote' method, use unwind-protect. + +2005-08-09 Magnus Henoch + + * textmodes/ispell.el (aspell-have-dictionaries): New variable. + (aspell-find-dictionaries): New command. + (aspell-data-dir): New variable. + (aspell-find-data-dir): New function. + (aspell-find-dictionary): New function. + (ispell-valid-dictionary-list): Call aspell-find-dictionaries if + appropriate. Don't look for ispell dictionaries if we use + aspell. + 2005-08-09 Richard M. Stallman * progmodes/sql.el (sql-interactive-mode-map): Use fboundp. diff --git a/lisp/files.el b/lisp/files.el index 8850928d94a..35afa099012 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1464,7 +1464,6 @@ the various files." 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)))))) @@ -1538,6 +1537,7 @@ the various files." (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,7 +1727,7 @@ not set local variables (though we do notice a mode specified with -*-.) 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))) + (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,9 +3450,9 @@ This requires the external program `diff' to be in your `exec-path'." (recursive-edit) ;; Return nil to ask about BUF again. nil) - "display the current buffer") + "view this file") (?d diff-buffer-with-file - "show difference to last saved version")) + "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,7 +4844,8 @@ With prefix arg, silently save all file-visiting buffers, then kill." ((eq method 'add) (concat "/:" (apply operation arguments))) ((eq method 'quote) - (prog1 (apply operation arguments) + (unwind-protect + (apply operation arguments) (setq buffer-file-name (concat "/:" buffer-file-name)))) ((eq method 'unquote-then-quote) (let (res) -- 2.39.2