Mercurial > emacs
comparison lisp/ChangeLog @ 112234:84917bd2a94e
* lisp/hexl.el (hexl-mode-old-*): Remove.
(hexl-mode--old-var-vals): New var to replace them.
(hexl-mode--minor-mode-p, hexl-mode--setq-local): New funs.
(hexl-mode, hexl-follow-line, hexl-activate-ruler):
Use them to set local vars.
(hexl-mode-exit): Use hexl-mode--old-var-vals to restore state.
(hexl-backward-short, hexl-backward-word, hexl-scroll-down)
(hexl-scroll-up, hexl-end-of-1k-page, hexl-end-of-512b-page): Simplify.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 14 Jan 2011 14:55:35 -0500 |
| parents | f4a73cf7587b |
| children | 4f72b1e43644 |
comparison
equal
deleted
inserted
replaced
| 112233:3b840e622de1 | 112234:84917bd2a94e |
|---|---|
| 1 2011-01-14 Stefan Monnier <monnier@iro.umontreal.ca> | 1 2011-01-14 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | |
| 3 * hexl.el (hexl-mode-old-*): Remove. | |
| 4 (hexl-mode--old-var-vals): New var to replace them. | |
| 5 (hexl-mode--minor-mode-p, hexl-mode--setq-local): New funs. | |
| 6 (hexl-mode, hexl-follow-line, hexl-activate-ruler): | |
| 7 Use them to set local vars (bug#7846). | |
| 8 (hexl-mode-exit): Use hexl-mode--old-var-vals to restore state. | |
| 9 (hexl-backward-short, hexl-backward-word, hexl-scroll-down) | |
| 10 (hexl-scroll-up, hexl-end-of-1k-page, hexl-end-of-512b-page): Simplify. | |
| 2 | 11 |
| 3 * vc/smerge-mode.el: Resolve comment conflicts more aggressively. | 12 * vc/smerge-mode.el: Resolve comment conflicts more aggressively. |
| 4 (smerge-resolve--normalize-re): New var. | 13 (smerge-resolve--normalize-re): New var. |
| 5 (smerge-resolve--extract-comment, smerge-resolve--normalize): New funs. | 14 (smerge-resolve--extract-comment, smerge-resolve--normalize): New funs. |
| 6 (smerge-resolve): Use them. | 15 (smerge-resolve): Use them. |