changeset 101382:90e9da27dce4

Crunch "sync with trunk" entries.
author Glenn Morris <rgm@gnu.org>
date Fri, 23 Jan 2009 04:18:22 +0000
parents d3cc8ddc6e3c
children bd55aeeb0d2c
files lisp/mail/ChangeLog.pmail
diffstat 1 files changed, 4 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/mail/ChangeLog.pmail	Fri Jan 23 04:17:18 2009 +0000
+++ b/lisp/mail/ChangeLog.pmail	Fri Jan 23 04:18:22 2009 +0000
@@ -338,17 +338,11 @@
 
 2009-01-22  Chong Yidong  <cyd@stupidchicken.com>
 
-	* 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/rmailkwd.el: Sync with rmailkwd.el.
+	* mail/rmailsort.el (rmail-sort-messages): Insert two newlines at the
+	end of the message if they do not exist.
 
-	* 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.