diff options
| author | Chong Yidong | 2006-02-15 01:32:50 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-02-15 01:32:50 +0000 |
| commit | 0a158521c591c4e81e544ef60956543b0d59e86d (patch) | |
| tree | 6a19641c7f795299374cd820dacc107458144673 | |
| parent | 42078bb225a979a791d8b33528ae1c96e4bd19cf (diff) | |
| download | emacs-0a158521c591c4e81e544ef60956543b0d59e86d.tar.gz emacs-0a158521c591c4e81e544ef60956543b0d59e86d.zip | |
* files.el (hack-local-variables-confirm): Kill temp buffer after use.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/files.el | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d691f30b035..10b4816e9e7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 2006-02-14 Chong Yidong <cyd@stupidchicken.com> | 1 | 2006-02-14 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * files.el (hack-local-variables-confirm): Allow scrolling if the | 3 | * files.el (hack-local-variables-confirm): Allow scrolling if the |
| 4 | file variable list is too long. | 4 | file variable list is too long. Kill temp buffer after use. |
| 5 | 5 | ||
| 6 | 2006-02-15 Nick Roberts <nickrob@snap.net.nz> | 6 | 2006-02-15 Nick Roberts <nickrob@snap.net.nz> |
| 7 | 7 | ||
diff --git a/lisp/files.el b/lisp/files.el index 7b0c5e591c1..285cd50e6af 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -2225,10 +2225,9 @@ Otherwise, return nil; point may be changed." | |||
| 2225 | (let ((name (if buffer-file-name | 2225 | (let ((name (if buffer-file-name |
| 2226 | (file-name-nondirectory buffer-file-name) | 2226 | (file-name-nondirectory buffer-file-name) |
| 2227 | (concat "buffer " (buffer-name)))) | 2227 | (concat "buffer " (buffer-name)))) |
| 2228 | char) | 2228 | prompt char) |
| 2229 | (save-window-excursion | 2229 | (save-window-excursion |
| 2230 | (let ((buf (get-buffer-create "*Local Variables*")) | 2230 | (let ((buf (get-buffer-create "*Local Variables*"))) |
| 2231 | (prompt)) | ||
| 2232 | (pop-to-buffer buf) | 2231 | (pop-to-buffer buf) |
| 2233 | (set (make-local-variable 'cursor-type) nil) | 2232 | (set (make-local-variable 'cursor-type) nil) |
| 2234 | (erase-buffer) | 2233 | (erase-buffer) |
| @@ -2284,6 +2283,7 @@ n -- to ignore the local variables list. | |||
| 2284 | (customize-save-variable | 2283 | (customize-save-variable |
| 2285 | 'safe-local-variable-values | 2284 | 'safe-local-variable-values |
| 2286 | safe-local-variable-values)) | 2285 | safe-local-variable-values)) |
| 2286 | (kill-buffer buf) | ||
| 2287 | (or (= char ?!) | 2287 | (or (= char ?!) |
| 2288 | (= char ?\s) | 2288 | (= char ?\s) |
| 2289 | (= char ?y))))))) | 2289 | (= char ?y))))))) |