(diary-display-hook): Change default and fix doc string.

[gnu-emacs] / lisp / hexl.el

diff --git a/lisp/hexl.el b/lisp/hexl.el
index f3d0890e5052917377ea860f345d64bdd6086a47..9712ff6442cefad0428ba35203c02c2f91a59402 100644 (file)
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 1989 Free Software Foundation, Inc.
 
 ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
+;; Keywords: non-text
 
 ;; This file is part of GNU Emacs.
 
@@ -52,7 +53,7 @@
 
 (defvar hexl-program "hexl"
   "The program that will hexlify and de-hexlify its stdin.
-`hexl-program' will always be concated with `hexl-options'
+`hexl-program' will always be concatenated with `hexl-options'
 and \"-de\" when dehexlfying a buffer.")
 
 (defvar hexl-iso ""
@@ -64,13 +65,11 @@ and \"-de\" when dehexlfying a buffer.")
 
 (defvar hexlify-command
   (format "%s%s %s" exec-directory hexl-program hexl-options)
-  "The command to use to hexlify a buffer.  It is the concatination of
-`hexl-program' and `hexl-options'.")
+  "The command to use to hexlify a buffer.")
 
 (defvar dehexlify-command
   (format "%s%s -de %s" exec-directory hexl-program hexl-options)
-  "The command to use to unhexlify a buffer.  It is the concatination of
-`hexl-program', the option \"-de\", and `hexl-options'.")
+  "The command to use to unhexlify a buffer.")
 
 (defvar hexl-max-address 0
   "Maximum offset into hexl buffer.")
@@ -184,31 +183,36 @@ You can use \\[hexl-find-file] to visit a file in hexl-mode.
         (setq buffer-read-only read-only)
         (hexl-goto-address original-point)))))
 
+(defvar hexl-in-save-buffer nil)
+
 (defun hexl-save-buffer ()
   "Save a hexl format buffer as binary in visited file if modified."
   (interactive)
-  (set-buffer-modified-p (if (buffer-modified-p)
-                            (save-excursion
-                              (let ((buf (generate-new-buffer " hexl"))
-                                    (name (buffer-name))
-                                    (file-name (buffer-file-name))
-                                    (start (point-min))
-                                    (end (point-max))
-                                    modified)
-                                (set-buffer buf)
-                                (insert-buffer-substring name start end)
-                                (set-buffer name)
-                                (dehexlify-buffer)
-                                (save-buffer)
-                                (setq modified (buffer-modified-p))
-                                (delete-region (point-min) (point-max))
-                                (insert-buffer-substring buf start end)
-                                (kill-buffer buf)
-                                modified))
-                          (message "(No changes need to be saved)")
-                          nil))
-  ;; Return t to indicate we have saved t
-  t)
+  (if hexl-in-save-buffer nil
+    (set-buffer-modified-p (if (buffer-modified-p)
+                              (save-excursion
+                                (let ((buf (generate-new-buffer " hexl"))
+                                      (name (buffer-name))
+                                      (file-name (buffer-file-name))
+                                      (start (point-min))
+                                      (end (point-max))
+                                      modified)
+                                  (set-buffer buf)
+                                  (insert-buffer-substring name start end)
+                                  (set-buffer name)
+                                  (dehexlify-buffer)
+                                  ;; Prevent infinite recursion.
+                                  (let ((hexl-in-save-buffer t))
+                                    (save-buffer))
+                                  (setq modified (buffer-modified-p))
+                                  (delete-region (point-min) (point-max))
+                                  (insert-buffer-substring buf start end)
+                                  (kill-buffer buf)
+                                  modified))
+                            (message "(No changes need to be saved)")
+                            nil))
+    ;; Return t to indicate we have saved t
+    t))
 
 ;;;###autoload
 (defun hexl-find-file (filename)
@@ -502,9 +506,8 @@ You may also type up to 3 octal digits, to insert a character with that code"
 
 (defun hexl-char-after-point ()
   "Return char for ASCII hex digits at point."
-  (setq lh (char-after (point)))
-  (setq rh (char-after (1+ (point))))
-  (hexl-htoi lh rh))
+  (hexl-htoi (char-after (point))
+            (char-after (1+ (point)))))
 
 (defun hexl-htoi (lh rh)
   "Hex (char) LH (char) RH to integer."