[Emacs-diffs] trunk r117701: Forgotten ChangeLog changes

[Stefan Monnier]

------------------------------------------------------------
revno: 117701
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2014-08-13 10:16:48 -0400
message:
  Forgotten ChangeLog changes
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-13 08:42:33 +0000
+++ b/lisp/ChangeLog    2014-08-13 14:16:48 +0000
@@ -1,14 +1,22 @@
+2014-08-13  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2014-08-12 02:47:36 +0000
+++ b/lisp/gnus/ChangeLog       2014-08-13 14:16:48 +0000
@@ -416,7 +416,7 @@
        * gnus-setup.el (gnus-use-sendmail): We never use sendmail for mail
        reading.
 
-2014-01-09  Ken Olum  <address@hidden>  (tiny change)
+2014-01-09  Ken Olum  <address@hidden>
 
        * message.el (message-bury): Call bury-buffer with no argument
        in the message-return-action case too.