upstream

15 files changed, 288 insertions, 168 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53ef2a1bbcd..91ffbcff96b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,70 @@
+2011-09-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/package.el (package-alist): Fix risky-local-variable
+        declaration.
+        (package--add-to-archive-contents): If there is a duplicate entry
+        with an older version, remove it.
+        (package-menu-mark-delete, package-menu-mark-install)
+        (package-menu-mark-unmark): Make unused args optional.
+        (package-menu-mark-obsolete-for-deletion): Use
+        package-menu-get-status instead of a regexp search.
+        (package-menu-get-status): Use tabulated-list-entry.
+        (package-menu-mark-upgrades): New command.
+        (package-menu-mode-map): Bind it to U.  Add it to menu bar.
+        (package-menu-execute): Do installation before deletion.
+        (package-menu-refresh, package-menu-execute): Use derived-mode-p
+        instead of checking major-mode.
+        (package-menu--find-upgrades): New function.
+
+2011-09-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/smtpmail.el (smtpmail-send-command): Don't include AUTH
+        passwords in the log buffer.
+        (smtpmail-process-filter): Update the process marker so that the
+        "broken by peer" status message is inserted in the right place.
+
+2011-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/bibtex.el (bibtex-complete-string-cleanup)
+        (bibtex-complete-crossref-cleanup): Adjust to accommodate needs of
+        bibtex-completion-at-point-function.
+        (bibtex-completion-at-point-function): Use them.
+
+        * newcomment.el (comment-add, comment-valid-prefix-p): Docfix.
+
+        * mpc.el (mpc-constraints-tag-lookup): New function.
+        (mpc-constraints-restore): Use it to make jumping to "album=Foo" apply
+        also to browser "album|playlist".
+
+2011-09-14  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-fail-pos): Add new arg `msg'.  Doc fix.
+        (isearch-edit-string): Use length of `isearch-string' when
+        `isearch-fail-pos' returns nil.
+        (isearch-message): Remove duplicate code and call
+        `isearch-fail-pos' with arg `t'.
+
+2011-09-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * replace.el (occur-mode-goto-occurrence): Don't force using other
+        window (Bug#9499).
+
+        * dired-aux.el (dired-do-chmod): Don't provide initial input.
+
+2011-09-14  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-window): Remove.
+        (display-buffer-record-window): Use help-setup window parameter
+        instead of variable display-buffer-window.
+        (display-buffer-function, special-display-buffer-names)
+        (special-display-function): Mention help-setup parameter instead
+        of display-buffer-window in doc-string.
+        * help.el (help-window-setup): New argument help-window.
+        Use help-window-setup parameter instead of display-buffer-window.
+        Reword some messages.
+        (with-help-window): Pass window used for displaying the buffer
+        to help-window-setup.  Don't set display-buffer-window.
+
 2011-09-13  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/debug.el (debugger-make-xrefs):
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 2f2d28e596c..b09096978fd 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -285,11 +285,8 @@ Symbolic modes like `g+w' are allowed."
                          (match-string 3 modestr)))))
          (modes (dired-mark-read-string
                  "Change mode of %s to: "
-                 ;; Insert initial input if there's only one file.
-                 (unless (cadr files) default)
-                 'chmod arg files default))
+                 nil 'chmod arg files default))
          num-modes)
-
     (cond ((equal modes "")
            ;; We used to treat empty input as DEFAULT, but that is not
            ;; such a good idea (Bug#9361).
@@ -388,7 +385,7 @@ Uses the shell command coming from variables `lpr-command' and
     (dired-run-shell-command (dired-shell-stuff-it command file-list nil))))
 
 (defun dired-mark-read-string (prompt initial op-symbol arg files
-                               &optional standard-value)
+                               &optional default-value)
   "Read args for a Dired marked-files command, prompting with PROMPT.
 Return the user input (a string).
 
