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

[Masatake YAMATO]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Masatake YAMATO <jet>   06/11/30 16:10:04

Index: hexl.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/hexl.el,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- hexl.el     30 Nov 2006 15:55:14 -0000      1.108
+++ hexl.el     30 Nov 2006 16:10:03 -0000      1.109
@@ -100,17 +100,22 @@
 
 (defvar hexl-mode-map nil)
 
+;; Variable declarations for suppressing warnings from the byte-compiler.
 (defvar ruler-mode)
 (defvar ruler-mode-ruler-function)
 (defvar hl-line-mode)
+(defvar hl-line-range-function)
+(defvar hl-line-face)
 
+;; Variables where the original values are stored to.
+(defvar hexl-mode-old-hl-line-mode)
 (defvar hexl-mode-old-hl-line-range-function)
 (defvar hexl-mode-old-hl-line-face)
-(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-ruler-function)
 (defvar hexl-mode-old-isearch-search-fun-function)
 (defvar hexl-mode-old-require-final-newline)
 (defvar hexl-mode-old-syntax-table)
@@ -261,11 +266,6 @@
     (setq hexl-mode-old-hl-line-mode
          (and (boundp 'hl-line-mode) hl-line-mode))
 
-    (set (make-local-variable 'hexl-mode-old-hl-line-range-function)
-         hl-line-range-function)
-    (set (make-local-variable 'hexl-mode-old-hl-line-face)
-         hl-line-face)
-
     (make-local-variable 'hexl-mode-old-syntax-table)
     (setq hexl-mode-old-syntax-table (syntax-table))
     (set-syntax-table (standard-syntax-table))
@@ -393,11 +393,15 @@
 
   (if (and (boundp 'ruler-mode) ruler-mode (not hexl-mode-old-ruler-mode))
       (ruler-mode 0))
+  (when (boundp 'hexl-mode-old-ruler-function)
+    (setq ruler-mode-ruler-function hexl-mode-old-ruler-function))
+
   (if (and (boundp 'hl-line-mode) hl-line-mode (not 
hexl-mode-old-hl-line-mode))
       (hl-line-mode 0))
-
-  (set 'hl-line-range-function hexl-mode-old-hl-line-range-function)
-  (set 'hl-line-face hexl-mode-old-hl-line-face)
+  (when (boundp 'hexl-mode-old-hl-line-range-function)
+    (setq hl-line-range-function hexl-mode-old-hl-line-range-function))
+  (when (boundp hexl-mode-old-hl-line-face)
+    (setq hl-line-face hexl-mode-old-hl-line-face))
 
   (setq require-final-newline hexl-mode-old-require-final-newline)
   (setq mode-name hexl-mode-old-mode-name)
@@ -940,19 +944,26 @@
 (defun hexl-activate-ruler ()
   "Activate `ruler-mode'."
   (require 'ruler-mode)
+  (unless (boundp 'hexl-mode-old-ruler-function)
+    (set (make-local-variable 'hexl-mode-old-ruler-function)
+        ruler-mode-ruler-function))
   (set (make-local-variable 'ruler-mode-ruler-function)
        'hexl-mode-ruler)
   (ruler-mode 1))
 
 (defun hexl-follow-line ()
   "Activate `hl-line-mode'."
-  (require 'frame)
   (require 'hl-line)
-  (with-no-warnings
+  (unless (boundp 'hexl-mode-old-hl-line-range-function)
+    (set (make-local-variable 'hexl-mode-old-hl-line-range-function)
+        hl-line-range-function))
+  (unless (boundp 'hexl-mode-old-hl-line-face)
+    (set (make-local-variable 'hexl-mode-old-hl-line-face)
+        hl-line-face))
     (set (make-local-variable 'hl-line-range-function)
         'hexl-highlight-line-range)
     (set (make-local-variable 'hl-line-face)
-        'highlight))
+       'highlight)
   (hl-line-mode 1))
 
 (defun hexl-highlight-line-range ()