aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasatake YAMATO2006-11-30 15:55:14 +0000
committerMasatake YAMATO2006-11-30 15:55:14 +0000
commit6ac2ae62e26f7bc9d4012d14cc3294a2abc5dc38 (patch)
tree6811f87236e13b22fc3c0f50afb202016fe13943
parent33fac69773cb682f32d9ae46f6a0ce4e2740d372 (diff)
downloademacs-6ac2ae62e26f7bc9d4012d14cc3294a2abc5dc38.tar.gz
emacs-6ac2ae62e26f7bc9d4012d14cc3294a2abc5dc38.zip
(hexl-mode-old-hl-line-range-function): New variable
(hexl-mode-old-hl-line-face): New variable (hexl-mode, hexl-mode-exit): Fix the highlighting of the current line when exit from the hexl-mode.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/hexl.el11
2 files changed, 18 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12ba2ee7449..fadb2e2501b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12006-11-29 Alin C. Soare <alinsoar@voila.fr> (tiny change)
2
3 * lisp/hexl.el (hexl-mode-old-hl-line-range-function): New variable
4 (hexl-mode-old-hl-line-face): New variable
5 (hexl-mode, hexl-mode-exit): Fix the highlighting of the current
6 line when exit from the hexl-mode.
7
12006-11-30 Juanma Barranquero <lekktu@gmail.com> 82006-11-30 Juanma Barranquero <lekktu@gmail.com>
2 9
3 * international/fontset.el (create-fontset-from-ascii-font) 10 * international/fontset.el (create-fontset-from-ascii-font)
diff --git a/lisp/hexl.el b/lisp/hexl.el
index ff7c4bf480e..5cb30e53862 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -104,6 +104,8 @@ Quoting cannot be used, so the arguments cannot themselves contain spaces."
104(defvar ruler-mode-ruler-function) 104(defvar ruler-mode-ruler-function)
105(defvar hl-line-mode) 105(defvar hl-line-mode)
106 106
107(defvar hexl-mode-old-hl-line-range-function)
108(defvar hexl-mode-old-hl-line-face)
107(defvar hexl-mode-old-hl-line-mode) 109(defvar hexl-mode-old-hl-line-mode)
108(defvar hexl-mode-old-local-map) 110(defvar hexl-mode-old-local-map)
109(defvar hexl-mode-old-mode-name) 111(defvar hexl-mode-old-mode-name)
@@ -259,6 +261,11 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
259 (setq hexl-mode-old-hl-line-mode 261 (setq hexl-mode-old-hl-line-mode
260 (and (boundp 'hl-line-mode) hl-line-mode)) 262 (and (boundp 'hl-line-mode) hl-line-mode))
261 263
264 (set (make-local-variable 'hexl-mode-old-hl-line-range-function)
265 hl-line-range-function)
266 (set (make-local-variable 'hexl-mode-old-hl-line-face)
267 hl-line-face)
268
262 (make-local-variable 'hexl-mode-old-syntax-table) 269 (make-local-variable 'hexl-mode-old-syntax-table)
263 (setq hexl-mode-old-syntax-table (syntax-table)) 270 (setq hexl-mode-old-syntax-table (syntax-table))
264 (set-syntax-table (standard-syntax-table)) 271 (set-syntax-table (standard-syntax-table))
@@ -388,6 +395,10 @@ With arg, don't unhexlify buffer."
388 (ruler-mode 0)) 395 (ruler-mode 0))
389 (if (and (boundp 'hl-line-mode) hl-line-mode (not hexl-mode-old-hl-line-mode)) 396 (if (and (boundp 'hl-line-mode) hl-line-mode (not hexl-mode-old-hl-line-mode))
390 (hl-line-mode 0)) 397 (hl-line-mode 0))
398
399 (set 'hl-line-range-function hexl-mode-old-hl-line-range-function)
400 (set 'hl-line-face hexl-mode-old-hl-line-face)
401
391 (setq require-final-newline hexl-mode-old-require-final-newline) 402 (setq require-final-newline hexl-mode-old-require-final-newline)
392 (setq mode-name hexl-mode-old-mode-name) 403 (setq mode-name hexl-mode-old-mode-name)
393 (setq isearch-search-fun-function hexl-mode-old-isearch-search-fun-function) 404 (setq isearch-search-fun-function hexl-mode-old-isearch-search-fun-function)