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

Dired-X fix for bug#5216.

Browse source 
* lisp/dired-x.el (dired-hack-local-variables):
Handle interrupts during hacking local variables.
This commit is contained in:
Glenn Morris 2011-02-23 19:59:04 -08:00
parent 3cbbfdc34f
commit b36f2f1cb8
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2011-02-24 Glenn Morris <rgm@gnu.org>
* dired-x.el (dired-hack-local-variables):
Handle interrupts during hacking local variables. (Bug#5216)
* emacs-lisp/autoload.el (autoload-save-buffers)
(autoload-find-destination, update-directory-autoloads):
Avoid prompts when updating autoloads.

11
lisp/dired-x.el
View file

@ -774,12 +774,13 @@ See also `dired-enable-local-variables'."
(insert "\^L\n")
(insert-file-contents dired-local-variables-file))
;; Hack 'em.
(let ((buffer-file-name dired-local-variables-file))
(hack-local-variables))
(unwind-protect
(let ((buffer-file-name dired-local-variables-file))
(hack-local-variables))
;; Delete this stuff: `eobp' is used to find last subdir by dired.el.
(delete-region opoint (point-max)))
;; Make sure that the modeline shows the proper information.
(dired-sort-set-modeline)
;; Delete this stuff: `eobp' is used to find last subdir by dired.el.
(delete-region opoint (point-max)))))
(dired-sort-set-modeline))))
(make-obsolete 'dired-hack-local-variables
'hack-dir-local-variables-non-file-buffer "24.1")