[Emacs-diffs] Changes to emacs/lisp/hexl.el [lexbind]

[Miles Bader]

Index: emacs/lisp/hexl.el
diff -c emacs/lisp/hexl.el:1.72.2.6 emacs/lisp/hexl.el:1.72.2.7
*** emacs/lisp/hexl.el:1.72.2.6 Tue Jul  6 10:10:47 2004
--- emacs/lisp/hexl.el  Wed Dec  8 23:36:20 2004
***************
*** 99,107 ****
--- 99,113 ----
  
  (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,245 ****
--- 246,259 ----
      (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,358 ****
--- 367,376 ----
    (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)