Mercurial > emacs
changeset 111265:d2e4336159e8
* lisp/ChangeLog: Merge fixes.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 31 Oct 2010 11:13:40 -0700 |
| parents | 238b8ef4506c |
| children | 8da6c861bf9f |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 1 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Oct 31 17:03:11 2010 +0100 +++ b/lisp/ChangeLog Sun Oct 31 11:13:40 2010 -0700 @@ -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 <monnier@iro.umontreal.ca> +2010-10-31 Glenn Morris <rgm@gnu.org> * 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 <rgm@gnu.org> - * select.el (x-selection): Mark it as an obsolete alias. 2010-10-31 Aaron S. Hawley <aaron.s.hawley@gmail.com> @@ -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 <rgm@gnu.org> - - * comint.el (comint-password-prompt-regexp): - Match "enter the password". (Bug#7224) - 2010-10-31 Alan Mackenzie <acm@muc.de> * progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error.