diff options
author | Glenn Morris <rgm@gnu.org> | 2011-02-23 19:59:04 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2011-02-23 19:59:04 -0800 |
commit | b36f2f1cb8fc121bf6fe44e5260d114a9f46d950 (patch) | |
tree | 091054fc562c72092dd1aaf43af3f37332664ed1 /lisp/dired-x.el | |
parent | 3cbbfdc34f9ef2c32f485b8d3ce444689115fa3c (diff) | |
download | emacs-b36f2f1cb8fc121bf6fe44e5260d114a9f46d950.tar.gz |
Dired-X fix for bug#5216.
* lisp/dired-x.el (dired-hack-local-variables):
Handle interrupts during hacking local variables.
Diffstat (limited to 'lisp/dired-x.el')
-rw-r--r-- | lisp/dired-x.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/dired-x.el b/lisp/dired-x.el index dcf8906976b..ce07676fc99 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -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") |