;;; hexl.el --- edit a file in a hex dump format using the hexl filter
-;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004,
+;; 2005 Free Software Foundation, Inc.
;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
;; Maintainer: FSF
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
:options '(hexl-follow-line hexl-activate-ruler turn-on-eldoc-mode)
:group 'hexl)
-(defface hexl-address-area
+(defface hexl-address-region
'((t (:inherit header-line)))
"Face used in address are of hexl-mode buffer."
:group 'hexl)
-(defface hexl-ascii-area
+(defface hexl-ascii-region
'((t (:inherit header-line)))
"Face used in ascii are of hexl-mode buffer."
:group 'hexl)
(defvar hexl-font-lock-keywords
'(("^\\([0-9a-f]+:\\).\\{40\\} \\(.+$\\)"
;; "^\\([0-9a-f]+:\\).+ \\(.+$\\)"
- (1 'hexl-address-area t t)
- (2 'hexl-ascii-area t t)))
+ (1 'hexl-address-region t t)
+ (2 'hexl-ascii-region t t)))
"Font lock keywords used in `hexl-mode'.")
;; routines
(add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer nil t)
;; Set a callback function for eldoc.
- (set (make-local-variable 'eldoc-print-current-symbol-info-function)
+ (set (make-local-variable 'eldoc-documentation-function)
'hexl-print-current-point-info)
(eldoc-add-command-completions "hexl-")
- (eldoc-remove-command "hexl-save-buffer"
+ (eldoc-remove-command "hexl-save-buffer"
"hexl-current-address")
(if hexl-follow-ascii (hexl-follow-ascii 1)))
- (run-hooks 'hexl-mode-hook))
+ (run-mode-hooks 'hexl-mode-hook))
(defun hexl-isearch-search-function ()
(defun hexl-print-current-point-info ()
"Return current hexl-address in string.
-This function is indented to be used as eldoc callback."
+This function is intended to be used as eldoc callback."
(let ((addr (hexl-current-address)))
(format "Current address is %d/0x%08x" addr addr)))
(defun hexl-insert-decimal-char (arg)
"Insert a character given by its decimal code ARG times at point."
(interactive "p")
- (let ((num (string-to-int (read-string "Decimal Number: "))))
+ (let ((num (string-to-number (read-string "Decimal Number: "))))
(if (< num 0)
(error "Decimal number out of range")
(hexl-insert-multibyte-char num arg))))
(defun hexl-activate-ruler ()
"Activate `ruler-mode'"
(require 'ruler-mode)
- (set (make-local-variable 'ruler-mode-ruler-function)
+ (set (make-local-variable 'ruler-mode-ruler-function)
'hexl-mode-ruler)
(ruler-mode 1))
"Activate `hl-line-mode'"
(require 'frame)
(require 'hl-line)
- (set (make-local-variable 'hl-line-range-function)
- 'hexl-highlight-line-range)
- (set (make-local-variable 'hl-line-face)
- 'highlight)
+ (with-no-warnings
+ (set (make-local-variable 'hl-line-range-function)
+ 'hexl-highlight-line-range)
+ (set (make-local-variable 'hl-line-face)
+ 'highlight))
(hl-line-mode 1))
(defun hexl-highlight-line-range ()
- "Return the range of address area for the point.
+ "Return the range of address region for the point.
This function is assumed to be used as call back function for `hl-line-mode'."
(cons
(line-beginning-position)
(define-key hexl-mode-map [up] 'hexl-previous-line)
(define-key hexl-mode-map [down] 'hexl-next-line)
(define-key hexl-mode-map [M-left] 'hexl-backward-short)
+ (define-key hexl-mode-map [?\e left] 'hexl-backward-short)
(define-key hexl-mode-map [M-right] 'hexl-forward-short)
+ (define-key hexl-mode-map [?\e right] 'hexl-forward-short)
(define-key hexl-mode-map [next] 'hexl-scroll-up)
(define-key hexl-mode-map [prior] 'hexl-scroll-down)
(define-key hexl-mode-map [home] 'hexl-beginning-of-line)
(define-key hexl-mode-map "\C-e" 'hexl-end-of-line)
(define-key hexl-mode-map "\C-f" 'hexl-forward-char)
- (if (not (eq (key-binding (char-to-string help-char)) 'help-command))
+ (if (not (memq (key-binding (char-to-string help-char))
+ '(help-command ehelp-command)))
(define-key hexl-mode-map (char-to-string help-char) 'undefined))
(define-key hexl-mode-map "\C-k" 'undefined)