From 35fcc05c0e4f0ee9312c422e10ab14b4d34bb884 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 31 Oct 2010 11:13:40 -0700 Subject: [PATCH] * lisp/ChangeLog: Merge fixes. --- lisp/ChangeLog | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9b812b00d66..2b878c57e7f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 +2010-10-31 Glenn Morris * 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 - * select.el (x-selection): Mark it as an obsolete alias. 2010-10-31 Aaron S. Hawley @@ -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 - - * comint.el (comint-password-prompt-regexp): - Match "enter the password". (Bug#7224) - 2010-10-31 Alan Mackenzie * progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error. -- 2.11.4.GIT