From: Glenn Morris Date: Fri, 23 Jan 2009 04:18:22 +0000 (+0000) Subject: Crunch "sync with trunk" entries. X-Git-Tag: emacs-pretest-23.0.90~285 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5931b58bc51bb07a22ff54de54b96c4a89b80981;p=emacs.git Crunch "sync with trunk" entries. --- diff --git a/lisp/mail/ChangeLog.pmail b/lisp/mail/ChangeLog.pmail index 7fbc34c06d8..4dab1401963 100644 --- a/lisp/mail/ChangeLog.pmail +++ b/lisp/mail/ChangeLog.pmail @@ -338,17 +338,11 @@ 2009-01-22 Chong Yidong - * mail/rmailsort.el: Sync with rmailsort.el. - (rmail-sort-messages): Insert two newlines at the end of the - message if they do not exist. + * mail/rmailsort.el (rmail-sort-messages): Insert two newlines at the + end of the message if they do not exist. - * mail/rmailkwd.el: Sync with rmailkwd.el. - - * mail/rmailout.el: Sync with rmailout.el. - - * mail/rmailedit.el: Sync with rmailedit.el. - (rmail-edit-current-message): Remove deleted function - rmail-msg-is-pruned. + * mail/rmailedit.el (rmail-edit-current-message): Remove deleted + function rmail-msg-is-pruned. * mail/rmaildesc.el: File deleted. @@ -506,7 +500,6 @@ * mail/rmail.el (rmail-perm-variables): Make sure rmail-desc-vector is buffer local. - (rmail-mime-charset-pattern): Sync with trunk. (rmail): Don't bind coding-system-for-read. (rmail-revert): Likewise. (rmail-variables): Don't set buffer-file-coding-system.