* lisp/hexl.el (hexl-mode-old-*): Remove.

(hexl-mode--old-var-vals): New var to replace them.
(hexl-mode--minor-mode-p, hexl-mode--setq-local): New funs.
(hexl-mode, hexl-follow-line, hexl-activate-ruler):
Use them to set local vars.
(hexl-mode-exit): Use hexl-mode--old-var-vals to restore state.
(hexl-backward-short, hexl-backward-word, hexl-scroll-down)
(hexl-scroll-up, hexl-end-of-1k-page, hexl-end-of-512b-page): Simplify.

Fixes: debbugs:7846

1 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 320335c4e7a..3c88bb33646 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2011-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * hexl.el (hexl-mode-old-*): Remove.
+        (hexl-mode--old-var-vals): New var to replace them.
+        (hexl-mode--minor-mode-p, hexl-mode--setq-local): New funs.
+        (hexl-mode, hexl-follow-line, hexl-activate-ruler):
+        Use them to set local vars (bug#7846).
+        (hexl-mode-exit): Use hexl-mode--old-var-vals to restore state.
+        (hexl-backward-short, hexl-backward-word, hexl-scroll-down)
+        (hexl-scroll-up, hexl-end-of-1k-page, hexl-end-of-512b-page): Simplify.
+
         * vc/smerge-mode.el: Resolve comment conflicts more aggressively.
         (smerge-resolve--normalize-re): New var.
         (smerge-resolve--extract-comment, smerge-resolve--normalize): New funs.