[Emacs-diffs] /srv/bzr/emacs/trunk r102168: * lisp/ChangeLog: Merge fixes.

[Glenn Morris]

------------------------------------------------------------
revno: 102168
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-31 11:13:40 -0700
message:
  * lisp/ChangeLog: Merge fixes.
modified:
  lisp/ChangeLog

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-31 16:03:11 +0000
+++ b/lisp/ChangeLog    2010-10-31 18:13:40 +0000
@@ -8,7 +8,7 @@
        * net/tramp.el (tramp-handle-insert-file-contents): For root,
        preserve owner and group when editing files.  (Bug#7289)
 
-2010-10-31  Stefan Monnier  <address@hidden>
+2010-10-31  Glenn Morris  <address@hidden>
 
        * speedbar.el (speedbar-mode):
        * play/fortune.el (fortune-in-buffer, fortune):
@@ -17,8 +17,6 @@
        * textmodes/bibtex.el (bibtex-validate, bibtex-validate-globally):
        Replace inappropriate uses of toggle-read-only.  (Bug#7292)
 
-2010-10-31  Glenn Morris  <address@hidden>
-
        * select.el (x-selection): Mark it as an obsolete alias.
 
 2010-10-31  Aaron S. Hawley  <address@hidden>
@@ -31,11 +29,6 @@
        * menu-bar.el (menu-bar-files-menu): Make it into an actual alias,
        rather than just an unused variable that inherits from the real one.
 
-2010-10-31  Glenn Morris  <address@hidden>
-
-       * comint.el (comint-password-prompt-regexp):
-       Match "enter the password".  (Bug#7224)
-
 2010-10-31  Alan Mackenzie  <address@hidden>
 
        * progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error.