Merge from trunk.

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/mail/rmail.el
index c75a1989e8eb0404c2dba4f08a06cafde71dee34,c75a1989e8eb0404c2dba4f08a06cafde71dee34..a2cb7cb9ee80a1ca54b10151e9f64d2965e5bdc8
--- 1/lisp/mail/rmail.el
--- 2/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@@ -4707,7 -4707,7 +4707,7 @@@ If prefix argument REVERSE is non-nil, 
  \f
  ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
  ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
--;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "bef21a376bd5bd59792a20dd86e6ec34")
++;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "6cafe6b03e187b5836e3c359322b5cbf")
  ;;; Generated autoloads from rmailsum.el
  
  (autoload 'rmail-summary "rmailsum" "\

diff --cc src/ChangeLog
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/makefile.w32-in
Simple merge