[Emacs-diffs] /srv/bzr/emacs/trunk r103410: Dired-X fix for bug#5216.

[Glenn Morris]

------------------------------------------------------------
revno: 103410
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-02-23 19:59:04 -0800
message:
  Dired-X fix for bug#5216.
  
  * lisp/dired-x.el (dired-hack-local-variables):
  Handle interrupts during hacking local variables.
modified:
  lisp/ChangeLog
  lisp/dired-x.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-24 03:53:27 +0000
+++ b/lisp/ChangeLog    2011-02-24 03:59:04 +0000
@@ -1,5 +1,8 @@
 2011-02-24  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'lisp/dired-x.el'
--- a/lisp/dired-x.el   2011-02-23 03:44:13 +0000
+++ b/lisp/dired-x.el   2011-02-24 03:59:04 +0000
@@ -774,12 +774,13 @@
            (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")