(dired-do-print): Put spaces between lpr switches.

[bpt/emacs.git] / lisp / hexl.el

diff --git a/lisp/hexl.el b/lisp/hexl.el
index 219e0c6..2043196 100644 (file)
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -1,6 +1,6 @@
 ;;; hexl.el --- edit a file in a hex dump format using the hexl filter.
 
-;; Copyright (C) 1989 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1994 Free Software Foundation, Inc.
 
 ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
 ;; Maintainer: FSF
@@ -170,6 +170,11 @@ You can use \\[hexl-find-file] to visit a file in hexl-mode.
     (make-local-variable 'write-contents-hooks)
     (add-hook 'write-contents-hooks 'hexl-save-buffer)
 
+    (make-local-variable 'hexl-max-address)
+
+    (make-local-variable 'change-major-mode-hook)
+    (add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer)
+
     (let ((modified (buffer-modified-p))
          (inhibit-read-only t)
          (original-point (1- (point))))
@@ -200,7 +205,8 @@ You can use \\[hexl-find-file] to visit a file in hexl-mode.
                                   (set-buffer name)
                                   (dehexlify-buffer)
                                   ;; Prevent infinite recursion.
-                                  (let ((hexl-in-save-buffer t))
+                                  (let ((hexl-in-save-buffer t)
+                                        (buffer-file-type t)) ; for ms-dos
                                     (save-buffer))
                                   (setq modified (buffer-modified-p))
                                   (delete-region (point-min) (point-max))
@@ -238,9 +244,19 @@ With arg, don't unhexlify buffer."
   (setq mode-name hexl-mode-old-mode-name)
   (use-local-map hexl-mode-old-local-map)
   (setq major-mode hexl-mode-old-major-mode)
-;; Kludge to update mode-line
-  (switch-to-buffer (current-buffer))
-)
+  (force-mode-line-update))
+
+(defun hexl-maybe-dehexlify-buffer ()
+  "Convert a hexl format buffer to binary.
+Ask the user for confirmation."
+  (if (y-or-n-p "Convert contents back to binary format? ")
+      (let ((modified (buffer-modified-p))
+           (inhibit-read-only t)
+           (original-point (1+ (hexl-current-address))))
+       (dehexlify-buffer)
+       (remove-hook 'write-contents-hook 'hexl-save-buffer)
+       (set-buffer-modified-p modified)
+       (goto-char original-point))))
 
 (defun hexl-current-address ()
   "Return current hexl-address."
@@ -495,14 +511,17 @@ You may also type up to 3 octal digits, to insert a character with that code"
 
 ;;;###autoload
 (defun hexlify-buffer ()
-  "Convert a binary buffer to hexl format"
+  "Convert a binary buffer to hexl format."
   (interactive)
-  (shell-command-on-region (point-min) (point-max) hexlify-command t))
+  (let ((binary-process-output nil) ; for Ms-Dos
+       (binary-process-input t))
+    (shell-command-on-region (point-min) (point-max) hexlify-command t)))
 
 (defun dehexlify-buffer ()
   "Convert a hexl format buffer to binary."
   (interactive)
-  (let ((binary-process t)) ; for Ms-Dos
+  (let ((binary-process-output t) ; for Ms-Dos
+       (binary-process-input nil))
     (shell-command-on-region (point-min) (point-max) dehexlify-command t)))
 
 (defun hexl-char-after-point ()
@@ -555,9 +574,9 @@ You may also type up to 3 octal digits, to insert a character with that code"
        (+ (* (/ address 16) 68) 52 (% address 16)))
       (delete-char 1)
       (insert (hexl-printable-character ch))
-      (if (eq address hexl-max-address)
-         (hexl-goto-address address)
-       (hexl-goto-address (1+ address)))
+      (or (eq address hexl-max-address)
+         (setq address (1+ address)))
+      (hexl-goto-address address)
       (setq num (1- num)))))
 
 ;; hex conversion
@@ -592,6 +611,15 @@ You may also type up to 3 octal digits, to insert a character with that code"
     nil
     (setq hexl-mode-map (make-sparse-keymap))
 
+    (define-key hexl-mode-map [left] 'hexl-backward-char)
+    (define-key hexl-mode-map [right] 'hexl-forward-char)
+    (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 [M-right] 'hexl-forward-short)
+    (define-key hexl-mode-map [next] 'hexl-scroll-up)
+    (define-key hexl-mode-map [prev] 'hexl-scroll-down)
+
     (define-key hexl-mode-map "\C-a" 'hexl-beginning-of-line)
     (define-key hexl-mode-map "\C-b" 'hexl-backward-char)
     (define-key hexl-mode-map "\C-d" 'undefined)
@@ -599,7 +627,7 @@ You may also type up to 3 octal digits, to insert a character with that code"
     (define-key hexl-mode-map "\C-f" 'hexl-forward-char)
 
     (if (not (eq (key-binding (char-to-string help-char)) 'help-command))
-       (define-key hexl-mode-map help-char 'undefined))
+       (define-key hexl-mode-map (char-to-string help-char) 'undefined))
 
     (define-key hexl-mode-map "\C-i" 'hexl-self-insert-command)
     (define-key hexl-mode-map "\C-j" 'hexl-self-insert-command)