X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ff441d3508add9eed3c5217ae7b0a8800b9fc917..001d88b62ecb8163a148656acb103b354ce7613a:/lisp/hexl.el diff --git a/lisp/hexl.el b/lisp/hexl.el index 4aa76d23cb..61d7dd0f31 100644 --- 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 -*- lexical-binding: t -*- -;; Copyright (C) 1989, 1994, 1998, 2001-2015 Free Software Foundation, +;; Copyright (C) 1989, 1994, 1998, 2001-2016 Free Software Foundation, ;; Inc. ;; Author: Keith Gabryelski @@ -294,7 +294,7 @@ in hexl format. A sample format: - HEX ADDR: 0001 0203 0405 0607 0809 0a0b 0c0d 0e0f ASCII-TEXT + HEX ADDR: 0011 2233 4455 6677 8899 aabb ccdd eeff ASCII-TEXT -------- ---- ---- ---- ---- ---- ---- ---- ---- ---------------- 00000000: 5468 6973 2069 7320 6865 786c 2d6d 6f64 This is hexl-mod 00000010: 652e 2020 4561 6368 206c 696e 6520 7265 e. Each line re @@ -395,8 +395,8 @@ 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. - (add-function :before-until (local 'eldoc-documentation-function) - #'hexl-print-current-point-info) + (add-hook 'eldoc-documentation-functions + #'hexl-print-current-point-info nil t) (eldoc-add-command-completions "hexl-") (eldoc-remove-command "hexl-save-buffer" "hexl-current-address") @@ -406,7 +406,7 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode. (defun hexl-isearch-search-function () - (if (and (not isearch-regexp) (not isearch-word)) + (if (and (not isearch-regexp) (not isearch-regexp-function)) (lambda (string &optional bound noerror count) (funcall (if isearch-forward 're-search-forward 're-search-backward)