diff options
| author | Thien-Thi Nguyen | 2008-01-15 15:03:36 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen | 2008-01-15 15:03:36 +0000 |
| commit | 2507310c84e569a0dcb981d497b8a067dfaffccd (patch) | |
| tree | 403335f78d1c8a4eda6b877bc773d76ff645eb11 | |
| parent | c8ad88298aa28a2dcef74d124937cff3e98f140b (diff) | |
| download | emacs-2507310c84e569a0dcb981d497b8a067dfaffccd.tar.gz emacs-2507310c84e569a0dcb981d497b8a067dfaffccd.zip | |
(log-edit): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/log-edit.el | 22 |
2 files changed, 15 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2c215d57da0..a8c91301933 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-01-15 Thien-Thi Nguyen <ttn@gnuvola.org> | ||
| 2 | |||
| 3 | * log-edit.el (log-edit): Doc fix. | ||
| 4 | |||
| 1 | 2008-01-15 Glenn Morris <rgm@gnu.org> | 5 | 2008-01-15 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * diff-mode.el (diff-end-of-hunk): Revert 2008-01-08 change. | 7 | * diff-mode.el (diff-end-of-hunk): Revert 2008-01-08 change. |
diff --git a/lisp/log-edit.el b/lisp/log-edit.el index b92de701b03..5447cda9f1c 100644 --- a/lisp/log-edit.el +++ b/lisp/log-edit.el | |||
| @@ -309,20 +309,20 @@ automatically." | |||
| 309 | "Setup a buffer to enter a log message. | 309 | "Setup a buffer to enter a log message. |
| 310 | \\<log-edit-mode-map>The buffer will be put in `log-edit-mode'. | 310 | \\<log-edit-mode-map>The buffer will be put in `log-edit-mode'. |
| 311 | If SETUP is non-nil, the buffer is then erased and `log-edit-hook' is run. | 311 | If SETUP is non-nil, the buffer is then erased and `log-edit-hook' is run. |
| 312 | Mark and point will be set around the entire contents of the | 312 | Mark and point will be set around the entire contents of the buffer so |
| 313 | buffer so that it is easy to kill the contents of the buffer with \\[kill-region]. | 313 | that it is easy to kill the contents of the buffer with \\[kill-region]. |
| 314 | Once you're done editing the message, pressing \\[log-edit-done] will call | 314 | Once you're done editing the message, pressing \\[log-edit-done] will call |
| 315 | `log-edit-done' which will end up calling CALLBACK to do the actual commit. | 315 | `log-edit-done' which will end up calling CALLBACK to do the actual commit. |
| 316 | PARAMS if non-nil is an alist. The keys for the alist can be: | 316 | |
| 317 | `log-edit-listfun' and `log-edit-diff-function'. The associated | 317 | PARAMS if non-nil is an alist. Possible keys and associated values: |
| 318 | value for `log-edit-listfun' should be a function with not | 318 | `log-edit-listfun' -- function taking no arguments that returns the list of |
| 319 | arguments that returns the list of files that are concerned by | 319 | files that are concerned by the current operation (using relative names); |
| 320 | the current operation (using relative names). The associated | 320 | `log-edit-diff-function' -- function taking no arguments that |
| 321 | value for `log-edit-diff-function' should be a function with no | 321 | displays a diff of the files concerned by the current operation. |
| 322 | arguments that displays a diff of the files concerned by the current operation. | 322 | |
| 323 | If BUFFER is non-nil `log-edit' will jump to that buffer, use it to edit the | 323 | If BUFFER is non-nil `log-edit' will jump to that buffer, use it to edit the |
| 324 | log message and go back to the current buffer when done. Otherwise, it | 324 | log message and go back to the current buffer when done. Otherwise, it |
| 325 | uses the current buffer." | 325 | uses the current buffer." |
| 326 | (let ((parent (current-buffer))) | 326 | (let ((parent (current-buffer))) |
| 327 | (if buffer (pop-to-buffer buffer)) | 327 | (if buffer (pop-to-buffer buffer)) |
| 328 | (when (and log-edit-setup-invert (not (eq setup 'force))) | 328 | (when (and log-edit-setup-invert (not (eq setup 'force))) |