diff options
| author | Glenn Morris | 2012-05-31 16:06:04 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-05-31 16:06:04 -0400 |
| commit | b691b884eeef2ecb8772ac121ab23136b9d9d0d2 (patch) | |
| tree | ec897739884f405690c405ce0d8b6dcc305648ae | |
| parent | 43f5c7ae53b9afbda100ec26758ff0fb3eadfb48 (diff) | |
| download | emacs-b691b884eeef2ecb8772ac121ab23136b9d9d0d2.tar.gz emacs-b691b884eeef2ecb8772ac121ab23136b9d9d0d2.zip | |
ChangeLog merge fix
| -rw-r--r-- | lisp/ChangeLog | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b70008fb821..372fc63fc8b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -19,12 +19,6 @@ | |||
| 19 | * desktop.el (desktop-read): Clear previous and next buffers for | 19 | * desktop.el (desktop-read): Clear previous and next buffers for |
| 20 | all windows and bury *Messages* buffer (bug#11556). | 20 | all windows and bury *Messages* buffer (bug#11556). |
| 21 | 21 | ||
| 22 | 2012-05-31 Eli Zaretskii <eliz@gnu.org> | ||
| 23 | |||
| 24 | * mail/sendmail.el (mail-yank-region): Recognize | ||
| 25 | rmail-yank-current-message in addition to insert-buffer. Fixes | ||
| 26 | mail-mode's "C-c C-r" that otherwise does nothing when invoked in | ||
| 27 | |||
| 28 | 2012-05-31 Stefan Monnier <monnier@iro.umontreal.ca> | 22 | 2012-05-31 Stefan Monnier <monnier@iro.umontreal.ca> |
| 29 | 23 | ||
| 30 | Add `declare' for `defun'. Align `defmacro's with it. | 24 | Add `declare' for `defun'. Align `defmacro's with it. |