@@ -397,14 +394,14 @@ OP-SYMBOL is an operation symbol (see `dired-no-confirm').
 ARG is normally the prefix argument for the calling command.
 FILES should be a list of file names.
 
-STANDARD-VALUE, if non-nil, should be a \"standard\" value or
-list of such values, available via history commands.  Note that
-if the user enters empty input, this function returns the empty
-string, not STANDARD-VALUE."
+DEFAULT-VALUE, if non-nil, should be a \"standard\" value or list
+of such values, available via history commands.  Note that if the
+user enters empty input, this function returns the empty string,
+not DEFAULT-VALUE."
   (dired-mark-pop-up nil op-symbol files
                      'read-from-minibuffer
                      (format prompt (dired-mark-prompt arg files))
-                     initial nil nil nil standard-value))
+                     initial nil nil nil default-value))
 
 ;;; Cleaning a directory: flagging some backups for deletion.
 
diff --git a/lisp/dired.el b/lisp/dired.el
index 3428f5bef8b..f01e195f9ec 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3663,7 +3663,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "bbc9babe193843cad535d73492326c48")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "0ffe89ae728efb341dfacff6c85e2ba4")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index caf0ec2e8b8..f0b1537e2b3 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -309,7 +309,7 @@ The vector DESC has the form [VERSION-LIST REQS DOCSTRING].
 This variable is set automatically by `package-load-descriptor',
 called via `package-initialize'.  To change which packages are
 loaded and/or activated, customize `package-load-list'.")
-(put 'package-archive-contents 'risky-local-variable t)
+(put 'package-alist 'risky-local-variable t)
 
 (defvar package-activated-list nil
   "List of the names of currently activated packages.")
@@ -820,13 +820,19 @@ If the archive version is too new, signal an error."
   "Add the PACKAGE from the given ARCHIVE if necessary.
 Also, add the originating archive to the end of the package vector."
   (let* ((name    (car package))
-         (version (aref (cdr package) 0))
-         (entry   (cons (car package)
+         (version (package-desc-vers (cdr package)))
+         (entry   (cons name
                         (vconcat (cdr package) (vector archive))))
-         (existing-package (cdr (assq name package-archive-contents))))
-    (when (or (not existing-package)
-              (version-list-< (aref existing-package 0) version))
-      (add-to-list 'package-archive-contents entry))))
+         (existing-package (assq name package-archive-contents)))
+    (cond ((not existing-package)
+           (add-to-list 'package-archive-contents entry))
+          ((version-list-< (package-desc-vers (cdr existing-package))
+                           version)
+           ;; Replace the entry with this one.
+           (setq package-archive-contents
+                 (cons entry
+                       (delq existing-package
+                             package-archive-contents)))))))
 
 (defun package-download-transaction (package-list)
   "Download and install all the packages in PACKAGE-LIST.
@@ -1269,6 +1275,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
     (define-key map "\177" 'package-menu-backup-unmark)
     (define-key map "d" 'package-menu-mark-delete)
     (define-key map "i" 'package-menu-mark-install)
+    (define-key map "U" 'package-menu-mark-upgrades)
     (define-key map "r" 'package-menu-refresh)
     (define-key map "~" 'package-menu-mark-obsolete-for-deletion)
     (define-key map "x" 'package-menu-execute)
@@ -1298,6 +1305,9 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
     (define-key menu-map [mi]
       '(menu-item "Mark for install" package-menu-mark-install
                   :help "Mark a package for installation and move to the next line"))
+    (define-key menu-map [mupgrades]
+      '(menu-item "Mark upgradable packages" package-menu-mark-upgrades
+                  :help "Mark packages that have a newer version for upgrading"))
     (define-key menu-map [s3] '("--"))
     (define-key menu-map [mg]
       '(menu-item "Update package list" revert-buffer
@@ -1422,7 +1432,7 @@ identifier (NAME . VERSION-LIST)."
 This fetches the contents of each archive specified in
 `package-archives', and then refreshes the package menu."
   (interactive)
-  (unless (eq major-mode 'package-menu-mode)
+  (unless (derived-mode-p 'package-menu-mode)
     (error "The current buffer is not a Package Menu"))
   (package-refresh-contents)
   (package-menu--generate t t))
@@ -1437,21 +1447,21 @@ If optional arg BUTTON is non-nil, describe its associated package."
         (describe-package package))))
 
 ;; fixme numeric argument
-(defun package-menu-mark-delete (num)
+(defun package-menu-mark-delete (&optional num)
   "Mark a package for deletion and move to the next line."
   (interactive "p")
   (if (member (package-menu-get-status) '("installed" "obsolete"))
       (tabulated-list-put-tag "D" t)
     (forward-line)))
 
-(defun package-menu-mark-install (num)
+(defun package-menu-mark-install (&optional num)
   "Mark a package for installation and move to the next line."
   (interactive "p")
   (if (string-equal (package-menu-get-status) "available")
       (tabulated-list-put-tag "I" t)
     (forward-line)))
 
-(defun package-menu-mark-unmark (num)
+(defun package-menu-mark-unmark (&optional num)
   "Clear any marks on a package and move to the next line."
   (interactive "p")
   (tabulated-list-put-tag " " t))
@@ -1467,9 +1477,8 @@ If optional arg BUTTON is non-nil, describe its associated package."
   (interactive)
   (save-excursion
     (goto-char (point-min))
-    (forward-line 2)
     (while (not (eobp))
-      (if (looking-at ".*\\s obsolete\\s ")
+      (if (equal (package-menu-get-status) "obsolete")
           (tabulated-list-put-tag "D" t)
         (forward-line 1)))))
 
@@ -1482,17 +1491,66 @@ If optional arg BUTTON is non-nil, describe its associated package."
   'package-menu-view-commentary 'package-menu-describe-package "24.1")
 
 (defun package-menu-get-status ()
-  (save-excursion
-    (if (looking-at ". [^ \t]*[ \t]*[^ \t]*[ \t]*\\([^ \t]*\\)")
-        (match-string 1)
+  (let* ((pkg (tabulated-list-get-id))
+         (entry (and pkg (assq pkg tabulated-list-entries))))
+    (if entry
+        (aref (cadr entry) 2)
       "")))
 
+(defun package-menu--find-upgrades ()
+  (let (installed available upgrades)
+    ;; Build list of installed/available packages in this buffer.
+    (dolist (entry tabulated-list-entries)
+      ;; ENTRY is ((NAME . VERSION) [NAME VERSION STATUS DOC])
+      (let ((pkg (car entry))
+            (status (aref (cadr entry) 2))
+            old)
+        (cond ((equal status "installed")
+               (push pkg installed))
+              ((equal status "available")
+               (push pkg available)))))
+    ;; Loop through list of installed packages, finding upgrades
+    (dolist (pkg installed)
+      (let ((avail-pkg (assq (car pkg) available)))
+        (and avail-pkg
+             (version-list-< (cdr pkg) (cdr avail-pkg))
+             (push avail-pkg upgrades))))
+    upgrades))
+
+(defun package-menu-mark-upgrades ()
+  "Mark all upgradable packages in the Package Menu.
+For each installed package with a newer version available, place
+an (I)nstall flag on the available version and a (D)elete flag on
+the installed version.  A subsequent \\[package-menu-execute]
+call will upgrade the package."
+  (interactive)
+  (unless (derived-mode-p 'package-menu-mode)
+    (error "The current buffer is not a Package Menu"))
+  (let ((upgrades (package-menu--find-upgrades)))
+    (if (null upgrades)
+        (message "No packages to upgrade.")
+      (widen)
+      (save-excursion
+        (goto-char (point-min))
+        (while (not (eobp))
+          (let* ((pkg (tabulated-list-get-id))
+                 (upgrade (assq (car pkg) upgrades)))
+            (cond ((null upgrade)
+                   (forward-line 1))
+                  ((equal pkg upgrade)
+                   (package-menu-mark-install))
+                  (t
+                   (package-menu-mark-delete))))))
+      (message "%d package%s marked for upgrading."
+               (length upgrades)
+               (if (= (length upgrades) 1) "" "s")))))
+
 (defun package-menu-execute ()
   "Perform marked Package Menu actions.
 Packages marked for installation are downloaded and installed;
 packages marked for deletion are removed."
   (interactive)
-  (unless (eq major-mode 'package-menu-mode)
+  (unless (derived-mode-p 'package-menu-mode)
     (error "The current buffer is not in Package Menu mode"))
   (let (install-list delete-list cmd id)
     (save-excursion
@@ -1509,6 +1567,14 @@ packages marked for deletion are removed."
                 ((eq cmd ?I)
                  (push (car id) install-list))))
         (forward-line)))
+    (when install-list
+      (if (yes-or-no-p
+           (if (= (length install-list) 1)
+               (format "Install package `%s'? " (car install-list))
+             (format "Install these %d packages (%s)? "
+                     (length install-list)
+                     (mapconcat 'symbol-name install-list ", "))))
+          (mapc 'package-install install-list)))
     ;; Delete packages, prompting if necessary.
     (when delete-list
       (if (yes-or-no-p
@@ -1527,14 +1593,6 @@ packages marked for deletion are removed."
                 (package-delete (car elt) (cdr elt))
               (error (message (cadr err)))))
         (error "Aborted")))
-    (when install-list
-      (if (yes-or-no-p
-           (if (= (length install-list) 1)
-               (format "Install package `%s'? " (car install-list))
-             (format "Install these %d packages (%s)? "
-                     (length install-list)
-                     (mapconcat 'symbol-name install-list ", "))))
-          (mapc 'package-install install-list)))
     ;; If we deleted anything, regenerate `package-alist'.  This is done
     ;; automatically if we installed a package.
     (and delete-list (null install-list)
@@ -1597,7 +1655,13 @@ The list is displayed in a buffer named `*Packages*'."
       (package-menu--generate nil t))
     ;; The package menu buffer has keybindings.  If the user types
     ;; `M-x list-packages', that suggests it should become current.
-    (switch-to-buffer buf)))
+    (switch-to-buffer buf))
+  (let ((upgrades (package-menu--find-upgrades)))
+    (if upgrades
+        (message "%d package%s can be upgraded; type `%s' to mark them for upgrading."
+                 (length upgrades)
+                 (if (= (length upgrades) 1) "" "s")
+                 (substitute-command-keys "\\[package-menu-mark-upgrades]")))))
 
 ;;;###autoload
 (defalias 'package-list-packages 'list-packages)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a89dc713dd8..211c4455717 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2011-09-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-summary-read-group-1): Bump the "Retrieving"
+        message level.
+
+2011-09-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.el (message-read-from-minibuffer): Make abbrev expansion work.
+
 2011-09-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.el (gnus-interactive-exit): Update defcustom spec.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 8651b583757..423de352453 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -3961,7 +3961,7 @@ If NO-DISPLAY, don't generate a summary buffer."
   ;;  (when (and (not (gnus-group-native-p group))
   ;;         (not (gnus-gethash group gnus-newsrc-hashtb)))
   ;;    (error "Dead non-native groups can't be entered"))
-  (gnus-message 5 "Retrieving newsgroup: %s..."
+  (gnus-message 7 "Retrieving newsgroup: %s..."
                 (gnus-group-decoded-name group))
   (let* ((new-group (gnus-summary-setup-buffer group))
          (quit-config (gnus-group-quit-config group))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index f78e2b0339d..8dac0fd7afe 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -8068,10 +8068,10 @@ regexp VARSTR."
 (defun message-read-from-minibuffer (prompt &optional initial-contents)
   "Read from the minibuffer while providing abbrev expansion."
   (if (fboundp 'mail-abbrevs-setup)
-      (let ((mail-abbrev-mode-regexp "")
-            (minibuffer-setup-hook 'mail-abbrevs-setup)
+      (let ((minibuffer-setup-hook 'mail-abbrevs-setup)
             (minibuffer-local-map message-minibuffer-local-map))
-        (read-from-minibuffer prompt initial-contents))
+        (flet ((mail-abbrev-in-expansion-header-p nil t))
+          (read-from-minibuffer prompt initial-contents)))
     (let ((minibuffer-setup-hook 'mail-abbrev-minibuffer-setup-hook)
           (minibuffer-local-map message-minibuffer-local-map))
       (read-string prompt initial-contents))))
diff --git a/lisp/help.el b/lisp/help.el
index ca8f76515cf..0c8d67106d3 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1060,14 +1060,13 @@ window."
     (message "%s"
      (substitute-command-keys (concat quit-part scroll-part)))))
 
-(defun help-window-setup ()
+(defun help-window-setup (help-window)
   "Set up help window for `with-help-window'.
-This relies on `display-buffer-window' being correctly set up by
-`display-buffer'."
-  (let* ((help-window (car-safe display-buffer-window))
-         (help-buffer (when (window-live-p help-window)
+HELP-WINDOW is the window used for displaying the help buffer."
+  (let* ((help-buffer (when (window-live-p help-window)
                         (window-buffer help-window)))
-         (help-value (cdr-safe display-buffer-window)))
+         (help-setup (when (window-live-p help-window)
+                       (window-parameter help-window 'help-setup))))
     (when help-buffer
       ;; Handle `help-window-point-marker'.
       (when (eq (marker-buffer help-window-point-marker) help-buffer)
@@ -1078,6 +1077,7 @@ This relies on `display-buffer-window' being correctly set up by
       (cond
        ((or (eq help-window (selected-window))
             (and (or (eq help-window-select t)
+                     (eq help-setup 'new-frame)
                      (and (eq help-window-select 'other)
                           (eq (window-frame help-window) (selected-frame))
                           (> (length (window-list nil 'no-mini)) 2)))
@@ -1085,13 +1085,12 @@ This relies on `display-buffer-window' being correctly set up by
         ;; The help window is or gets selected ...
         (help-window-display-message
          (cond
-          ((eq help-value 'new-window)
+          ((eq help-setup 'new-window)
            ;; ... and is new, ...
-           "Type \"q\" to delete this window")
-          ((eq help-value 'new-frame)
-           ;; ... is on a new frame ...
-           "Type \"q\" to delete this frame")
-          ((eq help-value 'reuse-other-window)
+           "Type \"q\" to delete help window")
+          ((eq help-setup 'new-frame)
+           "Type \"q\" to delete help frame")
+          ((eq help-setup 'reuse-other)
            ;; ... or displayed some other buffer before.
            "Type \"q\" to restore previous buffer"))
          help-window t))
@@ -1101,15 +1100,22 @@ This relies on `display-buffer-window' being correctly set up by
         ;; other one is the selected one.
         (help-window-display-message
          (cond
-          ((eq help-value 'new-window)
+          ((eq help-setup 'new-window)
            "Type \\[delete-other-windows] to delete the help window")
-          ((eq help-value 'reuse-other-window)
-           "Type \"q\" in other window to quit"))
+          ((eq help-setup 'reuse-other)
+           "Type \"q\" in help window to restore its previous buffer"))
          help-window 'other))
        (t
-        ;; Not much to say here.
+        ;; The help window is not selected ...
         (help-window-display-message
-         "Type \"q\" in help window to quit" help-window))))))
+         (cond
+          ((eq help-setup 'new-window)
+           ;; ... and is new, ...
+           "Type \"q\" in help window to delete it")
+          ((eq help-setup 'reuse-other)
+           ;; ... or displayed some other buffer before.
+           "Type \"q\" in help window to restore previous buffer"))
+         help-window))))))
 
 ;; `with-help-window' is a wrapper for `with-output-to-temp-buffer'
 ;; providing the following additional twists:
@@ -1134,18 +1140,18 @@ You can specify where and how to show the buffer by binding the
 variable `temp-buffer-show-specifiers' to an appropriate value."
   (declare (indent 1) (debug t))
   `(progn
-     ;; Reset `display-buffer-window': `display-buffer' is
-     ;; supposed to set this to the window displaying the buffer plus
-     ;; some additional information.
-     (setq display-buffer-window nil)
      ;; Make `help-window-point-marker' point nowhere.  The only place
      ;; where this should be set to a buffer position is within BODY.
      (set-marker help-window-point-marker nil)
-     (prog1
-         ;; Return value returned by `with-output-to-temp-buffer'.
-         (with-output-to-temp-buffer ,buffer-name
-           (progn ,@body))
-       (when display-buffer-window (help-window-setup)))))
+     (let* (help-window
+            (temp-buffer-show-hook
+             (cons (lambda () (setq help-window (selected-window)))
+                   temp-buffer-show-hook)))
+       ;; Return value returned by `with-output-to-temp-buffer'.
+       (prog1
+           (with-output-to-temp-buffer ,buffer-name
+             (progn ,@body))
+         (help-window-setup help-window)))))
 
 ;; Called from C, on encountering `help-char' when reading a char.
 ;; Don't print to *Help*; that would clobber Help history.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 00ed9b4aed2..e07f1429119 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1063,21 +1063,24 @@ nonincremental search instead via `isearch-edit-string'."
 
 (defvar minibuffer-history-symbol) ;; from external package gmhist.el
 
-(defun isearch-fail-pos ()
-  "Position of first mismatch in search string, or its length if none."
-  (let ((cmds isearch-cmds))
-    (if (and isearch-success (not isearch-error))
-        (length isearch-message)
+(defun isearch-fail-pos (&optional msg)
+  "Return position of first mismatch in search string, or nil if none.
+If MSG is non-nil, use `isearch-message', otherwise `isearch-string'."
+  (let ((cmds isearch-cmds)
+        (curr-msg (if msg isearch-message isearch-string))
+        succ-msg)
+    (when (or (not isearch-success) isearch-error)
       (while (or (not (isearch-success-state (car cmds)))
                  (isearch-error-state (car cmds)))
         (pop cmds))
-      (let ((succ-msg (and cmds (isearch-message-state (car cmds)))))
-        (if (and (stringp succ-msg)
-                 (< (length succ-msg) (length isearch-message))
-                 (equal succ-msg
-                        (substring isearch-message 0 (length succ-msg))))
-            (length succ-msg)
-          0)))))
+      (setq succ-msg (and cmds (if msg (isearch-message-state (car cmds))
+                                 (isearch-string-state (car cmds)))))
+      (if (and (stringp succ-msg)
+               (< (length succ-msg) (length curr-msg))
+               (equal succ-msg
+                      (substring curr-msg 0 (length succ-msg))))
+          (length succ-msg)
+        0))))
 
 (defun isearch-edit-string ()
   "Edit the search string in the minibuffer.
@@ -1169,7 +1172,8 @@ The following additional command keys are active while editing.
                 (setq isearch-new-string
                       (read-from-minibuffer
                        (isearch-message-prefix nil nil isearch-nonincremental)
-                       (cons isearch-string (1+ (isearch-fail-pos)))
+                       (cons isearch-string (1+ (or (isearch-fail-pos)
+                                                    (length isearch-string))))
                        minibuffer-local-isearch-map nil
                        (if isearch-regexp
                            (cons 'regexp-search-ring
@@ -2174,22 +2178,11 @@ If there is no completion possible, say so and continue searching."
   ;; Generate and print the message string.
   (let ((cursor-in-echo-area ellipsis)
         (m isearch-message)
-        (cmds isearch-cmds)
-        succ-msg)
-    (when (or (not isearch-success) isearch-error)
-      ;; Highlight failed part
-      (while (or (not (isearch-success-state (car cmds)))
-                 (isearch-error-state (car cmds)))
-        (pop cmds))
-      (setq succ-msg (and cmds (isearch-message-state (car cmds)))
-            m (copy-sequence m))
-      (add-text-properties
-       (if (and (stringp succ-msg)
-                (< (length succ-msg) (length m))
-                (equal succ-msg (substring m 0 (length succ-msg))))
-           (length succ-msg)
-         0)
-       (length m) '(face isearch-fail) m)
+        (fail-pos (isearch-fail-pos t)))
+    ;; Highlight failed part
+    (when fail-pos
+      (setq m (copy-sequence m))
+      (add-text-properties fail-pos (length m) '(face isearch-fail) m)
       ;; Highlight failed trailing whitespace
       (when (string-match " +$" m)
         (add-text-properties (match-beginning 0) (match-end 0)
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 544570a1bc3..9fe19581e81 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -835,7 +835,8 @@ The list is in preference order.")
 (defun smtpmail-process-filter (process output)
   (with-current-buffer (process-buffer process)
     (goto-char (point-max))
-    (insert output)))
+    (insert output)
+    (set-marker (process-mark process) (point))))
 
 (defun smtpmail-read-response (process)
   (let ((case-fold-search nil)
@@ -891,8 +892,8 @@ The list is in preference order.")
 
 (defun smtpmail-send-command (process command)
   (goto-char (point-max))
-  (if (= (aref command 0) ?P)
-      (insert "PASS <omitted>\r\n")
+  (if (string-match "\\`AUTH [A-Z]+ " command)
+      (insert (match-string 0 command) "<omitted>\r\n")
     (insert command "\r\n"))
   (setq smtpmail-read-point (point))
   (process-send-string process command)
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 932fb5926fd..8854d4e908f 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -1349,6 +1349,16 @@ when constructing the set of constraints."
         (push (cons tag select) constraints)))
     constraints))
 
+(defun mpc-constraints-tag-lookup (buffer-tag constraints)
+  (let (res)
+    (dolist (constraint constraints)
+      (when (or (eq (car constraint) buffer-tag)
+                (and (string-match "|" (symbol-name buffer-tag))
+                     (member (symbol-name (car constraint))
+                             (split-string (symbol-name buffer-tag) "|"))))
+        (setq res (cdr constraint))))
+    res))
+
 (defun mpc-constraints-restore (constraints)
   (let ((search (assq 'Search constraints)))
     (setq mpc--song-search (cadr search))
@@ -1357,10 +1367,10 @@ when constructing the set of constraints."
     (setq buf (cdr buf))
     (when (buffer-live-p buf)
       (let* ((tag (buffer-local-value 'mpc-tag buf))
-             (constraint (assq tag constraints)))
+             (constraint (mpc-constraints-tag-lookup tag constraints)))
         (when tag
           (with-current-buffer buf
-            (mpc-select-restore (cdr constraint)))))))
+            (mpc-select-restore constraint))))))
   (mpc-selection-refresh))
 
 ;; I don't get the ring.el code.  I think it doesn't do what I need, but
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index a1d77ccc6e0..8c0d7b25939 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -987,8 +987,8 @@ indentation to be kept as it was before narrowing."
                    (setq ,bindent (- ,bindent n)))))))))))
 
 (defun comment-add (arg)
-  "Compute the number of extra comment starter characters
-\(extra semicolons in Lisp mode, extra stars in C mode, etc.)
+  "Compute the number of extra comment starter characters.
+\(Extra semicolons in Lisp mode, extra stars in C mode, etc.)
 If ARG is non-nil, just follow ARG.
 If the comment starter is multi-char, just follow ARG.
 Otherwise obey `comment-add'."
@@ -1243,7 +1243,7 @@ This has no effect in modes that do not define a comment syntax."
   :group 'comment)
 
 (defun comment-valid-prefix-p (prefix compos)
-    "Check that the adaptive-fill-prefix is consistent with the context.
+    "Check that the adaptive fill prefix is consistent with the context.
 PREFIX is the prefix (presumably guessed by `adaptive-fill-mode').
 COMPOS is the position of the beginning of the comment we're in, or nil
 if we're not inside a comment."
diff --git a/lisp/replace.el b/lisp/replace.el
index ee430fd9855..70175cf205c 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -940,7 +940,7 @@ To return to ordinary Occur mode, use \\[occur-mode]."
              (save-excursion
                (goto-char (posn-point (event-end event)))
                (occur-mode-find-occurrence))))))
-    (pop-to-buffer (marker-buffer pos) t)
+    (pop-to-buffer (marker-buffer pos))
     (goto-char pos)
     (run-hooks 'occur-mode-find-occurrence-hook)))
 
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 3efb2f158c0..741b6cd904c 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -3068,24 +3068,28 @@ When called interactively, FORCE is t, CURRENT is t if current buffer uses
           (message "No BibTeX buffers defined")))
     buffer-list))
 
-(defun bibtex-complete-string-cleanup (str compl)
+(defun bibtex-complete-string-cleanup (compl) (lambda (str status) ;Curried.
   "Cleanup after inserting string STR.
 Remove enclosing field delimiters for STR.  Display message with
 expansion of STR using expansion list COMPL."
-  ;; point is at position inside field where completion was requested
-  (save-excursion
-    (let ((abbr (cdr (if (stringp str)
-                         (assoc-string str compl t)))))
-      (if abbr (message "Abbreviation for `%s'" abbr))
-      (bibtex-remove-delimiters))))
-
-(defun bibtex-complete-crossref-cleanup (key)
+  (when (memq status '(exact finished sole))
+    (let ((abbr (cdr (assoc-string str compl t))))
+      (when abbr
+        (message "%s = abbreviation for `%s'" str abbr)))
+    (when (eq status 'finished)
+      (save-excursion (bibtex-remove-delimiters))))))
+
+(defun bibtex-complete-crossref-cleanup (buf) (lambda (key status) ;Curried.
   "Display summary message on entry KEY after completion of a crossref key.
 Use `bibtex-summary-function' to generate summary."
-  (save-excursion
-    (if (and (stringp key)
-             (bibtex-search-entry key t))
-        (message "Ref: %s" (funcall bibtex-summary-function)))))
+  (when (memq status '(exact sole finished))
+    (let ((summary
+           (with-current-buffer buf
+             (save-excursion
+               (if (bibtex-search-entry key t)
+                   (funcall bibtex-summary-function))))))
+      (when summary
+        (message "%s %s" key summary))))))
 
 (defun bibtex-copy-summary-as-kill (&optional arg)
   "Push summery of current BibTeX entry to kill ring.
@@ -4985,16 +4989,7 @@ entries from minibuffer."
                       (t (let ((completion-ignore-case nil))
                            (complete-with-action
                             a (bibtex-global-key-alist) s p)))))
-                   :exit-function
-                   (lambda (string status)
-                     (when (memq status '(exact sole finished))
-                       (let ((summary
-                              (with-current-buffer buf
-                                (save-excursion
-                                  (if (bibtex-search-entry string)
-                                      (funcall bibtex-summary-function))))))
-                         (when summary
-                           (message "%s %s" string summary))))))))
+                   :exit-function (bibtex-complete-crossref-cleanup buf))))
 
           ((eq compl 'string)
            ;; String key completion: no cleanup needed.
@@ -5011,14 +5006,7 @@ entries from minibuffer."
                     ((eq a 'metadata) `(metadata (category . bibtex-string)))
                     (t (let ((completion-ignore-case t))
                          (complete-with-action a compl s p)))))
-                 :exit-function
-                 (lambda (string status)
-                   (when (memq status '(exact finished sole))
-                     (let ((abbr (cdr (assoc-string string compl t))))
-                       (when abbr
-                         (message "%s = abbreviation for `%s'" string abbr))))
-                   (when (eq status 'finished)
-                     (save-excursion (bibtex-remove-delimiters)))))))))
+                 :exit-function (bibtex-complete-string-cleanup compl))))))
 
 (defun bibtex-String (&optional key)
   "Insert a new BibTeX @String entry with key KEY."
diff --git a/lisp/window.el b/lisp/window.el
index 3a229a4e447..24d95f367e4 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3785,17 +3785,6 @@ subwindows can get as small as `window-safe-min-height' and
         (window-state-put-2 ignore))
       (window-check frame))))
 
-(defvar display-buffer-window nil
-  "Window used by `display-buffer' and related information.
-After `display-buffer' displays a buffer in some window this
-variable is a cons cell whose car denotes the window used to
-display the buffer.  The cdr is supposed to be one of the symbols
-`reuse-buffer-window', `reuse-other-window', `new-window' or
-`new-frame'.
-
-See the function `display-buffer-record-window' for how this
-variable can be assigned a value.")
-
 (defun display-buffer-record-window (type window buffer)
   "Record information for window used by `display-buffer'.
 TYPE must be one of the symbols reuse-window, pop-up-window, or
@@ -3804,15 +3793,13 @@ pop-up-frame.  WINDOW is the window used for or created by the
 displayed."
   (cond
    ((eq type 'reuse-window)
-    ;; In `display-buffer-window' record whether we used a window on the
-    ;; same buffer or another one.
-    (if (eq (window-buffer window) buffer)
-        (setq display-buffer-window
-              (cons window 'reuse-buffer-window))
-      (setq display-buffer-window
-            (cons window 'reuse-other-window)))
-    ;; In quit-restore parameter record information about the old buffer
-    ;; unless such information exists already.
+    ;; In `help-setup' window parameter record whether we used a window
+    ;; on the same buffer or another one.
+    (set-window-parameter
+     window 'help-setup
+     (if (eq (window-buffer window) buffer) 'reuse-same 'reuse-other))
+    ;; In `quit-restore' parameter record information about the old
+    ;; buffer unless such information exists already.
     (unless (window-parameter window 'quit-restore)
       (set-window-parameter
        window 'quit-restore
@@ -3820,15 +3807,15 @@ displayed."
              (window-point window) buffer
              (window-total-size window) (selected-window)))))
    ((eq type 'pop-up-window)
-    ;; In `display-buffer-window' record window as new.
-    (setq display-buffer-window (cons window 'new-window))
+    ;; In `help-setup' window parameter record window as new.
+    (set-window-parameter window 'help-setup 'new-window)
     ;; In `quit-restore' parameter record that we popped up this window,
     ;; its buffer, and which window was selected before.
     (set-window-parameter
      window 'quit-restore (list 'new-window buffer (selected-window))))
    ((eq type 'pop-up-frame)
-    ;; In `display-buffer-window' record window as on new frame.
-    (setq display-buffer-window (cons window 'new-frame))
+    ;; In `help-setup' window parameter record window as on new frame.
+    (set-window-parameter window 'help-setup 'new-frame)
     ;; In `quit-restore' parameter record that we popped up this window
     ;; on a new frame, the buffer, and which window was selected before.
     (set-window-parameter
@@ -3841,9 +3828,8 @@ means that the currently selected window is not acceptable.  It
 should choose or create a window, display the specified buffer in
 it, and return the window.
 
-The function specified here is responsible for setting the value
-of `display-buffer-window' and the quit-restore parameter of the
-window used."
+The function specified here is responsible for setting the
+quit-restore and help-setup parameters of the window used."
   :type '(choice
           (const nil)
           (function :tag "function"))
@@ -3913,8 +3899,8 @@ second.  If `special-display-function' specifies some other
 function, that function is called with the buffer named
 BUFFER-NAME as first, and the element's cdr as second argument.
 In any case, that function is responsible for setting the value
-of `display-buffer-window' and the quit-restore parameter of the
-window used.
+The function specified here is responsible for setting the
+quit-restore and help-setup parameters of the window used.
 
 If this variable appears \"not to work\", because you added a
 name to it but the corresponding buffer is displayed in the
@@ -4115,9 +4101,8 @@ A buffer is special when its name is either listed in
 `special-display-buffer-names' or matches a regexp in
 `special-display-regexps'.
 
-The function specified here is responsible for setting the value
-of `display-buffer-window' and the quit-restore parameter of the
-window used."
+The function specified here is responsible for setting the
+quit-restore and help-setup parameters of the window used."
   :type 'function
   :group 'frames)