aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1991-03-06 18:33:25 +0000
committerJim Blandy1991-03-06 18:33:25 +0000
commit4c8c7ae9dfd5c594e036e2ea3b4189afb40a5fad (patch)
tree4590ea37414e066186c07df8e055bcf45687f82d
parent8a1281b563c9075c0f9dea99501c8149871eb09b (diff)
downloademacs-4c8c7ae9dfd5c594e036e2ea3b4189afb40a5fad.tar.gz
emacs-4c8c7ae9dfd5c594e036e2ea3b4189afb40a5fad.zip
*** empty log message ***
-rw-r--r--etc/termcap.dat4
-rw-r--r--lisp/hexl.el27
2 files changed, 11 insertions, 20 deletions
diff --git a/etc/termcap.dat b/etc/termcap.dat
index 343e132994f..a9d0ef02e0a 100644
--- a/etc/termcap.dat
+++ b/etc/termcap.dat
@@ -47,12 +47,12 @@ ZW|gator|HP 9000 model 237 emulating AAA:\
47ZY|gator-52|HP 9000 model 237 emulating VT52:\ 47ZY|gator-52|HP 9000 model 237 emulating VT52:\
48 :cr=^M:do=^J:nl=^J:bl=^G:\ 48 :cr=^M:do=^J:nl=^J:bl=^G:\
49 :le=^H:bs:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :co#128:li#47:nd=\EC:\ 49 :le=^H:bs:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :co#128:li#47:nd=\EC:\
50 :ta=^I:pt:sr=\EI:up=\EA:ku=\EA:kd=\EB:kr=\EC:kl=\ED:kb=^H: 50 :ta=^I:pt:sr=\EI:up=\EA:ku=\EA:kd=\EB:kr=\EC:kl=\ED:kb=^H:\
51 :ce=\EK:ho=\EH: 51 :ce=\EK:ho=\EH:
52ZZ|gator-52t|HP 9000 model 237 emulating extra-tall VT52:\ 52ZZ|gator-52t|HP 9000 model 237 emulating extra-tall VT52:\
53 :cr=^M:do=^J:nl=^J:bl=^G:\ 53 :cr=^M:do=^J:nl=^J:bl=^G:\
54 :le=^H:bs:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :co#128:li#94:nd=\EC:\ 54 :le=^H:bs:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :co#128:li#94:nd=\EC:\
55 :ta=^I:pt:sr=\EI:up=\EA:ku=\EA:kd=\EB:kr=\EC:kl=\ED:kb=^H: 55 :ta=^I:pt:sr=\EI:up=\EA:ku=\EA:kd=\EB:kr=\EC:kl=\ED:kb=^H:\
56 :ce=\EK:ho=\EH: 56 :ce=\EK:ho=\EH:
57# 57#
58# N: ANN ARBOR 58# N: ANN ARBOR
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 0941fe4032c..8671413e81a 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -195,7 +195,6 @@ You can use \\[hexl-find-file] to visit a file in hexl-mode.
195 195
196(defun hexl-find-file (filename) 196(defun hexl-find-file (filename)
197 "Edit file FILENAME in hexl-mode. 197 "Edit file FILENAME in hexl-mode.
198
199Switch to a buffer visiting file FILENAME, creating one in none exists." 198Switch to a buffer visiting file FILENAME, creating one in none exists."
200 (interactive "fFilename: ") 199 (interactive "fFilename: ")
201 (find-file filename) 200 (find-file filename)
@@ -246,7 +245,7 @@ Signal error if ADDRESS out of range."
246 (goto-char (hexl-address-to-marker address))) 245 (goto-char (hexl-address-to-marker address)))
247 246
248(defun hexl-goto-hex-address (hex-address) 247(defun hexl-goto-hex-address (hex-address)
249 "Goto hexl-mode address (hex string) HEX-ADDRESS. 248 "Go to hexl-mode address (hex string) HEX-ADDRESS.
250 249
251Signal error if HEX-ADDRESS is out of range." 250Signal error if HEX-ADDRESS is out of range."
252 (interactive "sHex Address: ") 251 (interactive "sHex Address: ")
@@ -364,20 +363,14 @@ Signal error if HEX-ADDRESS is out of range."
364 (hexl-backward-word (- arg))) 363 (hexl-backward-word (- arg)))
365 364
366(defun hexl-previous-line (arg) 365(defun hexl-previous-line (arg)
367 "Move vertically up ARG lines [16 bytes] (down if ARG negative) in 366 "Move vertically up ARG lines [16 bytes] (down if ARG negative) in hexl-mode.
368hexl-mode. 367If there is byte at the target address move to the last byte in that line."
369
370If there is byte at the target address move to the last byte in that
371line."
372 (interactive "p") 368 (interactive "p")
373 (hexl-next-line (- arg))) 369 (hexl-next-line (- arg)))
374 370
375(defun hexl-next-line (arg) 371(defun hexl-next-line (arg)
376 "Move vertically down ARG lines [16 bytes] (up if ARG negative) in 372 "Move vertically down ARG lines [16 bytes] (up if ARG negative) in hexl-mode.
377hexl-mode. 373If there is no byte at the target address move to the last byte in that line."
378
379If there is no byte at the target address move to the last byte in that
380line."
381 (interactive "p") 374 (interactive "p")
382 (hexl-goto-address (let ((address (+ (hexl-current-address) (* arg 16)) t)) 375 (hexl-goto-address (let ((address (+ (hexl-current-address) (* arg 16)) t))
383 (if (and (< arg 0) (< address 0)) 376 (if (and (< arg 0) (< address 0))
@@ -396,16 +389,15 @@ line."
396 address))) 389 address)))
397 390
398(defun hexl-beginning-of-buffer (arg) 391(defun hexl-beginning-of-buffer (arg)
399 "Move to the beginning of the hexl buffer; leave hexl-mark at previous 392 "Move to the beginning of the hexl buffer.
400posistion. 393Leaves `hexl-mark' at previous position.
401 394With prefix arg N, puts point N bytes of the way from the true beginning."
402With arg N, put point N bytes of the way from the true beginning."
403 (interactive "p") 395 (interactive "p")
404 (push-mark (point)) 396 (push-mark (point))
405 (hexl-goto-address (+ 0 (1- arg)))) 397 (hexl-goto-address (+ 0 (1- arg))))
406 398
407(defun hexl-end-of-buffer (arg) 399(defun hexl-end-of-buffer (arg)
408 "Goto hexl-max-address minus ARG." 400 "Go to `hexl-max-address' minus ARG."
409 (interactive "p") 401 (interactive "p")
410 (push-mark (point)) 402 (push-mark (point))
411 (hexl-goto-address (- hexl-max-address (1- arg)))) 403 (hexl-goto-address (- hexl-max-address (1- arg))))
@@ -631,7 +623,6 @@ You may also type up to 3 octal digits, to insert a character with that code"
631 (define-key hexl-mode-map "\e\C-x" 'hexl-insert-hex-char) 623 (define-key hexl-mode-map "\e\C-x" 'hexl-insert-hex-char)
632 (define-key hexl-mode-map "\e\C-y" 'undefined) 624 (define-key hexl-mode-map "\e\C-y" 'undefined)
633 625
634
635 (define-key hexl-mode-map "\ea" 'hexl-beginning-of-1k-page) 626 (define-key hexl-mode-map "\ea" 'hexl-beginning-of-1k-page)
636 (define-key hexl-mode-map "\eb" 'hexl-backward-word) 627 (define-key hexl-mode-map "\eb" 'hexl-backward-word)
637 (define-key hexl-mode-map "\ec" 'undefined) 628 (define-key hexl-mode-map "\ec" 'undefined)