Merge changes from emacs-23 branch.

diff --cc lisp/ChangeLog
index e6ad9ea0630f34fe28fb108034c6802baa841fdd,8544b0e53d37b9489d825fbe048f6a5830f485bf..7f41e7df61a1c9f760c8e9cf976c361bdddd555c
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,113 +1,118 @@@
+ 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):
 +      Remove unnecessary declarations.
 +
  2010-11-27  Eli Zaretskii  <eliz@gnu.org>
  
        * international/characters.el (glyphless-char-display-control):