diff options
| -rw-r--r-- | lisp/ChangeLog | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0e97f2866a7..5d3b960af59 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * files.el (hack-local-variables): Remove ignored variables before | 44 | * files.el (hack-local-variables): Remove ignored variables before |
| 45 | checking if any variables need setting. | 45 | checking if any variables need setting. |
| 46 | 46 | ||
| 47 | >>>>>>> 1.9141 | ||
| 48 | 2006-02-14 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 47 | 2006-02-14 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 49 | 48 | ||
| 50 | * cus-start.el (all): Add x-gtk-whole-detached-tool-bar. | 49 | * cus-start.el (all): Add x-gtk-whole-detached-tool-bar. |
| @@ -237,7 +236,7 @@ | |||
| 237 | 2006-02-11 Martin Rudalics <rudalics@gmx.at> | 236 | 2006-02-11 Martin Rudalics <rudalics@gmx.at> |
| 238 | 237 | ||
| 239 | * files.el (revert-buffer, recover-file): Replace buffer-read-only | 238 | * files.el (revert-buffer, recover-file): Replace buffer-read-only |
| 240 | with inhibit-read-only. Suggested by Stefan Monnier. | 239 | with inhibit-read-only. Suggested by Stefan Monnier. |
| 241 | (revert-buffer): Let insert-file-contents discard | 240 | (revert-buffer): Let insert-file-contents discard |
| 242 | buffer-undo-list. Simplify code. | 241 | buffer-undo-list. Simplify code. |
| 243 | (find-file, find-file-existing, revert-buffer): Doc-string fixes. | 242 | (find-file, find-file-existing, revert-buffer): Doc-string fixes. |