diff options
| author | John Paul Wallington | 2004-01-08 05:43:22 +0000 |
|---|---|---|
| committer | John Paul Wallington | 2004-01-08 05:43:22 +0000 |
| commit | c9ec040a0de0c3d2b336adddbe697a1eaaca3210 (patch) | |
| tree | 301b99b2788b0124b04038a9f330cb270e75d3e7 | |
| parent | 3803eb324e0c0d74cf153206ad3d7346983e1a92 (diff) | |
| download | emacs-c9ec040a0de0c3d2b336adddbe697a1eaaca3210.tar.gz emacs-c9ec040a0de0c3d2b336adddbe697a1eaaca3210.zip | |
(emerge-restore-buffer-characteristics): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emerge.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f27dac3243..456c48ce33c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-01-08 John Paul Wallington <jpw@gnu.org> | ||
| 2 | |||
| 3 | * emerge.el (emerge-restore-buffer-characteristics): Doc fix. | ||
| 4 | |||
| 1 | 2004-01-07 Nick Roberts <nick@nick.uklinux.net> | 5 | 2004-01-07 Nick Roberts <nick@nick.uklinux.net> |
| 2 | 6 | ||
| 3 | * progmodes/gud.el (gdb-first-prompt): Renamed from | 7 | * progmodes/gud.el (gdb-first-prompt): Renamed from |
diff --git a/lisp/emerge.el b/lisp/emerge.el index e1fd33587ce..f9821111e71 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el | |||
| @@ -1454,7 +1454,7 @@ These characteristics are restored by `emerge-restore-buffer-characteristics'." | |||
| 1454 | emerge-merging-values))))) | 1454 | emerge-merging-values))))) |
| 1455 | 1455 | ||
| 1456 | (defun emerge-restore-buffer-characteristics () | 1456 | (defun emerge-restore-buffer-characteristics () |
| 1457 | "Restores characteristics saved by `emerge-remember-buffer-characteristics'." | 1457 | "Restore characteristics saved by `emerge-remember-buffer-characteristics'." |
| 1458 | (let ((A-values emerge-A-buffer-values) | 1458 | (let ((A-values emerge-A-buffer-values) |
| 1459 | (B-values emerge-B-buffer-values)) | 1459 | (B-values emerge-B-buffer-values)) |
| 1460 | (emerge-eval-in-buffer emerge-A-buffer | 1460 | (emerge-eval-in-buffer emerge-A-buffer |
| @@ -3112,7 +3112,7 @@ SPC, it is ignored; if it is anything else, it is processed as a command." | |||
| 3112 | (setq unread-command-events (list c))))) | 3112 | (setq unread-command-events (list c))))) |
| 3113 | (erase-buffer))))) | 3113 | (erase-buffer))))) |
| 3114 | 3114 | ||
| 3115 | ;; Improved auto-save gfile names. | 3115 | ;; Improved auto-save file names. |
| 3116 | ;; This function fixes many problems with the standard auto-save file names: | 3116 | ;; This function fixes many problems with the standard auto-save file names: |
| 3117 | ;; Auto-save files for non-file buffers get put in the default directory | 3117 | ;; Auto-save files for non-file buffers get put in the default directory |
| 3118 | ;; for the buffer, whether that makes sense or not. | 3118 | ;; for the buffer, whether that makes sense or not. |