(Info-build-node-completions, Info-search, Info-follow-reference)

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

diff --git a/lisp/hexl.el b/lisp/hexl.el
index a58798e..e5d55b4 100644 (file)
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -77,13 +77,19 @@ and \"-de\" when dehexlifying a buffer."
   :group 'hexl)
 
 (defcustom hexlify-command
-  (format "%s%s %s" exec-directory hexl-program hexl-options)
+  (format "%s %s"
+         (shell-quote-argument
+          (expand-file-name hexl-program exec-directory))
+         hexl-options)
   "The command to use to hexlify a buffer."
   :type 'string
   :group 'hexl)
 
 (defcustom dehexlify-command
-  (format "%s%s -de %s" exec-directory hexl-program hexl-options)
+  (format "%s -de %s"
+         (shell-quote-argument
+          (expand-file-name hexl-program exec-directory))
+         hexl-options)
   "The command to use to unhexlify a buffer."
   :type 'string
   :group 'hexl)
@@ -91,7 +97,8 @@ and \"-de\" when dehexlifying a buffer."
 (defcustom hexl-follow-ascii t
   "If non-nil then highlight the ASCII character corresponding to point."
   :type 'boolean
-  :group 'hexl)
+  :group 'hexl
+  :version "20.3")
 
 (defvar hexl-max-address 0
   "Maximum offset into hexl buffer.")
@@ -115,8 +122,10 @@ and \"-de\" when dehexlifying a buffer."
 
 ;;;###autoload
 (defun hexl-mode (&optional arg)
-  "\\<hexl-mode-map>
-A major mode for editing binary files in hex dump format.
+  "\\<hexl-mode-map>A mode for editing binary files in hex dump format.
+This is not an ordinary major mode; it alters some aspects
+if the current mode's behavior, but not all; also, you can exit
+Hexl mode and return to the previous mode using `hexl-mode-exit'.
 
 This function automatically converts a buffer into the hexl format
 using the function `hexlify-buffer'.
@@ -182,13 +191,11 @@ into the buffer at the current point.
 Note: saving the file with any of the usual Emacs commands
 will actually convert it back to binary format while saving.
 
-You can use \\[hexl-find-file] to visit a file in hexl-mode.
+You can use \\[hexl-find-file] to visit a file in Hexl mode.
 
 \\[describe-bindings] for advanced commands."
   (interactive "p")
-  (if (eq major-mode 'hexl-mode)
-      (error "You are already in hexl mode")
-
+  (unless (eq major-mode 'hexl-mode)
     (let ((modified (buffer-modified-p))
          (inhibit-read-only t)
          (original-point (1- (point)))
@@ -244,6 +251,7 @@ You can use \\[hexl-find-file] to visit a file in hexl-mode.
   (run-hooks 'hexl-mode-hook))
 
 (defun hexl-after-revert-hook ()
+  (setq hexl-max-address (1- (buffer-size)))
   (hexlify-buffer)
   (set-buffer-modified-p nil))
 
@@ -342,7 +350,7 @@ Ask the user for confirmation."
     hexl-address))
 
 (defun hexl-address-to-marker (address)
-  "Return marker for ADDRESS."
+  "Return buffer position for ADDRESS."
   (interactive "nAddress: ")
   (+ (* (/ address 16) 68) 11 (/ (* (% address 16) 5) 2)))
 
@@ -590,8 +598,8 @@ This discards the buffer's undo information."
        (or (y-or-n-p "Converting to hexl format discards undo info; ok? ")
           (error "Aborted")))
   (setq buffer-undo-list nil)
-  (let ((binary-process-output nil) ; for Ms-Dos
-       (binary-process-input buffer-file-type)
+  ;; Don't decode text in the ASCII part of `hexl' program output.
+  (let ((coding-system-for-read 'raw-text)
        ;; If the buffer was read with EOL conversions, be sure to use the
        ;; same conversions when passing the region to the `hexl' program.
        (coding-system-for-write
@@ -604,7 +612,9 @@ This discards the buffer's undo information."
                  'raw-text-unix)
                 (t 'no-conversion))))
        (buffer-undo-list t))
-    (shell-command-on-region (point-min) (point-max) hexlify-command t)))
+    (shell-command-on-region (point-min) (point-max) hexlify-command t)
+    (if (> (point) (hexl-address-to-marker hexl-max-address))
+       (hexl-goto-address hexl-max-address))))
 
 (defun dehexlify-buffer ()
   "Convert a hexl format buffer to binary.
@@ -614,9 +624,16 @@ This discards the buffer's undo information."
        (or (y-or-n-p "Converting from hexl format discards undo info; ok? ")
           (error "Aborted")))
   (setq buffer-undo-list nil)
-  (let ((binary-process-output buffer-file-type) ; for Ms-Dos
-       (binary-process-input nil)
-       (coding-system-for-read 'raw-text)
+  (let ((coding-system-for-write 'raw-text)
+       (coding-system-for-read
+        (let ((eol-type (coding-system-eol-type buffer-file-coding-system)))
+          (cond ((eq eol-type 1)
+                 'raw-text-dos)
+                ((eq eol-type 2)
+                 'raw-text-mac)
+                ((eq eol-type 0)
+                 'raw-text-unix)
+                (t 'no-conversion))))
        (buffer-undo-list t))
     (shell-command-on-region (point-min) (point-max) dehexlify-command t)))
 
@@ -804,48 +821,26 @@ Customize the variable `hexl-follow-ascii' to disable this feature."
 
   (define-key hexl-mode-map "\e\C-a" 'hexl-beginning-of-512b-page)
   (define-key hexl-mode-map "\e\C-b" 'hexl-backward-short)
-  (define-key hexl-mode-map "\e\C-c" 'undefined)
   (define-key hexl-mode-map "\e\C-d" 'hexl-insert-decimal-char)
   (define-key hexl-mode-map "\e\C-e" 'hexl-end-of-512b-page)
   (define-key hexl-mode-map "\e\C-f" 'hexl-forward-short)
-  (define-key hexl-mode-map "\e\C-g" 'undefined)
-  (define-key hexl-mode-map "\e\C-h" 'undefined)
   (define-key hexl-mode-map "\e\C-i" 'undefined)
   (define-key hexl-mode-map "\e\C-j" 'undefined)
   (define-key hexl-mode-map "\e\C-k" 'undefined)
-  (define-key hexl-mode-map "\e\C-l" 'undefined)
-  (define-key hexl-mode-map "\e\C-m" 'undefined)
-  (define-key hexl-mode-map "\e\C-n" 'undefined)
   (define-key hexl-mode-map "\e\C-o" 'hexl-insert-octal-char)
-  (define-key hexl-mode-map "\e\C-p" 'undefined)
   (define-key hexl-mode-map "\e\C-q" 'undefined)
-  (define-key hexl-mode-map "\e\C-r" 'undefined)
-  (define-key hexl-mode-map "\e\C-s" 'undefined)
   (define-key hexl-mode-map "\e\C-t" 'undefined)
-  (define-key hexl-mode-map "\e\C-u" 'undefined)
-
-  (define-key hexl-mode-map "\e\C-w" 'undefined)
   (define-key hexl-mode-map "\e\C-x" 'hexl-insert-hex-char)
-  (define-key hexl-mode-map "\e\C-y" 'undefined)
-
-  (define-key hexl-mode-map "\ea" 'undefined)
   (define-key hexl-mode-map "\eb" 'hexl-backward-word)
   (define-key hexl-mode-map "\ec" 'undefined)
   (define-key hexl-mode-map "\ed" 'undefined)
-  (define-key hexl-mode-map "\ee" 'undefined)
   (define-key hexl-mode-map "\ef" 'hexl-forward-word)
   (define-key hexl-mode-map "\eg" 'hexl-goto-hex-address)
-  (define-key hexl-mode-map "\eh" 'undefined)
   (define-key hexl-mode-map "\ei" 'undefined)
   (define-key hexl-mode-map "\ej" 'hexl-goto-address)
   (define-key hexl-mode-map "\ek" 'undefined)
   (define-key hexl-mode-map "\el" 'undefined)
-  (define-key hexl-mode-map "\em" 'undefined)
-  (define-key hexl-mode-map "\en" 'undefined)
-  (define-key hexl-mode-map "\eo" 'undefined)
-  (define-key hexl-mode-map "\ep" 'undefined)
   (define-key hexl-mode-map "\eq" 'undefined)
-  (define-key hexl-mode-map "\er" 'undefined)
   (define-key hexl-mode-map "\es" 'undefined)
   (define-key hexl-mode-map "\et" 'undefined)
   (define-key hexl-mode-map "\eu" 'undefined)