diff options
| author | Richard M. Stallman | 1998-07-12 03:14:44 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-07-12 03:14:44 +0000 |
| commit | e73ec04be615e89924b6173325c6e888dcbb2cdd (patch) | |
| tree | 3367237f62557104ed04faacb019ddd29aa0385a | |
| parent | e59fe83bff7290cf5543e73752d65c71c1c23a16 (diff) | |
| download | emacs-e73ec04be615e89924b6173325c6e888dcbb2cdd.tar.gz emacs-e73ec04be615e89924b6173325c6e888dcbb2cdd.zip | |
(find-file-noselect-1): Use kill-local-variable on
buffer-file-coding-system, instead of setting it.
(save-buffer): Doc fix.
(basic-save-buffer): Doc fix.
| -rw-r--r-- | lisp/files.el | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/files.el b/lisp/files.el index 07c64a2bc27..1bd0ac57219 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -968,7 +968,7 @@ Optional second arg RAWFILE non-nil means the file is read literally." | |||
| 968 | (kill-local-variable 'find-file-literally) | 968 | (kill-local-variable 'find-file-literally) |
| 969 | ;; Needed in case we are re-visiting the file with a different | 969 | ;; Needed in case we are re-visiting the file with a different |
| 970 | ;; text representation. | 970 | ;; text representation. |
| 971 | (setq buffer-file-coding-system default-buffer-file-coding-system) | 971 | (kill-local-variable 'buffer-file-coding-system) |
| 972 | (erase-buffer) | 972 | (erase-buffer) |
| 973 | (and (default-value 'enable-multibyte-characters) | 973 | (and (default-value 'enable-multibyte-characters) |
| 974 | (not rawfile) | 974 | (not rawfile) |
| @@ -2183,7 +2183,9 @@ We don't want excessive versions piling up, so there are variables | |||
| 2183 | Defaults are 2 old versions and 2 new. | 2183 | Defaults are 2 old versions and 2 new. |
| 2184 | `dired-kept-versions' controls dired's clean-directory (.) command. | 2184 | `dired-kept-versions' controls dired's clean-directory (.) command. |
| 2185 | If `delete-old-versions' is nil, system will query user | 2185 | If `delete-old-versions' is nil, system will query user |
| 2186 | before trimming versions. Otherwise it does it silently." | 2186 | before trimming versions. Otherwise it does it silently. |
| 2187 | |||
| 2188 | See the subroutine `basic-save-buffer' for more information." | ||
| 2187 | (interactive "p") | 2189 | (interactive "p") |
| 2188 | (let ((modp (buffer-modified-p)) | 2190 | (let ((modp (buffer-modified-p)) |
| 2189 | (large (> (buffer-size) 50000)) | 2191 | (large (> (buffer-size) 50000)) |
| @@ -2220,7 +2222,10 @@ in such cases.") | |||
| 2220 | 2222 | ||
| 2221 | (defun basic-save-buffer () | 2223 | (defun basic-save-buffer () |
| 2222 | "Save the current buffer in its visited file, if it has been modified. | 2224 | "Save the current buffer in its visited file, if it has been modified. |
| 2223 | After saving the buffer, run `after-save-hook'." | 2225 | The hooks `write-contents-hooks', `local-write-file-hooks' and |
| 2226 | `write-file-hooks' get a chance to do the job of saving; if they do not, | ||
| 2227 | then the buffer is saved in the visited file file in the usual way. | ||
| 2228 | After saving the buffer, this function runs `after-save-hook'." | ||
| 2224 | (interactive) | 2229 | (interactive) |
| 2225 | (save-current-buffer | 2230 | (save-current-buffer |
| 2226 | ;; In an indirect buffer, save its base buffer instead. | 2231 | ;; In an indirect buffer, save its base buffer instead. |