procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(find-file-noselect): Don't call set-buffer-major-mode.

Browse source 
(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.
This commit is contained in:
Richard M. Stallman 2005-08-09 13:35:12 +00:00
parent 61298e176c
commit e8f30180f4
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/ChangeLog
View file

@ -1,3 +1,22 @@
2005-08-09 Richard M. Stallman <rms@gnu.org>
* 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 <mange@freemail.hu>
* 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 <rms@gnu.org>
* progmodes/sql.el (sql-interactive-mode-map): Use fboundp.

11
lisp/files.el
View file

@ -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)