Mercurial > emacs
changeset 68917:32ec32c68c16
*** empty log message ***
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Wed, 15 Feb 2006 07:28:15 +0000 |
| parents | 485885718688 |
| children | 5aa4a7ce059a |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Feb 15 04:38:45 2006 +0000 +++ b/lisp/ChangeLog Wed Feb 15 07:28:15 2006 +0000 @@ -44,7 +44,6 @@ * files.el (hack-local-variables): Remove ignored variables before checking if any variables need setting. ->>>>>>> 1.9141 2006-02-14 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * cus-start.el (all): Add x-gtk-whole-detached-tool-bar. @@ -237,7 +236,7 @@ 2006-02-11 Martin Rudalics <rudalics@gmx.at> * files.el (revert-buffer, recover-file): Replace buffer-read-only - with inhibit-read-only. Suggested by Stefan Monnier. + with inhibit-read-only. Suggested by Stefan Monnier. (revert-buffer): Let insert-file-contents discard buffer-undo-list. Simplify code. (find-file, find-file-existing, revert-buffer): Doc-string fixes.