Merge from trunk.

11 files changed, 104 insertions, 29 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef9e06b7d58..7a73f761fa8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,39 @@
+2012-10-12  Glenn Morris  <rgm@gnu.org>
+
+        * mail/rmailsum.el (rmail-header-summary):
+        Fix 2010-11-26 test for multiline Subject: field.  (Bug#12625)
+
+2012-10-12  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el (python-mode-map): Replace
+        subtitute-key-definition with proper command remapping.
+        (python-nav--up-list): Fix behavior for blocks on the same level.
+
+2012-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * help-fns.el (describe-function-1): Handle autoloads w/o docstrings.
+
+        * emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago
+        changes to the format of load-history.
+
+        * international/mule-cmds.el (read-char-by-name): Move let-binding of
+        completion-ignore-case in case that var is buffer-local (bug#12615).
+
+2012-10-11  Kenichi Handa  <handa@gnu.org>
+
+        * international/eucjp-ms.el: Re-generated.
+
+2012-10-10  Kenichi Handa  <handa@gnu.org>
+
+        * select.el (xselect--encode-string): If a coding is specified for
+        selection, and that is compatible with COMPOUND_TEXT, use it.
+
+2012-10-10  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (switch-to-buffer-preserve-window-point): New option.
+        (switch-to-buffer):
+        Obey `switch-to-buffer-preserve-window-point' (Bug#4041).
+
 2012-10-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * newcomment.el (comment-start-skip, comment-end-skip, comment-end):
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 4dd44bb6f22..7534ce5eaca 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -875,13 +875,11 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
                                (byte-compile-cl-file-p (car xs))))
                 (dolist (s xs)
                   (cond
-                   ((symbolp s)
-                    (unless (memq s old-autoloads)
-                      (push s byte-compile-noruntime-functions)))
                    ((and (consp s) (eq t (car s)))
                     (push (cdr s) old-autoloads))
-                   ((and (consp s) (eq 'autoload (car s)))
-                    (push (cdr s) byte-compile-noruntime-functions)))))))
+                   ((and (consp s) (memq (car s) '(autoload defun)))
+                    (unless (memq (cdr s) old-autoloads)
+                      (push (cdr s) byte-compile-noruntime-functions))))))))
           ;; Go through current-load-list for the locally defined funs.
           (let (old-autoloads)
             (while (and hist-nil-new (not (eq hist-nil-new hist-nil-orig)))
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 2eda628e262..122402797e1 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -728,7 +728,8 @@ If ALIST is non-nil, the new pairs are prepended to it."
 ;;;###autoload
 (progn
   ;; Make sure functions defined with cl-defsubst can be inlined even in
-  ;; packages which do not require CL.
+  ;; packages which do not require CL.  We don't put an autoload cookie
+  ;; directly on that function, since those cookies only go to cl-loaddefs.
   (autoload 'cl--defsubst-expand "cl-macs")
   ;; Autoload, so autoload.el and font-lock can use it even when CL
   ;; is not loaded.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index ef482f8f0e9..f17b29de720 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -621,7 +621,7 @@ FILE is the file where FUNCTION was probably defined."
              ;; If the function is autoloaded, and its docstring has
              ;; key substitution constructs, load the library.
              (doc (progn
-                    (and (autoloadp real-def)
+                    (and (autoloadp real-def) doc-raw
                          help-enable-auto-load
                          (string-match "\\([^\\]=\\|[^=]\\|\\`\\)\\\\[[{<]"
                                        doc-raw)
diff --git a/lisp/international/eucjp-ms.el b/lisp/international/eucjp-ms.el
index a16848a0c7c..6e4e1e798b0 100644
--- a/lisp/international/eucjp-ms.el
+++ b/lisp/international/eucjp-ms.el
@@ -2085,4 +2085,3 @@
               (setcar x (cdr x)) (setcdr x tmp)))
         map)
   (define-translation-table 'eucjp-ms-encode map))
-
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 58dd24ec8ea..3431c81df88 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2945,13 +2945,14 @@ at the beginning of the name.
 This function also accepts a hexadecimal number of Unicode code
 point or a number in hash notation, e.g. #o21430 for octal,
 #x2318 for hex, or #10r8984 for decimal."
-  (let* ((completion-ignore-case t)
-         (input (completing-read
-                 prompt
-                 (lambda (string pred action)
-                   (if (eq action 'metadata)
-                       '(metadata (category . unicode-name))
-                     (complete-with-action action (ucs-names) string pred))))))
+  (let ((input
+         (completing-read
+          prompt
+          (lambda (string pred action)
+            (let ((completion-ignore-case t))
+              (if (eq action 'metadata)
+                  '(metadata (category . unicode-name))
+                (complete-with-action action (ucs-names) string pred)))))))
     (cond
      ((string-match-p "\\`[0-9a-fA-F]+\\'" input)
       (string-to-number input 16))
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index c75a1989e8e..a2cb7cb9ee8 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4707,7 +4707,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order.
 
 ;;;### (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 --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index d3a464161cb..612ccbdfd9e 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -785,7 +785,7 @@ the message being processed."
                  (setq pos (point))
                  (forward-line 1)
                  (setq str (buffer-substring pos (1- (point))))
-                 (while (looking-at "\\s ")
+                 (while (looking-at "[ \t]")
                    (setq str (concat str " " 
                                      (buffer-substring (match-end 0)
                                                        (line-end-position))))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 5bf64c18f99..ff805d64024 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -229,15 +229,9 @@
 (defvar python-mode-map
   (let ((map (make-sparse-keymap)))
     ;; Movement
-    (substitute-key-definition 'backward-sentence
-                               'python-nav-backward-block
-                               map global-map)
-    (substitute-key-definition 'forward-sentence
-                               'python-nav-forward-block
-                               map global-map)
-    (substitute-key-definition 'backward-up-list
-                               'python-nav-backward-up-list
-                               map global-map)
+    (define-key map [remap backward-sentence] 'python-nav-backward-block)
+    (define-key map [remap forward-sentence] 'python-nav-forward-block)
+    (define-key map [remap backward-up-list] 'python-nav-backward-up-list)
     (define-key map "\C-c\C-j" 'imenu)
     ;; Indent specific
     (define-key map "\177" 'python-indent-dedent-line-backspace)
@@ -1444,7 +1438,7 @@ DIR is always 1 or -1 and comes sanitized from
              (save-excursion
                (let ((indentation (current-indentation)))
                  (while (and (python-nav-backward-block)
-                             (> (current-indentation) indentation))))
+                             (>= (current-indentation) indentation))))
                (point))))
         (and (> (point) prev-block-pos)
              (goto-char prev-block-pos))))
diff --git a/lisp/select.el b/lisp/select.el
index d3153a0ce0e..54520704261 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -248,7 +248,17 @@ two markers or an overlay.  Otherwise, it is nil."
                                     (setq non-unicode t)
                                   (setq eight-bit t)))))
                       str)
-                (setq type (if non-unicode 'COMPOUND_TEXT
+                (setq type (if (or non-unicode
+                                   (and
+                                    non-latin-1
+                                    ;; If a coding is specified for
+                                    ;; selection, and that is
+                                    ;; compatible with COMPOUND_TEXT,
+                                    ;; use it.
+                                    coding
+                                    (eq (coding-system-get coding :mime-charset)
+                                        'x-ctext)))
+                               'COMPOUND_TEXT
                              (if non-latin-1 'UTF8_STRING
                                (if eight-bit 'C_STRING
                                  'STRING))))))))
diff --git a/lisp/window.el b/lisp/window.el
index f9761366b62..b033f9c26e3 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5818,6 +5818,26 @@ buffer with the name BUFFER-OR-NAME and return that buffer."
             buffer))
     (other-buffer)))
 
+(defcustom switch-to-buffer-preserve-window-point nil
+  "If non-nil, `switch-to-buffer' tries to preserve `window-point'.
+If this is nil, `switch-to-buffer' displays the buffer at that
+buffer's `point'.  If this is `already-displayed', it tries to
+display the buffer at its pevious position in the selected
+window, provided the buffer is currently displayed in some other
+window on any visible or iconified frame.  If this is t, it
+unconditionally tries to display the buffer at its previous
+position in the selected window.
+
+This variable is ignored if the the buffer is already displayed
+in the selected window or never appeared in it before, or if
+`switch-to-buffer' calls `pop-to-buffer' to display the buffer."
+  :type '(choice
+          (const :tag "Never" nil)
+          (const :tag "If already displayed elsewhere" already-displayed)
+          (const :tag "Always" t))
+  :group 'windows
+  :version "24.3")
+
 (defun switch-to-buffer (buffer-or-name &optional norecord force-same-window)
   "Switch to buffer BUFFER-OR-NAME in the selected window.
 If the selected window cannot display the specified
@@ -5843,6 +5863,10 @@ If optional argument FORCE-SAME-WINDOW is non-nil, the buffer
 must be displayed in the selected window; if that is impossible,
 signal an error rather than calling `pop-to-buffer'.
 
+The option `switch-to-buffer-preserve-window-point' can be used
+to make the buffer appear at its last position in the selected
+window.
+
 Return the buffer switched to."
   (interactive
    (list (read-buffer-to-switch "Switch to buffer: ") nil 'force-same-window))
@@ -5859,7 +5883,19 @@ Return the buffer switched to."
       (if force-same-window
           (user-error "Cannot switch buffers in a dedicated window")
         (pop-to-buffer buffer norecord)))
-     (t (set-window-buffer nil buffer)))
+     (t
+      (let* ((entry (assq buffer (window-prev-buffers)))
+             (displayed (and (eq switch-to-buffer-preserve-window-point
+                                 'already-displayed)
+                             (get-buffer-window buffer 0))))
+        (set-window-buffer nil buffer)
+        (when (and entry
+                   (or (eq switch-to-buffer-preserve-window-point t)
+                       displayed))
+          ;; Try to restore start and point of buffer in the selected
+          ;; window (Bug#4041).
+          (set-window-start (selected-window) (nth 1 entry) t)
+          (set-window-point nil (nth 2 entry))))))
 
     (unless norecord
       (select-window (selected-window)))