HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 2011 to FSF/AIST copyright years.
[bpt/emacs.git]
/
lisp
/
hexl.el
diff --git
a/lisp/hexl.el
b/lisp/hexl.el
index
245f895
..
6d04093
100644
(file)
--- a/
lisp/hexl.el
+++ b/
lisp/hexl.el
@@
-1,7
+1,7
@@
;;; hexl.el --- edit a file in a hex dump format using the hexl filter
;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004,
;;; hexl.el --- edit a file in a hex dump format using the hexl filter
;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2005, 2006, 2007, 2008
, 2009, 2010, 2011
Free Software Foundation, Inc.
;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
;; Maintainer: FSF
;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
;; Maintainer: FSF
@@
-9,10
+9,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,9
+20,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-44,6
+42,7
@@
;;; Code:
(require 'eldoc)
;;; Code:
(require 'eldoc)
+(eval-when-compile (require 'cl))
;;
;; vars here
;;
;; vars here
@@
-367,8
+366,8
@@
and edit the file in `hexl-mode'."
(list
(let ((completion-ignored-extensions nil))
(read-file-name "Filename: " nil nil 'ret-must-match))))
(list
(let ((completion-ignored-extensions nil))
(read-file-name "Filename: " nil nil 'ret-must-match))))
- ;; Ignore the user's setting of default
-
major-mode.
- (let
((default-major-mode
'fundamental-mode))
+ ;; Ignore the user's setting of default
major-mode.
+ (let
f (((default-value 'major-mode)
'fundamental-mode))
(find-file-literally filename))
(if (not (eq major-mode 'hexl-mode))
(hexl-mode)))
(find-file-literally filename))
(if (not (eq major-mode 'hexl-mode))
(hexl-mode)))
@@
-449,7
+448,7
@@
Ask the user for confirmation."
(if (>= current-column 41)
(- current-column 41)
(/ (- current-column (/ current-column 5)) 2))))
(if (>= current-column 41)
(- current-column 41)
(/ (- current-column (/ current-column 5)) 2))))
- (when (
interactive-p
)
+ (when (
called-interactively-p 'interactive
)
(message "Current address is %d/0x%08x" hexl-address hexl-address))
hexl-address))
(message "Current address is %d/0x%08x" hexl-address hexl-address))
hexl-address))
@@
-780,11
+779,11
@@
This discards the buffer's undo information."
(defun hexl-printable-character (ch)
"Return a displayable string for character CH."
(defun hexl-printable-character (ch)
"Return a displayable string for character CH."
- (format "%c" (if
hexl-iso
- (if (or (< ch 32) (
and (>= ch 127) (< ch 160)
))
+ (format "%c" (if
(equal hexl-iso "")
+ (if (or (< ch 32) (
>= ch 127
))
46
ch)
46
ch)
- (if (or (< ch 32) (
>= ch 127
))
+ (if (or (< ch 32) (
and (>= ch 127) (< ch 160)
))
46
ch))))
46
ch))))
@@
-797,7
+796,7
@@
and their encoded form is inserted byte by byte."
(coding (if (or (null buffer-file-coding-system)
;; coding-system-type equals t means undecided.
(eq (coding-system-type buffer-file-coding-system) t))
(coding (if (or (null buffer-file-coding-system)
;; coding-system-type equals t means undecided.
(eq (coding-system-type buffer-file-coding-system) t))
- default-buffer-file-coding-system
+ (default-value 'buffer-file-coding-system)
buffer-file-coding-system)))
(cond ((and (> ch 0) (< ch 256))
(hexl-insert-char ch num))
buffer-file-coding-system)))
(cond ((and (> ch 0) (< ch 256))
(hexl-insert-char ch num))
@@
-837,7
+836,7
@@
Interactively, with a numeric argument, insert this character that many times.
Non-ASCII characters are first encoded with `buffer-file-coding-system',
and their encoded form is inserted byte by byte."
(interactive "p")
Non-ASCII characters are first encoded with `buffer-file-coding-system',
and their encoded form is inserted byte by byte."
(interactive "p")
- (hexl-insert-multibyte-char last-command-
char
arg))
+ (hexl-insert-multibyte-char last-command-
event
arg))
(defun hexl-insert-char (ch num)
"Insert the character CH NUM times in a hexl buffer.
(defun hexl-insert-char (ch num)
"Insert the character CH NUM times in a hexl buffer.