diff lisp/ChangeLog @ 112098:40af77a50adc

Merge changes from emacs-23 branch

--- a/lisp/ChangeLog	Sun Jan 02 11:23:02 2011 +0000
+++ b/lisp/ChangeLog	Sun Jan 02 15:28:40 2011 -0500
@@ -1,3 +1,119 @@
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* term/w32-win.el (dynamic-library-alist): Set up correctly for
+	libpng versions both before and after 1.4.0.  (Bug#7716)
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* time.el (display-time-mode): Mention display-time-interval in
+	the doc string.  (Bug#7713)
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* mail/rmailmm.el (rmail-mime-parse): Perform parsing in
+	condition-case and return an error message string if something
+	goes wrong.
+	(rmail-show-mime): Adjust for the above change.  Insert the
+	header by rmail-mime-insert-header.
+
[phone]  Kenichi Handa  <[e-mail]>
+
+	* mail/rmailmm.el: New key bindings for rmail-mime-next-item,
+	rmail-mime-previous-item, and rmail-mime-toggle-hidden.
+	(rmail-mime-mbox-buffer)
+	(rmail-mime-view-buffer, rmail-mime-coding-system): New variables.
+	(rmail-mime-entity): Argument changed.  All codes handling an
+	entity object are changed.
+	(rmail-mime-entity-header, rmail-mime-entity-body): Adjust for
+	the above change.
+	(rmail-mime-entity-children, rmail-mime-entity-handler)
+	(rmail-mime-entity-tagline): New functions.
+	(rmail-mime-message-p): New function.
+	(rmail-mime-save): Bind rmail-mime-mbox-buffer.
+	(rmail-mime-entity-segment, rmail-mime-next-item)
+	(rmail-mime-previous-item, rmail-mime-shown-mode)
+	(rmail-mime-hidden-mode, rmail-mime-raw-mode)
+	(rmail-mime-toggle-raw, rmail-mime-toggle-hidden)
+	(rmail-mime-insert-tagline, rmail-mime-insert-header):
+	New functions.
+	(rmail-mime-text-handler): Call rmail-mime-insert-text.
+	(rmail-mime-insert-decoded-text): New function.
+	(rmail-mime-insert-text): Call rmail-mime-insert-decoded-text.
+	(rmail-mime-insert-image): Argument changed.  Caller changed.
+	(rmail-mime-image): Call rmail-mime-toggle-hidden.
+	(rmail-mime-set-bulk-data): New funciton.
+	(rmail-mime-insert-bulk): Argument changed.
+	(rmail-mime-multipart-handler): Return t.
+	(rmail-mime-process-multipart): Argument changed.
+	Handle "multipart/alternative" here.
+	(rmail-mime-process): Argument changed.
+	(rmail-mime-parse): Bind rmail-mime-mbox-buffer.
+	(rmail-mime-insert): Argument changed.  Handle raw display mode.
+	(rmail-mime): Argument changed.  Handle toggling of raw display
+	mode.
+	(rmail-show-mime): Bind rmail-mime-mbox-buffer and
+	rmail-mime-view-buffer.
+	(rmail-insert-mime-forwarded-message): Likewise.
+	(rmail-search-mime-message): Likewise.  Don't bind rmail-buffer.
+
+	* mail/rmail.el (rmail-show-message-1): If rmail-enable-mime is
+	non-nil, handle the header in rmail-show-mime-function.
+
[phone]  Leo  <[e-mail]>
+
+	* help-fns.el (describe-variable): Fix previous change.
+
[phone]  Juri Linkov  <[e-mail]>
+
+	* isearch.el (isearch-lazy-highlight-error): New variable.
+	(isearch-lazy-highlight-new-loop): Compare `isearch-error' and
+	`isearch-lazy-highlight-error'.  Set `isearch-lazy-highlight-error'
+	to the current value of `isearch-error' (Bug#7468).
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* help-fns.el (describe-variable): Don't emit trailing whitespace
+	(Bug#7511).
+
[phone]  Chong Yidong  <[e-mail]>
+
+	* textmodes/rst.el (rst-compile-pdf-preview)
+	(rst-compile-slides-preview): Use make-temp-file (Bug#7646).
+
[phone]  Kevin Gallagher  <[e-mail]>
+
+	* emulation/edt-mapper.el: Override mapping of function keys so
+	that the later call to read-key-sequence works.
+
[phone]  Eli Zaretskii  <[e-mail]>
+
+	* mail/smtpmail.el (smtpmail-send-it): Write queued mail body with
+	Unix EOLs.  (Bug#7589)
+
[phone]  Leo  <[e-mail]>
+
+	* eshell/em-hist.el (eshell-previous-matching-input): Signal error
+	if point is not behind eshell-last-output-end (Bug#7585).
+
[phone]  Stefan Monnier  <[e-mail]>
+
+	* files.el (file-local-variables-alist):
+	Make permanent-local (bug#7767).
+
[phone]  Glenn Morris  <[e-mail]>
+
+	* version.el (emacs-copyright): Set short copyright year to 2011.
+
[phone]  Mark Lillibridge  <[e-mail]>  (tiny change)
+
+	* mail/mail-utils.el (mail-strip-quoted-names): Avoid clobbering
+	an existing temp buffer.  (Bug#7746)
+
[phone]  Glenn Morris  <[e-mail]>
+
+	* mail/mail-utils.el (mail-mbox-from): Handle From: headers with
+	multiple addresses.  (Bug#7760)
+
 2010-12-31  Michael Albinus  <[e-mail]>
 
 	* net/tramp-sh.el (tramp-methods): Add recursive options to "scpc"
@@ -20285,7 +20401,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 2009, 2010, 2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.