Merge changes from emacs-23 branch.

1 files changed, 117 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e6ad9ea0630..7f41e7df61a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,113 @@
+2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * log-edit.el (log-edit-font-lock-keywords): Don't try matching
+        stand-alone lines, since that is handled by log-edit-match-to-eoh
+        (Bug#6465).
+
+2010-11-27  Eduard Wiebe  <usenet@pusto.de>
+
+        * dired.el (dired-get-filename): Replace backslashes with slashes
+        in file names on MS-Windows, needed by `locate'.  (Bug#7308)
+        * locate.el (locate-default-make-command-line): Don't consider
+        drive letter and root directory part of
+        `directory-listing-before-filename-regexp'.  (Bug#7308)
+        (locate-post-command-hook, locate-post-command-hook): New defcustoms.
+
+2010-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/smie.el (smie-prec2->grammar): Simplify handling
+        of :smie-open/close-alist.
+        (smie-next-sexp): Make it accept a "start token" as argument.
+        (smie-indent-keyword): Be careful not to misidentify tokens that span
+        more than one line, as empty lines.  Add argument `token'.
+
+2010-11-27  Kenichi Handa  <handa@m17n.org>
+
+        * mail/rmailmm.el (rmail-mime-insert-multipart): For unsupported
+        multipart subtypes, insert all as usual.
+
+        * mail/rmail.el: Require rfc2047.
+
+2010-11-27  Kenichi Handa  <handa@m17n.org>
+
+        * mail/rmailmm.el (rmail-mime-entity, rmail-mime-entity-type)
+        (rmail-mime-entity-disposition)
+        (rmail-mime-entity-transfer-encoding, rmail-mime-entity-header)
+        (rmail-mime-entity-body, rmail-mime-entity-children): New functions.
+        (rmail-mime-save): Handle the case that the button's `data' is a
+        MIME entity.
+        (rmail-mime-insert-text): New function.
+        (rmail-mime-insert-image): Handle the case that DATA is a MIME
+        entity.
+        (rmail-mime-bulk-handler): Just call rmail-mime-insert-bulk.
+        (rmail-mime-insert-bulk): New function mostly copied from the old
+        rmail-mime-bulk-handler.
+        (rmail-mime-multipart-handler): Just call
+        rmail-mime-process-multipart.
+        (rmail-mime-process-multipart): New funciton mostly copied from
+        the old rmail-mime-multipart-handler.
+        (rmail-mime-show): Just call rmail-mime-process.
+        (rmail-mime-process): New funciton mostly copied from the old
+        rmail-mime-show.
+        (rmail-mime-insert-multipart, rmail-mime-parse)
+        (rmail-mime-insert, rmail-show-mime)
+        (rmail-insert-mime-forwarded-message)
+        (rmail-insert-mime-resent-message): New functions.
+        (rmail-insert-mime-forwarded-message-function): Set to
+        rmail-insert-mime-forwarded-message.
+        (rmail-insert-mime-resent-message-function): Set to
+        rmail-insert-mime-resent-message.
+
+        * mail/rmailsum.el: Require rfc2047.
+        (rmail-header-summary): Handle multiline Subject: field.
+        (rmail-summary-line-decoder): Change the default to
+        rfc2047-decode-string.
+
+        * mail/rmail.el (rmail-enable-mime): Change the default to t.
+        (rmail-mime-feature): Change the default to `rmailmm'.
+        (rmail-quit): Delete the specifal code for rmail-enable-mime.
+        (rmail-display-labels): Likewise.
+        (rmail-show-message-1): Check rmail-enable-mime, and use
+        rmail-show-mime-function for a MIME message.  Decode the headers
+        according to RFC2047.
+
+2010-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/which-func.el (which-func-imenu-joiner-function):
+        Return a string, as expected.
+        (which-function-mode): Make sure we stop any previous timer before
+        starting a new one.
+
+2010-11-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-default-method-alist)
+        (tramp-default-user-alist, tramp-default-proxies-alist):
+        Adapt custom options type.  (Bug#7445)
+
+2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/python.el: Add Ipython support (Bug#5390).
+        (python-shell-prompt-alist)
+        (python-shell-continuation-prompt-alist): New options.
+        (python--set-prompt-regexp): New function.
+        (inferior-python-mode, run-python, python-shell):
+        Require ansi-color.  Use python--set-prompt-regexp to set the comint
+        prompt based on the Python interpreter.
+        (python--prompt-regexp): New var.
+        (python-check-comint-prompt)
+        (python-comint-output-filter-function): Use it.
+        (run-python): Use a pipe (Bug#5694).
+
+2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/python.el (run-python): Doc fix.
+        (python-keep-current-directory-in-path): New var (Bug#7454).
+
+2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
+
+        * lpr.el (lpr-buffer, print-buffer, lpr-region, print-region):
+        Prompt user before actually printing.
+
 2010-11-27  Glenn Morris  <rgm@gnu.org>
 
         * startup.el (package-enable-at-startup, package-initialize):
@@ -232,7 +342,8 @@
 2010-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (kill-new, kill-append, kill-region):
-        * comint.el (comint-kill-region): Make the yank-handler argument obsolete.
+        * comint.el (comint-kill-region): Make the yank-handler argument
+        obsolete.
 
 2010-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -6079,7 +6190,7 @@
         * vc/vc-annotate.el (vc-annotate): Add an optional argument for the
         VC backend.  Use it when non-nil.
         (vc-annotate-warp-revision): Pass the VC backend to vc-annotate.
-        (Bug#6487)
+        (Bug#6487).
 
         Fix vc-annotate-show-changeset-diff-revision-at-line for git.
         * vc/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal):
@@ -9740,7 +9851,8 @@
 
 2010-02-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
-        * vc-bzr.el (vc-bzr-dir-extra-headers): Disable the pending merges header.
+        * vc-bzr.el (vc-bzr-dir-extra-headers):
+        Disable the pending merges header.
 
 2010-02-05  Juri Linkov  <juri@jurta.org>
 
@@ -10629,8 +10741,8 @@
 2009-12-18  Ulf Jasper  <ulf.jasper@web.de>
 
         * calendar/icalendar.el (icalendar--convert-tz-offset):
-        Fix timezone names.
-        (icalendar--convert-tz-offset): Fix the "last-day-problem".
+        Fixed timezone names.
+        (icalendar--convert-tz-offset): Fixed the "last-day-problem".
         (icalendar--add-diary-entry): Remove the trailing blank that
         diary-make-entry inserts.