diff options
| author | Vivek Dasmohapatra | 2012-04-14 00:31:23 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2012-04-14 00:31:23 +0200 |
| commit | b472a59444c5ac74c85ccba53889b0c5a79324df (patch) | |
| tree | cb67f50445f0dd7467f856cd4a13fe6b6dd366c4 | |
| parent | 09b95ce39ba378b3fe116379c85af5a5a42599cd (diff) | |
| download | emacs-b472a59444c5ac74c85ccba53889b0c5a79324df.tar.gz emacs-b472a59444c5ac74c85ccba53889b0c5a79324df.zip | |
* hexl.el (hexl-insert-char): Make display sizes other than 16 work.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/hexl.el | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e8fc25121fd..f6213bbd186 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-04-13 Vivek Dasmohapatra <vivek@etla.org> | ||
| 2 | |||
| 3 | * hexl.el (hexl-insert-char): Make display sizes other than 16 work. | ||
| 4 | |||
| 1 | 2012-04-13 Masatake YAMATO <yamato@redhat.com> | 5 | 2012-04-13 Masatake YAMATO <yamato@redhat.com> |
| 2 | 6 | ||
| 3 | * minibuffer.el (minibuffer-local-filename-syntax): New variable | 7 | * minibuffer.el (minibuffer-local-filename-syntax): New variable |
diff --git a/lisp/hexl.el b/lisp/hexl.el index f8ab156d9eb..6c4d8d6dc34 100644 --- a/lisp/hexl.el +++ b/lisp/hexl.el | |||
| @@ -964,11 +964,7 @@ CH must be a unibyte character whose value is between 0 and 255." | |||
| 964 | (error "Invalid character 0x%x -- must be in the range [0..255]" ch)) | 964 | (error "Invalid character 0x%x -- must be in the range [0..255]" ch)) |
| 965 | (let ((address (hexl-current-address t))) | 965 | (let ((address (hexl-current-address t))) |
| 966 | (while (> num 0) | 966 | (while (> num 0) |
| 967 | (let ((hex-position | 967 | (let ((hex-position (hexl-address-to-marker address)) |
| 968 | (+ (* (/ address 16) (hexl-line-displen)) | ||
| 969 | 10 (point-min) | ||
| 970 | (* 2 (% address 16)) | ||
| 971 | (/ (% address 16) 2))) | ||
| 972 | (ascii-position | 968 | (ascii-position |
| 973 | (+ (* (/ address 16) (hexl-line-displen)) | 969 | (+ (* (/ address 16) (hexl-line-displen)) |
| 974 | (hexl-ascii-start-column) | 970 | (hexl-ascii-start-column) |