(hexl-mode-old-hl-line-mode, hexl-mode-old-ruler-mode): New variables.

(hexl-mode): Set those variables, record ruler-mode and hl-line-mode.
(hexl-mode-exit): Restore status of ruler-mode and hl-line-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d00baddbf56eb530501afeb2ec66e03f1601aea7..cf69f70003743f632adb4b516575c65b8846643b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-20  Richard M. Stallman  <rms@gnu.org>
 
+       * hexl.el (hexl-mode-old-hl-line-mode, hexl-mode-old-ruler-mode): 
+       New variables.
+       (hexl-mode): Set those variables, record ruler-mode and hl-line-mode.
+       (hexl-mode-exit): Restore status of ruler-mode and hl-line-mode.
+
        * imenu.el (imenu--generic-function):
        Ensure we keep moving backward even if BEG isn't further back.
 

diff --git a/lisp/hexl.el b/lisp/hexl.el
index 883700933a8984783ea3c3b8301190b0810704ad..f5b83c0afdecd78d2b0977a9a82ee979bbafd8af 100644 (file)
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -99,9 +99,15 @@ Quoting cannot be used, so the arguments cannot themselves contain spaces."
 
 (defvar hexl-mode-map nil)
 
+(defvar ruler-mode)
+(defvar ruler-mode-ruler-function)
+(defvar hl-line-mode)
+
+(defvar hexl-mode-old-hl-line-mode)
 (defvar hexl-mode-old-local-map)
 (defvar hexl-mode-old-mode-name)
 (defvar hexl-mode-old-major-mode)
+(defvar hexl-mode-old-ruler-mode)
 (defvar hexl-mode-old-isearch-search-fun-function)
 (defvar hexl-mode-old-require-final-newline)
 (defvar hexl-mode-old-syntax-table)
@@ -240,6 +246,14 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
     (setq hexl-mode-old-major-mode major-mode)
     (setq major-mode 'hexl-mode)
 
+    (make-local-variable 'hexl-mode-old-ruler-mode)
+    (setq hexl-mode-old-ruler-mode
+         (and (boundp 'ruler-mode) ruler-mode))
+
+    (make-local-variable 'hexl-mode-old-hl-line-mode)
+    (setq hexl-mode-old-hl-line-mode
+         (and (boundp 'hl-line-mode) hl-line-mode))
+
     (make-local-variable 'hexl-mode-old-syntax-table)
     (setq hexl-mode-old-syntax-table (syntax-table))
     (set-syntax-table (standard-syntax-table))
@@ -353,6 +367,10 @@ With arg, don't unhexlify buffer."
   (remove-hook 'post-command-hook 'hexl-follow-ascii-find t)
   (setq hexl-ascii-overlay nil)
 
+  (if (and (boundp 'ruler-mode) ruler-mode (not hexl-mode-old-ruler-mode))
+      (ruler-mode 0))
+  (if (and (boundp 'hl-line-mode) hl-line-mode (not hexl-mode-old-hl-line-mode))
+      (hl-line-mode 0))
   (setq require-final-newline hexl-mode-old-require-final-newline)
   (setq mode-name hexl-mode-old-mode-name)
   (setq isearch-search-fun-function hexl-mode-old-isearch-search-fun-function)