Commit b36f2f1c authored by Glenn Morris's avatar Glenn Morris

Dired-X fix for bug#5216.

* lisp/dired-x.el (dired-hack-local-variables):
Handle interrupts during hacking local variables.
parent 3cbbfdc3
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.
......
......@@ -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")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment