From: Phillip Rulon <pjr@gnu.org>
Date: Sat, 9 Oct 1999 01:19:36 +0000 (+0000)
Subject: * hexl.el (hexl-mode): Do nothing if already in hexl mode.
X-Git-Tag: emacs-pretest-21.0.90~6501
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=330bd7c39b44338d31d6c72a0bca8c1b475cddb3;p=emacs.git

* hexl.el (hexl-mode): Do nothing if already in hexl mode.
---

diff --git a/lisp/hexl.el b/lisp/hexl.el
index 4a5d12c28e9..e5d55b43ca4 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -122,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'.
@@ -189,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)))