From de34d6b400788060be8f24e183c6d33a12587b3a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 13 Aug 2014 10:16:48 -0400 Subject: [PATCH] Forgotten ChangeLog changes --- lisp/ChangeLog | 20 ++++++++++++++------ lisp/gnus/ChangeLog | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39ab7caf874..14146a032bf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,14 +1,22 @@ +2014-08-13 Stefan Monnier + + * obsolete/mouse-sel.el (mouse-sel-mode): Use add/remove-function. + (mouse-sel--ignore): New function. + (mouse-sel-has-been-enabled, mouse-sel-original-bindings) + (mouse-sel-original-interprogram-cut-function) + (mouse-sel-original-interprogram-paste-function): Remove. + 2014-08-13 Eric S. Raymond - * vc/vc.git.el: (vc-git-find-file-hook): New function. Adds - support for calling smerge on a conflicted file, and calling git + * vc/vc.git.el: (vc-git-find-file-hook): New function. + Adds support for calling smerge on a conflicted file, and calling git add when there are no longer conflict markers in a saved file. This is a completed version of Rüdiger Sonderfeld's proposal. - * vc/vc-git.el (vc-git-conflicted-files): New function. Integrate - Rüdiger Sonderfeld's code for detecting conflicted files using a - status listing. Useful in itself and a step towards better smerge - support. + * vc/vc-git.el (vc-git-conflicted-files): New function. + Integrate Rüdiger Sonderfeld's code for detecting conflicted files + using a status listing. Useful in itself and a step towards better + smerge support. 2014-08-12 Stefan Monnier diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 31a60b43724..6541c699c48 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -416,7 +416,7 @@ * gnus-setup.el (gnus-use-sendmail): We never use sendmail for mail reading. -2014-01-09 Ken Olum (tiny change) +2014-01-09 Ken Olum * message.el (message-bury): Call bury-buffer with no argument in the message-return-action case too. -- 2.11.4.GIT