[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115369: Remember log-edit comment when the buffer i
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] trunk r115369: Remember log-edit comment when the buffer is killed |
Date: |
Wed, 04 Dec 2013 00:37:42 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115369
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-04 02:37:33 +0200
message:
Remember log-edit comment when the buffer is killed
* lisp/vc/log-edit.el (log-edit-add-new-comment): Rename to
`log-edit-remember-comment', make argument optional. Adjust all
callers.
(log-edit-mode): Add `log-edit-remember-comment' to
`kill-buffer-hook' locally.
(log-edit-kill-buffer): Don't remember comment explicitly since
the buffer is killed anyway.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/vc/log-edit.el logedit.el-20091113204419-o5vbwnq5f7feedwu-1776
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-12-04 00:12:02 +0000
+++ b/lisp/ChangeLog 2013-12-04 00:37:33 +0000
@@ -1,3 +1,13 @@
+2013-12-04 Dmitry Gutov <address@hidden>
+
+ * vc/log-edit.el (log-edit-add-new-comment): Rename to
+ `log-edit-remember-comment', make argument optional. Adjust all
+ callers.
+ (log-edit-mode): Add `log-edit-remember-comment' to
+ `kill-buffer-hook' locally.
+ (log-edit-kill-buffer): Don't remember comment explicitly since
+ the buffer is killed anyway.
+
2013-12-04 Juri Linkov <address@hidden>
* isearch.el (isearch-mode, isearch-done): Don't set arg LOCAL in
=== modified file 'lisp/vc/log-edit.el'
--- a/lisp/vc/log-edit.el 2013-12-02 22:13:51 +0000
+++ b/lisp/vc/log-edit.el 2013-12-04 00:37:33 +0000
@@ -476,6 +476,7 @@
(set (make-local-variable 'font-lock-defaults)
'(log-edit-font-lock-keywords t))
(make-local-variable 'log-edit-comment-ring-index)
+ (add-hook 'kill-buffer-hook 'log-edit-remember-comment nil t)
(hack-dir-local-variables-non-file-buffer))
(defun log-edit-hide-buf (&optional buf where)
@@ -488,7 +489,8 @@
(if win (ignore-errors (delete-window win))))
(bury-buffer buf))))
-(defun log-edit-add-new-comment (comment)
+(defun log-edit-remember-comment (&optional comment)
+ (unless comment (setq comment (buffer-string)))
(when (or (ring-empty-p log-edit-comment-ring)
(not (equal comment (ring-ref log-edit-comment-ring 0))))
(ring-insert log-edit-comment-ring comment)))
@@ -524,7 +526,7 @@
(save-excursion
(goto-char (point-max))
(insert ?\n)))
- (log-edit-add-new-comment (buffer-string))
+ (log-edit-remember-comment)
(let ((win (get-buffer-window log-edit-files-buf)))
(if (and log-edit-confirm
(not (and (eq log-edit-confirm 'changed)
@@ -545,7 +547,6 @@
Also saves its contents in the comment history and hides
`log-edit-files-buf'."
(interactive)
- (log-edit-add-new-comment (buffer-string))
(log-edit-hide-buf)
(let ((buf (current-buffer)))
(quit-windows-on buf)
@@ -659,7 +660,7 @@
(defun log-edit-add-to-changelog ()
"Insert this log message into the appropriate ChangeLog file."
(interactive)
- (log-edit-add-new-comment (buffer-string))
+ (log-edit-remember-comment)
(dolist (f (log-edit-files))
(let ((buffer-file-name (expand-file-name f)))
(save-excursion
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115369: Remember log-edit comment when the buffer is killed,
Dmitry Gutov <=