(hexl-mode): Stash `eldoc-documentation-function' in

`hexl-mode-old-eldoc-documentation-function'.
(hexl-mode-exit): Restore it.
(hexl-mode-old-eldoc-documentation-function): Declare for compiler.

2 files changed, 18 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3aa45317ffb..453341a89b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-26  John Paul Wallington  <jpw@pobox.com>
+
+        * hexl.el (hexl-mode): Stash `eldoc-documentation-function' in
+        `hexl-mode-old-eldoc-documentation-function'.
+        (hexl-mode-exit): Restore it.
+        (hexl-mode-old-eldoc-documentation-function): Declare for compiler.
+
+        * w32-fns.el (top-level): Don't set `completion-ignore-case' to t.
+
 2008-04-26  Juanma Barranquero  <lekktu@gmail.com>
 
         * minibuffer.el (completion-pcm-word-delimiters): Add :group.
diff --git a/lisp/hexl.el b/lisp/hexl.el
index c0ec9aa6ed8..245f895837e 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -120,6 +120,7 @@ Quoting cannot be used, so the arguments cannot themselves contain spaces."
 (defvar hexl-mode-old-require-final-newline)
 (defvar hexl-mode-old-syntax-table)
 (defvar hexl-mode-old-font-lock-keywords)
+(defvar hexl-mode-old-eldoc-documentation-function)
 
 (defvar hexl-ascii-overlay nil
   "Overlay used to highlight ASCII element corresponding to current point.")
@@ -288,6 +289,10 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
     (add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer nil t)
 
     ;; Set a callback function for eldoc.
+    (make-local-variable 'hexl-mode-old-eldoc-documentation-function)
+    (setq hexl-mode-old-eldoc-documentation-function
+          (bound-and-true-p eldoc-documentation-function))
+
     (set (make-local-variable 'eldoc-documentation-function)
          'hexl-print-current-point-info)
     (eldoc-add-command-completions "hexl-")
@@ -405,6 +410,10 @@ With arg, don't unhexlify buffer."
   (when (boundp 'hexl-mode-old-hl-line-face)
     (setq hl-line-face hexl-mode-old-hl-line-face))
 
+  (when (boundp 'hexl-mode-old-eldoc-documentation-function)
+    (setq eldoc-documentation-function
+          hexl-mode-old-eldoc-documentation-function))
+
   (setq require-final-newline hexl-mode-old-require-final-newline)
   (setq mode-name hexl-mode-old-mode-name)
   (setq isearch-search-fun-function hexl-mode-old-isearch-search-fun-function)