33 files changed, 1130 insertions, 643 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 92cd765b492..efe031d465b 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * misc.texi (Emacs Server): Document `server-eval-at'.
 2011-04-24  Chong Yidong  <cyd@stupidchicken.com>
        * maintaining.texi (List Tags): Document next-file.  Suggested by
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 1299895a06e..06267851d4c 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1495,6 +1495,15 @@ server-name @key{RET} foo @key{RET}} sets the server name to
 @samp{foo}.  The @code{emacsclient} program can specify a server by
 name, using the @samp{-s} option (@pxref{emacsclient Options}).
+@findex server-eval-at
+  If you have defined a server by a unique server name, you can
+connect to this server from other Emacs instances and evaluate forms
+on it by using the @code{server-eval-at} function.
+@code{(server-eval-at "foo" '(+ 1 2))} gives the result @code{3}, if
+there's a server with that name that is listening.  If not, an error
+will be signaled.
 @menu
 * Invoking emacsclient:: Connecting to the Emacs server.
 * emacsclient Options::  Emacs client startup options.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 0c0583c06ab..4aa63c6abaa 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * processes.texi (Synchronous Processes): Document the (:file
+        "/file-name") syntax for `call-process'.
 2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
        * windows.texi (Choosing Window): Fix typo.
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index dc9fed58076..ba9d8accd4a 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -299,6 +299,9 @@ function returns.
 MS-DOS doesn't support asynchronous subprocesses, so this option doesn't
 work there.
+@item @code{(:file @var{file-name})}
+Send the output to the file name specified.
 @item @code{(@var{real-destination} @var{error-destination})}
 Keep the standard output stream separate from the standard error stream;
 deal with the ordinary output as specified by @var{real-destination},
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 20779152050..0eb21406105 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,18 @@
+2011-05-03  Leo Liu  <sdl.web@gmail.com>
+        * NEWS: Mention the new command isearch-yank-pop.
+2011-05-03  Teodor Zlatanov  <tzz@lifelogs.com>
+        * NEWS: Mention new library gnutls.el and explain GnuTLS
+        functionality.  Mention new configure.bat options --without-gnutls
+        and --lib for W32.
+2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * NEWS: Mention `url-retrieve-queue', (:file "file") and
+        `server-eval-at'.
 2011-04-28  Juanma Barranquero  <lekktu@gmail.com>
        * NEWS: Document `delayed-warnings-list' and `delayed-warnings-hook'.
diff --git a/etc/NEWS b/etc/NEWS
index 54917302cfd..5094ecfc4fc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -281,6 +281,10 @@ replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'.
 *** C-y in Isearch is now bound to isearch-yank-kill, instead of
 isearch-yank-line.
+---
+*** M-y in Isearch is now bound to isearch-yank-pop, instead of
+isearch-yank-kill.
 +++
 *** M-s C-e in Isearch is now bound to isearch-yank-line.
@@ -396,6 +400,9 @@ Just set shell-dir-cookie-re to an appropriate regexp.
 ** browse-url has gotten a new variable that is used for mailto: URLs,
 `browse-url-mailto-function', which defaults to `browse-url-mail'.
+** `url-queue-retrieve' downloads web pages asynchronously, but allow
+controlling the degree of parallelism.
 ** Directory local variables can apply to file-less buffers, in certain modes
 (eg dired, vc-dir, log-edit).  For example, adding
 "(diff-mode . ((mode . whitespace)))" to your .dir-locals.el file,
@@ -822,6 +829,12 @@ Instead, the offending function is removed.
 ** New low-level function run-hook-wrapped.
+** `server-eval-at' is provided to allow evaluating forms on different
+Emacs server instances.
+** `call-process' allows a `(:file "file")' spec to redirect STDOUT to
+a file.
 ** byte-compile-disable-print-circle is obsolete.
 ** deferred-action-list and deferred-action-function are obsolete.
 ** Removed the stack-trace-on-error variable.
@@ -894,7 +907,21 @@ Emacs Lisp parse tree.
 FIXME: These should be front-ended by xml.el.
-** FIXME GnuTLS
+** GnuTLS
+*** Emacs can be compiled with libgnutls support
+This is the default.  You will then be able to use the functionality
+in gnutls.el, namely the `open-gnutls-stream' and `gnutls-negotiate'
+functions.  It's easiest to use these functions through
+`open-network-stream' because it can upgrade connections through
+STARTTLS opportunistically or use plain SSL, depending on your needs.
+Only versions 2.8.x and higher or GnuTLS have been tested.
+*** gnutls-log-level
+Set `gnutls-log-level' higher than 0 to get debug output.  1 is for
+important messages, 2 is for debug data, and higher numbers are as per
+the GnuTLS logging conventions.  The output is in *Messages*.
 ** Isearch
@@ -922,6 +949,12 @@ runtime checks.
 ** New configure.bat option --distfiles to specify files to be
 included in binary distribution.
+** New configure.bat option --without-gnutls to disable automatic
+GnuTLS detection.
+** New configure.bat option --lib for general library linkage, works
+with the USER_LIBS build variable.
 ** New make target `dist' to create binary distribution for MS Windows.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0f08795ed3..aa9052adfb4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,33 @@
+2011-05-03  Leo Liu  <sdl.web@gmail.com>
+        * isearch.el (isearch-yank-pop): New command.
+        (isearch-mode-map): bind it to `M-y'.
+        (isearch-forward): Mention it.
+2011-05-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * simple.el (minibuffer-complete-shell-command): Remove.
+        (minibuffer-local-shell-command-map): Use completion-at-point.
+        (read-shell-command): Setup completion vars here instead.
+        (read-expression-map): Bind TAB to symbol completion.
+        * textmodes/ispell.el (lookup-words): Use with-temp-buffer; signal
+        error directly rather via storing it into `results'.
+2011-05-02  Leo Liu  <sdl.web@gmail.com>
+        * vc/diff.el: Fix description.
+2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * server.el (server-eval-at): New function.
+2011-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * net/network-stream.el (open-network-stream): Take a :nowait
+        parameter and pass it on to `make-network-process'.
+        (network-stream-open-plain): Ditto.
 2011-04-30  Andreas Schwab  <schwab@linux-m68k.org>
        * faces.el (face-spec-set-match-display): Don't match toolkit
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a4327337f87..784f374bafa 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,43 @@
+2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * gnus-html.el (gnus-html-schedule-image-fetching): Use
+        url-queue-retrieve, if it exists.
+        * shr.el (shr-tag-img): Ditto.
+        * gnus.el: Autoload more gnus-agent functions.
+        * gnus-art.el (gnus-request-article-this-buffer): Store articles in the
+        agent if we haven't already (bug#8502).
+        * gnus-async.el (gnus-async-article-callback): Put prefetched articles
+        into the Agent, too.
+        * gnus-agent.el (gnus-agent-store-article): New function.
+        * nnheader.el (nnheader-insert-buffer-substring): Renamed from nntp-
+        and moved from that file for reuse.
+        * pop3.el (pop3-open-server): Error messages are "-ERR".
+2011-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * pop3.el (pop3-open-server): Upgrade opportunistically to STARTTLS.
+        (open-tls-stream): Remove superfluous tls/starttls autoloads.
+2011-05-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * gnus-sum.el (gnus-summary-next-article): Don't bug out if the summary
+        buffer has moved to a different frame.
+2011-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * nnimap.el (nnimap-request-article): Use nntp-insert-buffer-substring
+        to get the conversion from unibyte to multibyte buffers to work on
+        Emacs 22.
+        * nntp.el (nntp-request-article): Slight clean-up.
 2011-04-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
        * shr.el (shr-strike-through): New face.
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 52fbe9da11f..b4f0dc38e7e 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -3876,6 +3876,15 @@ has been fetched."
          (insert-file-contents file))
        t))))
+(defun gnus-agent-store-article (article group)
+  (let* ((gnus-command-method (gnus-find-method-for-group group))
+         (file (gnus-agent-article-name (number-to-string article) group))
+         (file-name-coding-system nnmail-pathname-coding-system)
+         (coding-system-for-write gnus-cache-coding-system))
+    (when (not (file-exists-p file))
+      (gnus-make-directory (file-name-directory file))
+      (write-region (point-min) (point-max) file nil 'silent))))
 (defun gnus-agent-regenerate-group (group &optional reread)
  "Regenerate GROUP.
 If REREAD is t, all articles in the .overview are marked as unread.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index e03c787d995..690e29cb65a 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6841,7 +6841,10 @@ If given a prefix, show the hidden text instead."
                                              gnus-summary-buffer)
                    (when gnus-keep-backlog
                      (gnus-backlog-enter-article
-                       group article (current-buffer))))
+                       group article (current-buffer)))
+                    (when (and gnus-agent
+                               (gnus-agent-group-covered-p group))
+                      (gnus-agent-store-article article group)))
                  (setq result 'article))
                 (methods
                  (setq gnus-override-method (pop methods)))
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index b7e24b8dcfd..ad85bc5cf76 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -237,6 +237,12 @@ that was fetched."
      (save-excursion
        (save-restriction
          (narrow-to-region mark (point-max))
+          ;; Put the articles into the agent, if they aren't already.
+          (when (and gnus-agent
+                     (gnus-agent-group-covered-p group))
+            (save-restriction
+              (narrow-to-region mark (point-max))
+              (gnus-agent-store-article article group)))
          ;; Prefetch images for the groups that want that.
          (when (fboundp 'gnus-html-prefetch-images)
            (gnus-html-prefetch-images summary))
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 7c0d63fb246..f380d079d7b 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -386,16 +386,14 @@ Use ALT-TEXT for the image string."
  "Retrieve IMAGE, and place it into BUFFER on arrival."
  (gnus-message 8 "gnus-html-schedule-image-fetching: buffer %s, image %s"
                buffer image)
-  (let ((args (list (car image)
+  (if (fboundp 'url-queue-retrieve)
-                    'gnus-html-image-fetched
+      (url-queue-retrieve (car image)
-                    (list buffer image))))
+                          'gnus-html-image-fetched
-    (when (> (length (if (featurep 'xemacs)
+                          (list buffer image) t)
-                         (cdr (split-string (function-arglist 'url-retrieve)))
-                       (help-function-arglist 'url-retrieve)))
-             4)
-      (setq args (nconc args (list t))))
    (ignore-errors
-      (push (apply #'url-retrieve args) gnus-buffers))))
+      (url-retrieve (car image)
+                    'gnus-html-image-fetched
+                    (list buffer image)))))
 (defun gnus-html-image-fetched (status buffer image)
  "Callback function called when image has been fetched."
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 807f133e481..3cbb479e068 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7783,7 +7783,8 @@ If BACKWARD, the previous article is selected instead of the next."
          ;; Somehow or other, we may now have selected a different
          ;; window.  Make point go back to the summary buffer.
          (when (eq current-summary (current-buffer))
-            (select-window (get-buffer-window current-summary)))
+            ;; FIXME: This burps when get-buffer-window returns nil.
+            (select-window (get-buffer-window current-summary 0)))
          (gnus-summary-walk-group-buffer
           gnus-newsgroup-name cmd unread backward point))))))))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 5ff03572832..8797780251a 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2910,7 +2910,8 @@ gnus-registry.el will populate this if it's loaded.")
      gnus-agent-save-active gnus-agent-method-p
      gnus-agent-get-undownloaded-list gnus-agent-fetch-session
      gnus-summary-set-agent-mark gnus-agent-save-group-info
-      gnus-agent-request-article gnus-agent-retrieve-headers)
+      gnus-agent-request-article gnus-agent-retrieve-headers
+      gnus-agent-store-article gnus-agent-group-covered-p)
     ("gnus-agent" :interactive t
      gnus-unplugged gnus-agentize gnus-agent-batch)
     ("gnus-vm" :interactive t gnus-summary-save-in-vm
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index ae5893ae42d..6f871ccb9e8 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -1099,6 +1099,19 @@ See `find-file-noselect' for the arguments."
               backend-marks)))))
  backend-marks)
+(defmacro nnheader-insert-buffer-substring (buffer &optional start end)
+  "Copy string from unibyte buffer to multibyte current buffer."
+  (if (featurep 'xemacs)
+      `(insert-buffer-substring ,buffer ,start ,end)
+    `(if enable-multibyte-characters
+         (insert (with-current-buffer ,buffer
+                   (mm-string-to-multibyte
+                    ,(if (or start end)
+                         `(buffer-substring (or ,start (point-min))
+                                            (or ,end (point-max)))
+                       '(buffer-string)))))
+       (insert-buffer-substring ,buffer ,start ,end))))
 (when (featurep 'xemacs)
  (require 'nnheaderxm))
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index f819c17afe8..6882ed63135 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -545,10 +545,9 @@ textual parts.")
                  (nnimap-get-whole-article article))
            (let ((buffer (current-buffer)))
              (with-current-buffer (or to-buffer nntp-server-buffer)
-                (erase-buffer)
+                (nnheader-insert-buffer-substring buffer)
-                (insert-buffer-substring buffer)
+                (nnheader-ms-strip-cr)))
-                (nnheader-ms-strip-cr)
+            (cons group article)))))))
-                (cons group article)))))))))
 (deffoo nnimap-request-head (article &optional group server to-buffer)
  (when (nnimap-possibly-change-group group server)
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 3285da513e8..727d9b4d8c0 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -364,19 +364,6 @@ be restored and the command retried."
  (throw 'nntp-with-open-group-error t))
-(defmacro nntp-insert-buffer-substring (buffer &optional start end)
-  "Copy string from unibyte buffer to multibyte current buffer."
-  (if (featurep 'xemacs)
-      `(insert-buffer-substring ,buffer ,start ,end)
-    `(if enable-multibyte-characters
-         (insert (with-current-buffer ,buffer
-                   (mm-string-to-multibyte
-                    ,(if (or start end)
-                         `(buffer-substring (or ,start (point-min))
-                                            (or ,end (point-max)))
-                       '(buffer-string)))))
-       (insert-buffer-substring ,buffer ,start ,end))))
 (defmacro nntp-copy-to-buffer (buffer start end)
  "Copy string from unibyte current buffer to multibyte buffer."
  (if (featurep 'xemacs)
@@ -434,7 +421,7 @@ be restored and the command retried."
          (unless discard
            (with-current-buffer buffer
              (goto-char (point-max))
-              (nntp-insert-buffer-substring (process-buffer process))
+              (nnheader-insert-buffer-substring (process-buffer process))
              ;; Nix out "nntp reading...." message.
              (when nntp-have-messaged
                (setq nntp-have-messaged nil)
@@ -996,7 +983,7 @@ command whose response triggered the error."
          (narrow-to-region
           (setq point (goto-char (point-max)))
           (progn
-             (nntp-insert-buffer-substring buf last-point (cdr entry))
+             (nnheader-insert-buffer-substring buf last-point (cdr entry))
             (point-max)))
          (setq last-point (cdr entry))
          (nntp-decode-text)
@@ -1028,16 +1015,15 @@ command whose response triggered the error."
 (deffoo nntp-request-article (article &optional group server buffer command)
  (nntp-with-open-group
-    group server
+      group server
    (when (nntp-send-command-and-decode
           "\r?\n\\.\r?\n" "ARTICLE"
           (if (numberp article) (int-to-string article) article))
-      (if (and buffer
+      (when (and buffer
-               (not (equal buffer nntp-server-buffer)))
+                 (not (equal buffer nntp-server-buffer)))
-          (with-current-buffer nntp-server-buffer
+        (with-current-buffer nntp-server-buffer
-            (copy-to-buffer buffer (point-min) (point-max))
+          (copy-to-buffer buffer (point-min) (point-max))))
-            (nntp-find-group-and-number group))
+      (nntp-find-group-and-number group))))
-        (nntp-find-group-and-number group)))))
 (deffoo nntp-request-head (article &optional group server)
  (nntp-with-open-group
@@ -1473,7 +1459,7 @@ password contained in '~/.nntp-authinfo'."
                (goto-char (point-max))
                (save-restriction
                  (narrow-to-region (point) (point))
-                  (nntp-insert-buffer-substring buf start)
+                  (nnheader-insert-buffer-substring buf start)
                  (when decode
                    (nntp-decode-text))))))
          ;; report it.
@@ -1701,7 +1687,7 @@ password contained in '~/.nntp-authinfo'."
        (when in-process-buffer-p
          (set-buffer buf)
          (goto-char (point-max))
-          (nntp-insert-buffer-substring process-buffer)
+          (nnheader-insert-buffer-substring process-buffer)
          (set-buffer process-buffer)
          (erase-buffer)
          (set-buffer buf))
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 08cd7cd4ef1..6f12d3d63e1 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -33,6 +33,13 @@
 ;;; Code:
 (eval-when-compile (require 'cl))
+(eval-and-compile
+  ;; In Emacs 24, `open-protocol-stream' is an autoloaded alias for
+  ;; `make-network-stream'.
+  (unless (fboundp 'open-protocol-stream)
+    (require 'proto-stream)))
 (require 'mail-utils)
 (defvar parse-time-months)
@@ -257,10 +264,6 @@ Use streaming commands."
    (pop3-quit process)
    message-count))
-(autoload 'open-tls-stream "tls")
-(autoload 'starttls-open-stream "starttls")
-(autoload 'starttls-negotiate "starttls") ; avoid warning
 (defcustom pop3-stream-type nil
  "*Transport security type for POP3 connexions.
 This may be either nil (plain connexion), `ssl' (use an
@@ -286,64 +289,37 @@ this is nil, `ssl' is assumed for connexions to port
 Returns the process associated with the connection."
  (let ((coding-system-for-read 'binary)
        (coding-system-for-write 'binary)
-        process)
+        result)
    (with-current-buffer
        (get-buffer-create (concat " trace of POP session to "
                                   mailhost))
      (erase-buffer)
      (setq pop3-read-point (point-min))
-      (setq process
+      (setq result
-            (cond
+            (open-protocol-stream
-             ((or (eq pop3-stream-type 'ssl)
+             "POP" (current-buffer) mailhost port
-                  (and (not pop3-stream-type) (member port '(995 "pop3s"))))
+             :type (cond
-              ;; gnutls-cli, openssl don't accept service names
+                    ((or (eq pop3-stream-type 'ssl)
-              (if (or (equal port "pop3s")
+                         (and (not pop3-stream-type)
-                      (null port))
+                              (member port '(995 "pop3s"))))
-                  (setq port 995))
+                     'tls)
-              (let ((process (open-tls-stream "POP" (current-buffer)
+                    (t
-                                              mailhost port)))
+                     (or pop3-stream-type 'network)))
-                (when process
+             :capability-command "CAPA\r\n"
-                  ;; There's a load of info printed that needs deleting.
+             :end-of-command "^\\.\r?\n\\|^\\(-ERR\\|+OK \\).*\n"
-                  (let ((again 't))
+             :success "^\\+OK.*\n"
-                    ;; repeat until
+             :return-list t
-                    ;; - either we received the +OK line
+             :starttls-function
-                    ;; - or accept-process-output timed out without getting
+             (lambda (capabilities)
-                    ;;   anything
+               (and (string-match "\\bSTLS\\b" capabilities)
-                    (while (and again
+                    "STLS\r\n"))))
-                                (setq again (memq (process-status process)
+      (when result
-                                                  '(open run))))
+        (let ((response (plist-get (cdr result) :greeting)))
-                      (setq again (pop3-accept-process-output process))
+          (setq pop3-timestamp
-                      (goto-char (point-max))
+                (substring response (or (string-match "<" response) 0)
-                      (forward-line -1)
+                           (+ 1 (or (string-match ">" response) -1)))))
-                      (cond ((looking-at "\\+OK")
+        (pop3-set-process-query-on-exit-flag (car result) nil)
-                             (setq again nil)
+        (car result)))))
-                             (delete-region (point-min) (point)))
-                            ((not again)
-                             (pop3-quit process)
-                             (error "POP SSL connexion failed")))))
-                  process)))
-             ((eq pop3-stream-type 'starttls)
-              ;; gnutls-cli, openssl don't accept service names
-              (if (equal port "pop3")
-                  (setq port 110))
-              ;; Delay STLS until server greeting is read (Bug#7438).
-              (starttls-open-stream "POP" (current-buffer)
-                                    mailhost (or port 110)))
-             (t
-              (open-network-stream "POP" (current-buffer) mailhost port))))
-      (let ((response (pop3-read-response process t)))
-        (setq pop3-timestamp
-              (substring response (or (string-match "<" response) 0)
-                         (+ 1 (or (string-match ">" response) -1)))))
-      (when (eq pop3-stream-type 'starttls)
-        (pop3-send-command process "STLS")
-        (let ((response (pop3-read-response process t)))
-          (if (and response (string-match "+OK" response))
-              (starttls-negotiate process)
-            (pop3-quit process)
-            (error "POP server doesn't support starttls"))))
-      (pop3-set-process-query-on-exit-flag process nil)
-      process)))
 ;; Support functions
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 20865bda5ac..b2e4f1dc61d 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -871,10 +871,13 @@ ones, in case fg and bg are nil."
          (shr-put-image (shr-get-image-data url) alt))
         (t
          (insert alt)
-          (ignore-errors
+          (funcall
-            (url-retrieve (shr-encode-url url) 'shr-image-fetched
+           (if (fboundp 'url-queue-retrieve)
-                          (list (current-buffer) start (point-marker))
+               'url-queue-retrieve
-                          t))))
+             'url-retrieve)
+           (shr-encode-url url) 'shr-image-fetched
+           (list (current-buffer) start (point-marker))
+           t)))
        (put-text-property start (point) 'keymap shr-map)
        (put-text-property start (point) 'shr-alt alt)
        (put-text-property start (point) 'image-url url)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 1e6ac9c024e..7db7f30dd89 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -473,7 +473,7 @@ This is like `describe-bindings', but displays only Isearch keys."
    (define-key map "\M-n" 'isearch-ring-advance)
    (define-key map "\M-p" 'isearch-ring-retreat)
-    (define-key map "\M-y" 'isearch-yank-kill)
+    (define-key map "\M-y" 'isearch-yank-pop)
    (define-key map "\M-\t" 'isearch-complete)
@@ -637,6 +637,8 @@ Type \\[isearch-yank-char] to yank char from buffer onto end of search\
 Type \\[isearch-yank-line] to yank rest of line onto end of search string\
 and search for it.
 Type \\[isearch-yank-kill] to yank the last string of killed text.
+Type \\[isearch-yank-pop] to replace string just yanked into search prompt
+ with string killed before it.
 Type \\[isearch-quote-char] to quote control character to search for it.
 \\[isearch-abort] while searching or when search has failed cancels input\
 back to what has
@@ -1497,6 +1499,18 @@ If search string is empty, just beep."
  (interactive)
  (isearch-yank-string (current-kill 0)))
+(defun isearch-yank-pop ()
+  "Replace just-yanked search string with previously killed string."
+  (interactive)
+  (if (not (memq last-command '(isearch-yank-kill isearch-yank-pop)))
+      ;; Fall back on `isearch-yank-kill' for the benefits of people
+      ;; who are used to the old behavior of `M-y' in isearch mode. In
+      ;; future, this fallback may be changed if we ever change
+      ;; `yank-pop' to do something like the kill-ring-browser.
+      (isearch-yank-kill)
+    (isearch-pop-state)
+    (isearch-yank-string (current-kill 1))))
 (defun isearch-yank-x-selection ()
  "Pull current X selection into search string."
  (interactive)
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 4ef5ac7dd83..a89e760f0b9 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -5,7 +5,7 @@
 ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best
 ;;;;;;  5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5"
-;;;;;;  "play/5x5.el" (19845 45374))
+;;;;;;  "play/5x5.el" (19889 21967))
 ;;; Generated autoloads from play/5x5.el
 (autoload '5x5 "5x5" "\
@@ -65,7 +65,7 @@ should return a grid vector array that is the new solution.
 ;;;***
 ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/ada-mode.el
 (autoload 'ada-add-extensions "ada-mode" "\
@@ -96,7 +96,7 @@ Insert a descriptive header at the top of the file.
 ;;;***
 ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/ada-xref.el
 (autoload 'ada-find-file "ada-xref" "\
@@ -111,7 +111,7 @@ Completion is available.
 ;;;;;;  add-change-log-entry-other-window add-change-log-entry find-change-log
 ;;;;;;  prompt-for-change-log-name add-log-mailing-address add-log-full-name
 ;;;;;;  add-log-current-defun-function) "add-log" "vc/add-log.el"
-;;;;;;  (19860 32495))
+;;;;;;  (19885 24894))
 ;;; Generated autoloads from vc/add-log.el
 (put 'change-log-default-name 'safe-local-variable 'string-or-null-p)
@@ -250,7 +250,7 @@ old-style time formats for entries are supported.
 ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice
 ;;;;;;  ad-enable-advice ad-default-compilation-action ad-redefinition-action)
-;;;;;;  "advice" "emacs-lisp/advice.el" (19863 8742))
+;;;;;;  "advice" "emacs-lisp/advice.el" (19878 51661))
 ;;; Generated autoloads from emacs-lisp/advice.el
 (defvar ad-redefinition-action 'warn "\
@@ -395,7 +395,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...)
 ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule
 ;;;;;;  align-highlight-rule align-current align-entire align-regexp
-;;;;;;  align) "align" "align.el" (19845 45374))
+;;;;;;  align) "align" "align.el" (19886 45771))
 ;;; Generated autoloads from align.el
 (autoload 'align "align" "\
@@ -979,7 +979,7 @@ This is a good function to put in `comint-output-filter-functions'.
 ;;;***
 ;;;### (autoloads (antlr-set-tabs antlr-mode antlr-show-makefile-rules)
-;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (19845 45374))
+;;;;;;  "antlr-mode" "progmodes/antlr-mode.el" (19890 42850))
 ;;; Generated autoloads from progmodes/antlr-mode.el
 (autoload 'antlr-show-makefile-rules "antlr-mode" "\
@@ -1015,7 +1015,7 @@ Used in `antlr-mode'.  Also a useful function in `java-mode-hook'.
 ;;;***
 ;;;### (autoloads (appt-activate appt-add) "appt" "calendar/appt.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19885 24894))
 ;;; Generated autoloads from calendar/appt.el
 (autoload 'appt-add "appt" "\
@@ -1038,7 +1038,7 @@ ARG is positive, otherwise off.
 ;;;### (autoloads (apropos-documentation apropos-value apropos-library
 ;;;;;;  apropos apropos-documentation-property apropos-command apropos-variable
-;;;;;;  apropos-read-pattern) "apropos" "apropos.el" (19845 45374))
+;;;;;;  apropos-read-pattern) "apropos" "apropos.el" (19891 63700))
 ;;; Generated autoloads from apropos.el
 (autoload 'apropos-read-pattern "apropos" "\
@@ -1141,8 +1141,8 @@ Returns list of symbols and documentation found.
 ;;;***
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19845
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from arc-mode.el
 (autoload 'archive-mode "arc-mode" "\
@@ -1440,8 +1440,8 @@ Keymap summary
 ;;;***
-;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (19845
+;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (19890
-;;;;;;  45374))
+;;;;;;  42850))
 ;;; Generated autoloads from progmodes/asm-mode.el
 (autoload 'asm-mode "asm-mode" "\
@@ -1625,7 +1625,7 @@ Calls `update-directory-autoloads' on the command line arguments.
 ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode
 ;;;;;;  auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode)
-;;;;;;  "autorevert" "autorevert.el" (19845 45374))
+;;;;;;  "autorevert" "autorevert.el" (19878 51661))
 ;;; Generated autoloads from autorevert.el
 (autoload 'auto-revert-mode "autorevert" "\
@@ -2259,7 +2259,7 @@ Incremental search of bookmarks, hiding the non-matches as we go.
 ;;;;;;  browse-url-at-mouse browse-url-at-point browse-url browse-url-of-region
 ;;;;;;  browse-url-of-dired-file browse-url-of-buffer browse-url-of-file
 ;;;;;;  browse-url-browser-function) "browse-url" "net/browse-url.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19870 57559))
 ;;; Generated autoloads from net/browse-url.el
 (defvar browse-url-browser-function (cond ((memq system-type '(windows-nt ms-dos cygwin)) 'browse-url-default-windows-browser) ((memq system-type '(darwin)) 'browse-url-default-macosx-browser) (t 'browse-url-default-browser)) "\
@@ -2581,7 +2581,7 @@ Return a vector containing the lines from `bruce-phrases-file'.
 ;;;***
 ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next)
-;;;;;;  "bs" "bs.el" (19865 50420))
+;;;;;;  "bs" "bs.el" (19870 57559))
 ;;; Generated autoloads from bs.el
 (autoload 'bs-cycle-next "bs" "\
@@ -2621,7 +2621,7 @@ name of buffer configuration.
 ;;;***
-;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (19845 45374))
+;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (19889 21967))
 ;;; Generated autoloads from play/bubbles.el
 (autoload 'bubbles "bubbles" "\
@@ -2643,7 +2643,7 @@ columns on its right towards the left.
 ;;;***
 ;;;### (autoloads (bug-reference-prog-mode bug-reference-mode) "bug-reference"
-;;;;;;  "progmodes/bug-reference.el" (19845 45374))
+;;;;;;  "progmodes/bug-reference.el" (19890 42850))
 ;;; Generated autoloads from progmodes/bug-reference.el
 (put 'bug-reference-url-format 'safe-local-variable (lambda (s) (or (stringp s) (and (symbolp s) (get s 'bug-reference-url-format)))))
@@ -2664,7 +2664,7 @@ Like `bug-reference-mode', but only buttonize in comments and strings.
 ;;;;;;  batch-byte-compile-if-not-done display-call-tree byte-compile
 ;;;;;;  compile-defun byte-compile-file byte-recompile-directory
 ;;;;;;  byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning)
-;;;;;;  "bytecomp" "emacs-lisp/bytecomp.el" (19863 8742))
+;;;;;;  "bytecomp" "emacs-lisp/bytecomp.el" (19881 27850))
 ;;; Generated autoloads from emacs-lisp/bytecomp.el
 (put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
 (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
@@ -2784,8 +2784,8 @@ and corresponding effects.
 ;;;***
-;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (19845
+;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (19885
-;;;;;;  45374))
+;;;;;;  24894))
 ;;; Generated autoloads from calendar/cal-china.el
 (put 'calendar-chinese-time-zone 'risky-local-variable t)
@@ -2794,7 +2794,7 @@ and corresponding effects.
 ;;;***
-;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (19845 45374))
+;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (19885 24894))
 ;;; Generated autoloads from calendar/cal-dst.el
 (put 'calendar-daylight-savings-starts 'risky-local-variable t)
@@ -2806,7 +2806,7 @@ and corresponding effects.
 ;;;***
 ;;;### (autoloads (calendar-hebrew-list-yahrzeits) "cal-hebrew" "calendar/cal-hebrew.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19885 24894))
 ;;; Generated autoloads from calendar/cal-hebrew.el
 (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\
@@ -2930,8 +2930,8 @@ See the documentation for `calculator-mode' for more information.
 ;;;***
-;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19867
+;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19885
-;;;;;;  52471))
+;;;;;;  24894))
 ;;; Generated autoloads from calendar/calendar.el
 (autoload 'calendar "calendar" "\
@@ -3036,7 +3036,7 @@ Obsoletes `c-forward-into-nomenclature'.
 ;;;***
 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19893 19022))
 ;;; Generated autoloads from progmodes/cc-engine.el
 (autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -3530,7 +3530,7 @@ See the documentation of `define-ccl-program' for the detail of CCL program.
 ;;;***
 ;;;### (autoloads (cconv-closure-convert) "cconv" "emacs-lisp/cconv.el"
-;;;;;;  (19863 8742))
+;;;;;;  (19869 36706))
 ;;; Generated autoloads from emacs-lisp/cconv.el
 (autoload 'cconv-closure-convert "cconv" "\
@@ -3972,8 +3972,8 @@ For use inside Lisp programs, see also `c-macro-expansion'.
 ;;;***
-;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (19845
+;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from cmuscheme.el
 (autoload 'run-scheme "cmuscheme" "\
@@ -4016,7 +4016,7 @@ If FRAME cannot display COLOR, return nil.
 ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list
 ;;;;;;  comint-redirect-send-command-to-process comint-redirect-send-command
 ;;;;;;  comint-run make-comint make-comint-in-buffer) "comint" "comint.el"
-;;;;;;  (19852 16697))
+;;;;;;  (19888 1100))
 ;;; Generated autoloads from comint.el
 (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\
@@ -4148,8 +4148,8 @@ on third call it again advances points to the next difference and so on.
 ;;;;;;  compilation-shell-minor-mode compilation-mode compilation-start
 ;;;;;;  compile compilation-disable-input compile-command compilation-search-path
 ;;;;;;  compilation-ask-about-save compilation-window-height compilation-start-hook
-;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (19845
+;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (19890
-;;;;;;  45374))
+;;;;;;  42850))
 ;;; Generated autoloads from progmodes/compile.el
 (defvar compilation-mode-hook nil "\
@@ -4323,7 +4323,7 @@ This is the value of `next-error-function' in Compilation buffers.
 ;;;***
 ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from completion.el
 (defvar dynamic-completion-mode nil "\
@@ -4772,7 +4772,7 @@ Run a `perldoc' on the word around point.
 ;;;***
 ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/cpp.el
 (autoload 'cpp-highlight-buffer "cpp" "\
@@ -4862,7 +4862,7 @@ Major mode to edit Cascading Style Sheets.
 ;;;***
 ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19894 39890))
 ;;; Generated autoloads from emulation/cua-base.el
 (defvar cua-mode nil "\
@@ -4921,7 +4921,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings.
 ;;;;;;  customize-mode customize customize-save-variable customize-set-variable
 ;;;;;;  customize-set-value custom-menu-sort-alphabetically custom-buffer-sort-alphabetically
 ;;;;;;  custom-browse-sort-alphabetically) "cus-edit" "cus-edit.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from cus-edit.el
 (defvar custom-browse-sort-alphabetically nil "\
@@ -5224,8 +5224,8 @@ The format is suitable for use with `easy-menu-define'.
 ;;;***
 ;;;### (autoloads (customize-themes describe-theme custom-theme-visit-theme
-;;;;;;  customize-create-theme) "cus-theme" "cus-theme.el" (19848
+;;;;;;  customize-create-theme) "cus-theme" "cus-theme.el" (19886
-;;;;;;  8443))
+;;;;;;  45771))
 ;;; Generated autoloads from cus-theme.el
 (autoload 'customize-create-theme "cus-theme" "\
@@ -5344,7 +5344,7 @@ If the argument is nil, we return the display table to its standard state.
 ;;;***
 ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from dabbrev.el
 (put 'dabbrev-case-fold-search 'risky-local-variable t)
 (put 'dabbrev-case-replace 'risky-local-variable t)
@@ -5415,8 +5415,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message.
 ;;;***
-;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (19845
+;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (19890
-;;;;;;  45374))
+;;;;;;  42850))
 ;;; Generated autoloads from progmodes/dcl-mode.el
 (autoload 'dcl-mode "dcl-mode" "\
@@ -5587,7 +5587,7 @@ To specify a nil argument interactively, exit with an empty minibuffer.
 ;;;***
 ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19889 21967))
 ;;; Generated autoloads from play/decipher.el
 (autoload 'decipher "decipher" "\
@@ -5616,8 +5616,8 @@ The most useful commands are:
 ;;;***
 ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region
-;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (19845
+;;;;;;  delimit-columns-customize) "delim-col" "delim-col.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from delim-col.el
 (autoload 'delimit-columns-customize "delim-col" "\
@@ -5641,8 +5641,8 @@ START and END delimits the corners of text rectangle.
 ;;;***
-;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (19845
+;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (19890
-;;;;;;  45374))
+;;;;;;  42850))
 ;;; Generated autoloads from progmodes/delphi.el
 (autoload 'delphi-mode "delphi" "\
@@ -5790,7 +5790,7 @@ the first time the mode is used.
 ;;;***
 ;;;### (autoloads (describe-char describe-text-properties) "descr-text"
-;;;;;;  "descr-text.el" (19845 45374))
+;;;;;;  "descr-text.el" (19886 45771))
 ;;; Generated autoloads from descr-text.el
 (autoload 'describe-text-properties "descr-text" "\
@@ -5818,7 +5818,7 @@ as well as widgets, buttons, overlays, and text properties.
 ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir
 ;;;;;;  desktop-load-default desktop-read desktop-remove desktop-save
 ;;;;;;  desktop-clear desktop-locals-to-save desktop-save-mode) "desktop"
-;;;;;;  "desktop.el" (19845 45374))
+;;;;;;  "desktop.el" (19886 45771))
 ;;; Generated autoloads from desktop.el
 (defvar desktop-save-mode nil "\
@@ -6035,7 +6035,7 @@ Deuglify broken Outlook (Express) articles and redisplay.
 ;;;***
 ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;;  "calendar/diary-lib.el" (19845 45374))
+;;;;;;  "calendar/diary-lib.el" (19885 24894))
 ;;; Generated autoloads from calendar/diary-lib.el
 (autoload 'diary "diary-lib" "\
@@ -6162,7 +6162,7 @@ Optional arguments are passed to `dig-invoke'.
 ;;;***
 ;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window
-;;;;;;  dired dired-listing-switches) "dired" "dired.el" (19865 50420))
+;;;;;;  dired dired-listing-switches) "dired" "dired.el" (19886 46089))
 ;;; Generated autoloads from dired.el
 (defvar dired-listing-switches (purecopy "-al") "\
@@ -6285,7 +6285,7 @@ Keybindings:
 ;;;***
 ;;;### (autoloads (dirtrack dirtrack-mode) "dirtrack" "dirtrack.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from dirtrack.el
 (autoload 'dirtrack-mode "dirtrack" "\
@@ -6469,7 +6469,7 @@ Default is 2.
 ;;;***
-;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (19845 45374))
+;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (19886 45771))
 ;;; Generated autoloads from dnd.el
 (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\
@@ -6514,8 +6514,8 @@ Locate SOA record and increment the serial field.
 ;;;***
 ;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe
-;;;;;;  doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (19863
+;;;;;;  doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (19872
-;;;;;;  8742))
+;;;;;;  12877))
 ;;; Generated autoloads from doc-view.el
 (autoload 'doc-view-mode-p "doc-view" "\
@@ -6558,7 +6558,7 @@ See the command `doc-view-mode' for more information on this mode.
 ;;;***
-;;;### (autoloads (doctor) "doctor" "play/doctor.el" (19845 45374))
+;;;### (autoloads (doctor) "doctor" "play/doctor.el" (19890 42850))
 ;;; Generated autoloads from play/doctor.el
 (autoload 'doctor "doctor" "\
@@ -7134,8 +7134,8 @@ See `ebnf-style-database' documentation.
 ;;;;;;  ebrowse-tags-find-declaration-other-window ebrowse-tags-find-definition
 ;;;;;;  ebrowse-tags-view-definition ebrowse-tags-find-declaration
 ;;;;;;  ebrowse-tags-view-declaration ebrowse-member-mode ebrowse-electric-choose-tree
-;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (19845
+;;;;;;  ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (19890
-;;;;;;  45374))
+;;;;;;  42850))
 ;;; Generated autoloads from progmodes/ebrowse.el
 (autoload 'ebrowse-tree-mode "ebrowse" "\
@@ -7309,7 +7309,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry.
 ;;;***
 ;;;### (autoloads (Electric-command-history-redo-expression) "echistory"
-;;;;;;  "echistory.el" (19845 45374))
+;;;;;;  "echistory.el" (19886 45771))
 ;;; Generated autoloads from echistory.el
 (autoload 'Electric-command-history-redo-expression "echistory" "\
@@ -7707,7 +7707,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see.
 ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro
 ;;;;;;  edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from edmacro.el
 (autoload 'edit-kbd-macro "edmacro" "\
@@ -7855,7 +7855,7 @@ Emacs Lisp mode) that support ElDoc.")
 ;;;***
 ;;;### (autoloads (electric-layout-mode electric-pair-mode electric-indent-mode)
-;;;;;;  "electric" "electric.el" (19845 45374))
+;;;;;;  "electric" "electric.el" (19886 45771))
 ;;; Generated autoloads from electric.el
 (defvar electric-indent-chars '(10) "\
@@ -8425,7 +8425,7 @@ Look at CONFIG and try to expand GROUP.
 ;;;***
 ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc"
-;;;;;;  "erc/erc.el" (19845 45374))
+;;;;;;  "erc/erc.el" (19895 48172))
 ;;; Generated autoloads from erc/erc.el
 (autoload 'erc-select-read-args "erc" "\
@@ -8474,7 +8474,7 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL.
 ;;;***
-;;;### (autoloads nil "erc-button" "erc/erc-button.el" (19845 45374))
+;;;### (autoloads nil "erc-button" "erc/erc-button.el" (19895 48172))
 ;;; Generated autoloads from erc/erc-button.el
 (autoload 'erc-button-mode "erc-button" nil t)
@@ -8493,7 +8493,7 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL.
 ;;;***
 ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC)
-;;;;;;  "erc-dcc" "erc/erc-dcc.el" (19845 45374))
+;;;;;;  "erc-dcc" "erc/erc-dcc.el" (19895 48172))
 ;;; Generated autoloads from erc/erc-dcc.el
 (autoload 'erc-dcc-mode "erc-dcc")
@@ -8601,13 +8601,6 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'.
 ;;;***
-;;;### (autoloads nil "erc-hecomplete" "erc/erc-hecomplete.el" (19845
-;;;;;;  45374))
-;;; Generated autoloads from erc/erc-hecomplete.el
- (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t)
-;;;***
 ;;;### (autoloads (erc-identd-stop erc-identd-start) "erc-identd"
 ;;;;;;  "erc/erc-identd.el" (19845 45374))
 ;;; Generated autoloads from erc/erc-identd.el
@@ -8793,8 +8786,8 @@ with args, toggle notify status of people.
 ;;;***
-;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19845
+;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (19899
-;;;;;;  45374))
+;;;;;;  57784))
 ;;; Generated autoloads from erc/erc-pcomplete.el
 (autoload 'erc-completion-mode "erc-pcomplete" nil t)
@@ -9000,8 +8993,8 @@ Kill all test buffers that are still live.
 ;;;***
-;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (19845
+;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (19890
-;;;;;;  45374))
+;;;;;;  42850))
 ;;; Generated autoloads from eshell/esh-mode.el
 (autoload 'eshell-mode "esh-mode" "\
@@ -9055,7 +9048,7 @@ corresponding to a successful execution.
 ;;;;;;  visit-tags-table tags-table-mode find-tag-default-function
 ;;;;;;  find-tag-hook tags-add-tables tags-compression-info-list
 ;;;;;;  tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19893 19022))
 ;;; Generated autoloads from progmodes/etags.el
 (defvar tags-file-name nil "\
@@ -9688,7 +9681,7 @@ fourth arg NOSEP non-nil inhibits this.
 ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p
 ;;;;;;  executable-self-display executable-set-magic executable-interpret
 ;;;;;;  executable-command-find-posix-p) "executable" "progmodes/executable.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/executable.el
 (autoload 'executable-command-find-posix-p "executable" "\
@@ -9731,7 +9724,7 @@ file modes.
 ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot
 ;;;;;;  expand-abbrev-hook expand-add-abbrevs) "expand" "expand.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from expand.el
 (autoload 'expand-add-abbrevs "expand" "\
@@ -9780,7 +9773,7 @@ This is used only in conjunction with `expand-add-abbrevs'.
 ;;;***
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19860 32495))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19882 48702))
 ;;; Generated autoloads from progmodes/f90.el
 (autoload 'f90-mode "f90" "\
@@ -10165,7 +10158,7 @@ the name is considered already unique; only the second substitution
 ;;;;;;  copy-file-locals-to-dir-locals delete-dir-local-variable
 ;;;;;;  add-dir-local-variable delete-file-local-variable-prop-line
 ;;;;;;  add-file-local-variable-prop-line delete-file-local-variable
-;;;;;;  add-file-local-variable) "files-x" "files-x.el" (19845 45374))
+;;;;;;  add-file-local-variable) "files-x" "files-x.el" (19886 45771))
 ;;; Generated autoloads from files-x.el
 (autoload 'add-file-local-variable "files-x" "\
@@ -10551,7 +10544,7 @@ Define some key bindings for the find-function family of functions.
 ;;;***
 ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories
-;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (19845 45374))
+;;;;;;  find-lisp-find-dired) "find-lisp" "find-lisp.el" (19886 45771))
 ;;; Generated autoloads from find-lisp.el
 (autoload 'find-lisp-find-dired "find-lisp" "\
@@ -10572,7 +10565,7 @@ Change the filter on a find-lisp-find-dired buffer to REGEXP.
 ;;;***
 ;;;### (autoloads (finder-by-keyword finder-commentary finder-list-keywords)
-;;;;;;  "finder" "finder.el" (19845 45374))
+;;;;;;  "finder" "finder.el" (19893 19022))
 ;;; Generated autoloads from finder.el
 (autoload 'finder-list-keywords "finder" "\
@@ -10632,7 +10625,7 @@ to get the effect of a C-q.
 ;;;***
 ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode)
-;;;;;;  "flymake" "progmodes/flymake.el" (19845 45374))
+;;;;;;  "flymake" "progmodes/flymake.el" (19890 42850))
 ;;; Generated autoloads from progmodes/flymake.el
 (autoload 'flymake-mode "flymake" "\
@@ -10726,7 +10719,7 @@ Flyspell whole buffer.
 ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode
 ;;;;;;  turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el"
-;;;;;;  (19863 8742))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from follow.el
 (autoload 'turn-on-follow-mode "follow" "\
@@ -10814,7 +10807,7 @@ started, play around with the following keys:
 ;;;***
 ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode)
-;;;;;;  "forms" "forms.el" (19845 45374))
+;;;;;;  "forms" "forms.el" (19886 45771))
 ;;; Generated autoloads from forms.el
 (autoload 'forms-mode "forms" "\
@@ -10851,7 +10844,7 @@ Visit a file in Forms mode in other window.
 ;;;***
 ;;;### (autoloads (fortran-mode) "fortran" "progmodes/fortran.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/fortran.el
 (autoload 'fortran-mode "fortran" "\
@@ -10929,7 +10922,7 @@ with no args, if that value is non-nil.
 ;;;***
 ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region
-;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (19845 45374))
+;;;;;;  fortune-add-fortune) "fortune" "play/fortune.el" (19889 21967))
 ;;; Generated autoloads from play/fortune.el
 (autoload 'fortune-add-fortune "fortune" "\
@@ -10978,7 +10971,7 @@ and choose the directory as the fortune-file.
 ;;;***
 ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el"
-;;;;;;  (19849 29307))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/gdb-mi.el
 (defvar gdb-enable-debug nil "\
@@ -11117,7 +11110,7 @@ regular expression that can be used as an element of
 ;;;***
 ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/glasses.el
 (autoload 'glasses-mode "glasses" "\
@@ -11186,7 +11179,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST.
 ;;;***
 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (19860 32495))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (19889 21967))
 ;;; Generated autoloads from gnus/gnus.el
 (when (fboundp 'custom-autoload)
 (custom-autoload 'gnus-select-method "gnus"))
@@ -11330,7 +11323,7 @@ If CLEAN, obsolete (ignore).
 ;;;***
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (19849 29307))
+;;;;;;  (19874 54611))
 ;;; Generated autoloads from gnus/gnus-art.el
 (autoload 'gnus-article-prepare-display "gnus-art" "\
@@ -11472,7 +11465,7 @@ Convenience method to turn on gnus-dired-mode.
 ;;;***
 ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19881 27850))
 ;;; Generated autoloads from gnus/gnus-draft.el
 (autoload 'gnus-draft-reminder "gnus-draft" "\
@@ -11844,7 +11837,7 @@ Add NUM into sorted LIST by side effect.
 ;;;***
 ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize)
-;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (19867 52471))
+;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (19893 19022))
 ;;; Generated autoloads from gnus/gnus-registry.el
 (autoload 'gnus-registry-initialize "gnus-registry" "\
@@ -11900,7 +11893,7 @@ Update the format specification near point.
 ;;;***
 ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el"
-;;;;;;  (19867 5739))
+;;;;;;  (19877 30798))
 ;;; Generated autoloads from gnus/gnus-start.el
 (autoload 'gnus-declare-backend "gnus-start" "\
@@ -11911,7 +11904,7 @@ Declare back end NAME with ABILITIES as a Gnus back end.
 ;;;***
 ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el"
-;;;;;;  (19867 5739))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from gnus/gnus-sum.el
 (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\
@@ -11949,7 +11942,7 @@ Add the window configuration CONF to `gnus-buffer-configuration'.
 ;;;***
-;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (19845 45374))
+;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (19889 21967))
 ;;; Generated autoloads from play/gomoku.el
 (autoload 'gomoku "gomoku" "\
@@ -12205,7 +12198,7 @@ the form \"WINDOW-ID PIXMAP-ID\".  Value is non-nil if successful.
 ;;;***
 ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb
-;;;;;;  xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19845 45374))
+;;;;;;  xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19890 42850))
 ;;; Generated autoloads from progmodes/gud.el
 (autoload 'gud-gdb "gud" "\
@@ -12291,8 +12284,8 @@ Toggle the display of GUD tooltips.
 ;;;***
-;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (19845
+;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (19889
-;;;;;;  45374))
+;;;;;;  21967))
 ;;; Generated autoloads from play/handwrite.el
 (autoload 'handwrite "handwrite" "\
@@ -12310,7 +12303,7 @@ Variables: `handwrite-linespace'     (default 12)
 ;;;***
 ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19889 21967))
 ;;; Generated autoloads from play/hanoi.el
 (autoload 'hanoi "hanoi" "\
@@ -12514,7 +12507,7 @@ different regions.  With numeric argument ARG, behaves like
 ;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories
 ;;;;;;  describe-syntax describe-variable variable-at-point describe-function-1
 ;;;;;;  find-lisp-object-file-name help-C-file-name describe-function)
-;;;;;;  "help-fns" "help-fns.el" (19867 5739))
+;;;;;;  "help-fns" "help-fns.el" (19878 51661))
 ;;; Generated autoloads from help-fns.el
 (autoload 'describe-function "help-fns" "\
@@ -12610,8 +12603,8 @@ gives the window that lists the options.")
 ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button
 ;;;;;;  help-make-xrefs help-buffer help-setup-xref help-mode-finish
-;;;;;;  help-mode-setup help-mode) "help-mode" "help-mode.el" (19849
+;;;;;;  help-mode-setup help-mode) "help-mode" "help-mode.el" (19886
-;;;;;;  62189))
+;;;;;;  45771))
 ;;; Generated autoloads from help-mode.el
 (autoload 'help-mode "help-mode" "\
@@ -12951,7 +12944,7 @@ be found in variable `hi-lock-interactive-patterns'.
 ;;;***
 ;;;### (autoloads (hide-ifdef-mode) "hideif" "progmodes/hideif.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/hideif.el
 (autoload 'hide-ifdef-mode "hideif" "\
@@ -12991,7 +12984,7 @@ how the hiding is done:
 ;;;***
 ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/hideshow.el
 (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\
@@ -13053,8 +13046,8 @@ Unconditionally turn off `hs-minor-mode'.
 ;;;;;;  highlight-compare-buffers highlight-changes-rotate-faces
 ;;;;;;  highlight-changes-previous-change highlight-changes-next-change
 ;;;;;;  highlight-changes-remove-highlight highlight-changes-visible-mode
-;;;;;;  highlight-changes-mode) "hilit-chg" "hilit-chg.el" (19845
+;;;;;;  highlight-changes-mode) "hilit-chg" "hilit-chg.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from hilit-chg.el
 (autoload 'highlight-changes-mode "hilit-chg" "\
@@ -13300,7 +13293,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
 ;;;;;;  holiday-bahai-holidays holiday-islamic-holidays holiday-christian-holidays
 ;;;;;;  holiday-hebrew-holidays holiday-other-holidays holiday-local-holidays
 ;;;;;;  holiday-oriental-holidays holiday-general-holidays) "holidays"
-;;;;;;  "calendar/holidays.el" (19845 45374))
+;;;;;;  "calendar/holidays.el" (19882 48702))
 ;;; Generated autoloads from calendar/holidays.el
 (define-obsolete-variable-alias 'general-holidays 'holiday-general-holidays "23.1")
@@ -13460,7 +13453,7 @@ Convert HTML to plain text in the current buffer.
 ;;;***
 ;;;### (autoloads (htmlfontify-copy-and-link-dir htmlfontify-buffer)
-;;;;;;  "htmlfontify" "htmlfontify.el" (19845 45374))
+;;;;;;  "htmlfontify" "htmlfontify.el" (19886 45771))
 ;;; Generated autoloads from htmlfontify.el
 (autoload 'htmlfontify-buffer "htmlfontify" "\
@@ -13591,7 +13584,7 @@ bound to the current value of the filter.
 ;;;***
 ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers)
-;;;;;;  "ibuffer" "ibuffer.el" (19845 45374))
+;;;;;;  "ibuffer" "ibuffer.el" (19886 45771))
 ;;; Generated autoloads from ibuffer.el
 (autoload 'ibuffer-list-buffers "ibuffer" "\
@@ -13632,7 +13625,7 @@ FORMATS is the value to use for `ibuffer-formats'.
 ;;;### (autoloads (icalendar-import-buffer icalendar-import-file
 ;;;;;;  icalendar-export-region icalendar-export-file) "icalendar"
-;;;;;;  "calendar/icalendar.el" (19845 45374))
+;;;;;;  "calendar/icalendar.el" (19897 16090))
 ;;; Generated autoloads from calendar/icalendar.el
 (autoload 'icalendar-export-file "icalendar" "\
@@ -13684,8 +13677,8 @@ buffer `*icalendar-errors*'.
 ;;;***
-;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (19845
+;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (19874
-;;;;;;  45374))
+;;;;;;  54611))
 ;;; Generated autoloads from icomplete.el
 (defvar icomplete-mode nil "\
@@ -13706,7 +13699,7 @@ otherwise turn it off.
 ;;;***
-;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (19845 45374))
+;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (19890 42850))
 ;;; Generated autoloads from progmodes/icon.el
 (autoload 'icon-mode "icon" "\
@@ -13907,8 +13900,8 @@ The main features of this mode are
 ;;;;;;  ido-find-alternate-file ido-find-file-other-window ido-find-file
 ;;;;;;  ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
 ;;;;;;  ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
-;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19857
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19886
-;;;;;;  56304))
+;;;;;;  45771))
 ;;; Generated autoloads from ido.el
 (defvar ido-mode nil "\
@@ -14169,7 +14162,7 @@ DEF, if non-nil, is the default value.
 ;;;***
-;;;### (autoloads (ielm) "ielm" "ielm.el" (19863 8742))
+;;;### (autoloads (ielm) "ielm" "ielm.el" (19886 45771))
 ;;; Generated autoloads from ielm.el
 (add-hook 'same-window-buffer-names (purecopy "*ielm*"))
@@ -14404,7 +14397,7 @@ Register the file types that ImageMagick is able to handle.
 ;;;;;;  image-dired-jump-thumbnail-buffer image-dired-delete-tag
 ;;;;;;  image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs
 ;;;;;;  image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs)
-;;;;;;  "image-dired" "image-dired.el" (19845 45374))
+;;;;;;  "image-dired" "image-dired.el" (19886 45771))
 ;;; Generated autoloads from image-dired.el
 (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\
@@ -14604,7 +14597,7 @@ Image files are those whose name has an extension in
 ;;;***
 ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode
-;;;;;;  image-mode) "image-mode" "image-mode.el" (19845 45374))
+;;;;;;  image-mode) "image-mode" "image-mode.el" (19890 42850))
 ;;; Generated autoloads from image-mode.el
 (autoload 'image-mode "image-mode" "\
@@ -15098,7 +15091,7 @@ Perform completion on file preceding point.
 ;;;### (autoloads (info-xref-docstrings info-xref-check-all-custom
 ;;;;;;  info-xref-check-all info-xref-check) "info-xref" "info-xref.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from info-xref.el
 (autoload 'info-xref-check "info-xref" "\
@@ -15181,7 +15174,7 @@ the sources handy.
 ;;;***
 ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-split-threshold
-;;;;;;  Info-tagify) "informat" "informat.el" (19845 45374))
+;;;;;;  Info-tagify) "informat" "informat.el" (19886 45771))
 ;;; Generated autoloads from informat.el
 (autoload 'Info-tagify "informat" "\
@@ -15588,8 +15581,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 ;;;***
-;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19845
+;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from iswitchb.el
 (defvar iswitchb-mode nil "\
@@ -15692,7 +15685,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
 ;;;***
 ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr"
-;;;;;;  "jka-compr.el" (19845 45374))
+;;;;;;  "jka-compr.el" (19886 45771))
 ;;; Generated autoloads from jka-compr.el
 (defvar jka-compr-inhibit nil "\
@@ -15715,7 +15708,7 @@ by `jka-compr-installed'.
 ;;;***
-;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19845 45374))
+;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19890 42850))
 ;;; Generated autoloads from progmodes/js.el
 (autoload 'js-mode "js" "\
@@ -15832,7 +15825,7 @@ and the return value is the length of the conversion.
 ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro
 ;;;;;;  kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter
 ;;;;;;  kmacro-call-macro kmacro-end-macro kmacro-start-macro kmacro-exec-ring-item)
-;;;;;;  "kmacro" "kmacro.el" (19845 45374))
+;;;;;;  "kmacro" "kmacro.el" (19886 45771))
 ;;; Generated autoloads from kmacro.el
 (global-set-key "\C-x(" 'kmacro-start-macro)
 (global-set-key "\C-x)" 'kmacro-end-macro)
@@ -15958,7 +15951,7 @@ If kbd macro currently being defined end it before activating it.
 ;;;***
 ;;;### (autoloads (landmark landmark-test-run) "landmark" "play/landmark.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19889 21967))
 ;;; Generated autoloads from play/landmark.el
 (defalias 'landmark-repeat 'landmark-test-run)
@@ -16234,7 +16227,7 @@ something strange, such as redefining an Emacs function.
 ;;;***
 ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches)
-;;;;;;  "locate" "locate.el" (19845 45374))
+;;;;;;  "locate" "locate.el" (19886 45771))
 ;;; Generated autoloads from locate.el
 (defvar locate-ls-subdir-switches (purecopy "-al") "\
@@ -16286,7 +16279,7 @@ except that FILTER is not optional.
 ;;;***
-;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (19863 8742))
+;;;### (autoloads (log-edit) "log-edit" "vc/log-edit.el" (19870 57559))
 ;;; Generated autoloads from vc/log-edit.el
 (autoload 'log-edit "log-edit" "\
@@ -16324,8 +16317,8 @@ Major mode for browsing CVS log output.
 ;;;***
-;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (19845
+;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from longlines.el
 (autoload 'longlines-mode "longlines" "\
@@ -16441,7 +16434,7 @@ for further customization of the printer command.
 ;;;***
 ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from ls-lisp.el
 (defvar ls-lisp-support-shell-wildcards t "\
@@ -16493,7 +16486,7 @@ definitions to shadow the loaded ones for use in file byte-compilation.
 ;;;***
 ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro
-;;;;;;  name-last-kbd-macro) "macros" "macros.el" (19845 45374))
+;;;;;;  name-last-kbd-macro) "macros" "macros.el" (19886 45771))
 ;;; Generated autoloads from macros.el
 (autoload 'name-last-kbd-macro "macros" "\
@@ -16760,9 +16753,9 @@ double-quotes.
 ;;;***
-;;;### (autoloads (mail-complete define-mail-alias expand-mail-aliases
+;;;### (autoloads (mail-complete mail-completion-at-point-function
-;;;;;;  mail-complete-style) "mailalias" "mail/mailalias.el" (19845
+;;;;;;  define-mail-alias expand-mail-aliases mail-complete-style)
-;;;;;;  45374))
+;;;;;;  "mailalias" "mail/mailalias.el" (19881 27850))
 ;;; Generated autoloads from mail/mailalias.el
 (defvar mail-complete-style 'angles "\
@@ -16798,10 +16791,16 @@ if it is quoted with double-quotes.
 \(fn NAME DEFINITION &optional FROM-MAILRC-FILE)" t nil)
+(autoload 'mail-completion-at-point-function "mailalias" "\
+Compute completion data for mail aliases.
+For use on `completion-at-point-functions'.
+\(fn)" nil nil)
 (autoload 'mail-complete "mailalias" "\
 Perform completion on header field or word preceding point.
 Completable headers are according to `mail-complete-alist'.  If none matches
-current header, calls `mail-complete-function' and passes prefix arg if any.
+current header, calls `mail-complete-function' and passes prefix ARG if any.
 \(fn ARG)" t nil)
@@ -16822,7 +16821,7 @@ The mail client is taken to be the handler of mailto URLs.
 ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode
 ;;;;;;  makefile-gmake-mode makefile-automake-mode makefile-mode)
-;;;;;;  "make-mode" "progmodes/make-mode.el" (19845 45374))
+;;;;;;  "make-mode" "progmodes/make-mode.el" (19890 42850))
 ;;; Generated autoloads from progmodes/make-mode.el
 (autoload 'makefile-mode "make-mode" "\
@@ -16939,8 +16938,8 @@ An adapted `makefile-mode' that knows about imake.
 ;;;***
-;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (19845
+;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from makesum.el
 (autoload 'make-command-summary "makesum" "\
@@ -16952,7 +16951,7 @@ Previous contents of that buffer are killed first.
 ;;;***
 ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19870 57559))
 ;;; Generated autoloads from man.el
 (defalias 'manual-entry 'man)
@@ -17060,7 +17059,7 @@ Returns non-nil if the new state is enabled.
 ;;;;;;  message-forward-make-body message-forward message-recover
 ;;;;;;  message-supersede message-cancel-news message-followup message-wide-reply
 ;;;;;;  message-reply message-news message-mail message-mode) "message"
-;;;;;;  "gnus/message.el" (19860 32495))
+;;;;;;  "gnus/message.el" (19881 27850))
 ;;; Generated autoloads from gnus/message.el
 (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook)
@@ -17378,7 +17377,7 @@ delete the draft message.
 ;;;***
-;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19845 45374))
+;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19898 36953))
 ;;; Generated autoloads from mh-e/mh-e.el
 (put 'mh-progs 'risky-local-variable t)
@@ -17550,7 +17549,7 @@ variation of `C-x M-c M-butterfly' from url `http://xkcd.com/378/'.
 ;;;### (autoloads (multi-isearch-files-regexp multi-isearch-files
 ;;;;;;  multi-isearch-buffers-regexp multi-isearch-buffers multi-isearch-setup)
-;;;;;;  "misearch" "misearch.el" (19845 45374))
+;;;;;;  "misearch" "misearch.el" (19886 45771))
 ;;; Generated autoloads from misearch.el
 (add-hook 'isearch-mode-hook 'multi-isearch-setup)
@@ -17676,7 +17675,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing.
 ;;;***
 ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents)
-;;;;;;  "mm-url" "gnus/mm-url.el" (19845 45374))
+;;;;;;  "mm-url" "gnus/mm-url.el" (19877 30798))
 ;;; Generated autoloads from gnus/mm-url.el
 (autoload 'mm-url-insert-file-contents "mm-url" "\
@@ -17805,7 +17804,7 @@ followed by the first character of the construct.
 ;;;***
 ;;;### (autoloads (denato-region nato-region unmorse-region morse-region)
-;;;;;;  "morse" "play/morse.el" (19845 45374))
+;;;;;;  "morse" "play/morse.el" (19869 36706))
 ;;; Generated autoloads from play/morse.el
 (autoload 'morse-region "morse" "\
@@ -17831,7 +17830,7 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text.
 ;;;***
 ;;;### (autoloads (mouse-drag-drag mouse-drag-throw) "mouse-drag"
-;;;;;;  "mouse-drag.el" (19845 45374))
+;;;;;;  "mouse-drag.el" (19890 42850))
 ;;; Generated autoloads from mouse-drag.el
 (autoload 'mouse-drag-throw "mouse-drag" "\
@@ -17842,7 +17841,7 @@ from the original mouse click to the current mouse location.  Try it;
 you'll like it.  It's easier to observe than to explain.
 If the mouse is clicked and released in the same place of time we
-assume that the user didn't want to scdebugroll but wanted to whatever
+assume that the user didn't want to scroll but wanted to whatever
 mouse-2 used to do, so we pass it through.
 Throw scrolling was inspired (but is not identical to) the \"hand\"
@@ -17878,8 +17877,8 @@ To test this function, evaluate:
 ;;;***
-;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (19845
+;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from mouse-sel.el
 (defvar mouse-sel-mode nil "\
@@ -17941,7 +17940,7 @@ Main entry point for MPC.
 ;;;***
-;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (19845 45374))
+;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (19890 42850))
 ;;; Generated autoloads from play/mpuz.el
 (autoload 'mpuz "mpuz" "\
@@ -18364,7 +18363,7 @@ listed in the PORTS list.
 ;;;***
 ;;;### (autoloads (open-network-stream) "network-stream" "net/network-stream.el"
-;;;;;;  (19864 29553))
+;;;;;;  (19893 19022))
 ;;; Generated autoloads from net/network-stream.el
 (autoload 'open-network-stream "network-stream" "\
@@ -19169,7 +19168,7 @@ exported source code blocks by language.
 ;;;***
 ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19894 39890))
 ;;; Generated autoloads from progmodes/octave-inf.el
 (autoload 'inferior-octave "octave-inf" "\
@@ -19192,7 +19191,7 @@ startup file, `~/.emacs-octave'.
 ;;;***
 ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19894 39890))
 ;;; Generated autoloads from progmodes/octave-mod.el
 (autoload 'octave-mode "octave-mod" "\
@@ -20768,7 +20767,7 @@ The XOXO buffer is named *xoxo-<source buffer name>*
 ;;;***
 ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from outline.el
 (put 'outline-regexp 'safe-local-variable 'stringp)
 (put 'outline-heading-end-regexp 'safe-local-variable 'stringp)
@@ -20829,7 +20828,7 @@ See the command `outline-mode' for more information on this mode.
 ;;;### (autoloads (list-packages describe-package package-initialize
 ;;;;;;  package-install-file package-install-from-buffer package-install
 ;;;;;;  package-enable-at-startup) "package" "emacs-lisp/package.el"
-;;;;;;  (19864 29553))
+;;;;;;  (19893 19022))
 ;;; Generated autoloads from emacs-lisp/package.el
 (defvar package-enable-at-startup t "\
@@ -20882,10 +20881,11 @@ Display the full documentation of PACKAGE (a symbol).
 (autoload 'list-packages "package" "\
 Display a list of packages.
-Fetches the updated list of packages before displaying.
+This first fetches the updated list of packages before
+displaying, unless a prefix argument NO-FETCH is specified.
 The list is displayed in a buffer named `*Packages*'.
-\(fn)" t nil)
+\(fn &optional NO-FETCH)" t nil)
 (defalias 'package-list-packages 'list-packages)
@@ -20929,8 +20929,8 @@ unknown are returned as nil.
 ;;;***
-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (19845
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (19899
-;;;;;;  45374))
+;;;;;;  57784))
 ;;; Generated autoloads from progmodes/pascal.el
 (autoload 'pascal-mode "pascal" "\
@@ -21194,8 +21194,8 @@ Includes files as well as host names followed by a colon.
 ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list
 ;;;;;;  pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete
-;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19845
+;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19899
-;;;;;;  45374))
+;;;;;;  57784))
 ;;; Generated autoloads from pcomplete.el
 (autoload 'pcomplete "pcomplete" "\
@@ -21337,7 +21337,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 ;;;***
 ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/perl-mode.el
 (put 'perl-indent-level 'safe-local-variable 'integerp)
 (put 'perl-continued-statement-offset 'safe-local-variable 'integerp)
@@ -22175,7 +22175,7 @@ are both set to t.
 ;;;***
-;;;### (autoloads (proced) "proced" "proced.el" (19845 45374))
+;;;### (autoloads (proced) "proced" "proced.el" (19886 45771))
 ;;; Generated autoloads from proced.el
 (autoload 'proced "proced" "\
@@ -22191,7 +22191,7 @@ See `proced-mode' for a description of features available in Proced buffers.
 ;;;***
 ;;;### (autoloads (run-prolog mercury-mode prolog-mode) "prolog"
-;;;;;;  "progmodes/prolog.el" (19845 45374))
+;;;;;;  "progmodes/prolog.el" (19890 42850))
 ;;; Generated autoloads from progmodes/prolog.el
 (autoload 'prolog-mode "prolog" "\
@@ -22238,8 +22238,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
 ;;;***
-;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (19845
+;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (19890
-;;;;;;  45374))
+;;;;;;  42850))
 ;;; Generated autoloads from progmodes/ps-mode.el
 (autoload 'ps-mode "ps-mode" "\
@@ -22290,8 +22290,8 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number
 ;;;;;;  ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer
 ;;;;;;  ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces
 ;;;;;;  ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type
-;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (19845
+;;;;;;  ps-page-dimensions-database) "ps-print" "ps-print.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from ps-print.el
 (defvar ps-page-dimensions-database (purecopy (list (list 'a4 (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list 'a3 (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list 'letter (* 72 8.5) (* 72 11.0) "Letter") (list 'legal (* 72 8.5) (* 72 14.0) "Legal") (list 'letter-small (* 72 7.68) (* 72 10.16) "LetterSmall") (list 'tabloid (* 72 11.0) (* 72 17.0) "Tabloid") (list 'ledger (* 72 17.0) (* 72 11.0) "Ledger") (list 'statement (* 72 5.5) (* 72 8.5) "Statement") (list 'executive (* 72 7.5) (* 72 10.0) "Executive") (list 'a4small (* 72 7.47) (* 72 10.85) "A4Small") (list 'b4 (* 72 10.125) (* 72 14.33) "B4") (list 'b5 (* 72 7.16) (* 72 10.125) "B5") '(addresslarge 236.0 99.0 "AddressLarge") '(addresssmall 236.0 68.0 "AddressSmall") '(cuthanging13 90.0 222.0 "CutHanging13") '(cuthanging15 90.0 114.0 "CutHanging15") '(diskette 181.0 136.0 "Diskette") '(eurofilefolder 139.0 112.0 "EuropeanFilefolder") '(eurofoldernarrow 526.0 107.0 "EuroFolderNarrow") '(eurofolderwide 526.0 136.0 "EuroFolderWide") '(euronamebadge 189.0 108.0 "EuroNameBadge") '(euronamebadgelarge 223.0 136.0 "EuroNameBadgeLarge") '(filefolder 230.0 37.0 "FileFolder") '(jewelry 76.0 136.0 "Jewelry") '(mediabadge 180.0 136.0 "MediaBadge") '(multipurpose 126.0 68.0 "MultiPurpose") '(retaillabel 90.0 104.0 "RetailLabel") '(shipping 271.0 136.0 "Shipping") '(slide35mm 26.0 104.0 "Slide35mm") '(spine8mm 187.0 26.0 "Spine8mm") '(topcoated 425.19685 136.0 "TopCoatedPaper") '(topcoatedpaper 396.0 136.0 "TopcoatedPaper150") '(vhsface 205.0 127.0 "VHSFace") '(vhsspine 400.0 50.0 "VHSSpine") '(zipdisk 156.0 136.0 "ZipDisk"))) "\
@@ -22488,7 +22488,7 @@ If EXTENSION is any other symbol, it is ignored.
 ;;;***
 ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
-;;;;;;  (19860 32495))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/python.el
 (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode))
@@ -22895,7 +22895,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 ;;;***
 ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
-;;;;;;  "net/rcirc.el" (19867 5739))
+;;;;;;  "net/rcirc.el" (19898 36953))
 ;;; Generated autoloads from net/rcirc.el
 (autoload 'rcirc "rcirc" "\
@@ -22955,7 +22955,7 @@ Construct a regexp interactively.
 ;;;***
-;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (19845 45374))
+;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (19886 45771))
 ;;; Generated autoloads from recentf.el
 (defvar recentf-mode nil "\
@@ -22983,7 +22983,7 @@ that were operated on recently.
 ;;;;;;  string-rectangle delete-whitespace-rectangle open-rectangle
 ;;;;;;  insert-rectangle yank-rectangle kill-rectangle extract-rectangle
 ;;;;;;  delete-extract-rectangle delete-rectangle) "rect" "rect.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from rect.el
 (define-key ctl-x-r-map "c" 'clear-rectangle)
 (define-key ctl-x-r-map "k" 'kill-rectangle)
@@ -23483,7 +23483,7 @@ Make a ring that can contain SIZE elements.
 ;;;***
-;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (19845 45374))
+;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (19870 57559))
 ;;; Generated autoloads from net/rlogin.el
 (add-hook 'same-window-regexps (purecopy "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)"))
@@ -24319,8 +24319,8 @@ enclosed in `(and ...)'.
 ;;;***
-;;;### (autoloads (savehist-mode) "savehist" "savehist.el" (19845
+;;;### (autoloads (savehist-mode) "savehist" "savehist.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from savehist.el
 (defvar savehist-mode nil "\
@@ -24500,7 +24500,7 @@ Semantic mode.
 ;;;;;;  mail-yank-prefix mail-setup-hook mail-personal-alias-file
 ;;;;;;  mail-default-reply-to mail-archive-file-name mail-header-separator
 ;;;;;;  send-mail-function mail-interactive mail-self-blind mail-specify-envelope-from
-;;;;;;  mail-from-style) "sendmail" "mail/sendmail.el" (19845 45374))
+;;;;;;  mail-from-style) "sendmail" "mail/sendmail.el" (19881 27850))
 ;;; Generated autoloads from mail/sendmail.el
 (defvar mail-from-style 'default "\
@@ -24928,7 +24928,7 @@ To work around that, do:
 ;;;***
 ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/sh-script.el
 (put 'sh-shell 'safe-local-variable 'symbolp)
@@ -25057,8 +25057,8 @@ function, `load-path-shadows-find'.
 ;;;***
 ;;;### (autoloads (shadow-initialize shadow-define-regexp-group shadow-define-literal-group
-;;;;;;  shadow-define-cluster) "shadowfile" "shadowfile.el" (19845
+;;;;;;  shadow-define-cluster) "shadowfile" "shadowfile.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from shadowfile.el
 (autoload 'shadow-define-cluster "shadowfile" "\
@@ -25097,7 +25097,7 @@ Set up file shadowing.
 ;;;***
 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19888 1100))
 ;;; Generated autoloads from shell.el
 (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\
@@ -25146,8 +25146,8 @@ Otherwise, one argument `-i' is passed to the shell.
 ;;;***
-;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19845
+;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19899
-;;;;;;  45374))
+;;;;;;  57784))
 ;;; Generated autoloads from gnus/shr.el
 (autoload 'shr-insert-document "shr" "\
@@ -25194,8 +25194,8 @@ Turning on Sieve mode runs `sieve-mode-hook'.
 ;;;***
-;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (19845
+;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (19890
-;;;;;;  45374))
+;;;;;;  42850))
 ;;; Generated autoloads from progmodes/simula.el
 (autoload 'simula-mode "simula" "\
@@ -25465,8 +25465,8 @@ then `snmpv2-mode-hook'.
 ;;;***
-;;;### (autoloads (sunrise-sunset) "solar" "calendar/solar.el" (19845
+;;;### (autoloads (sunrise-sunset) "solar" "calendar/solar.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from calendar/solar.el
 (autoload 'sunrise-sunset "solar" "\
@@ -25481,8 +25481,8 @@ This function is suitable for execution in a .emacs file.
 ;;;***
-;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (19845
+;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (19889
-;;;;;;  45374))
+;;;;;;  21967))
 ;;; Generated autoloads from play/solitaire.el
 (autoload 'solitaire "solitaire" "\
@@ -25763,7 +25763,7 @@ Spam reports will be queued with the method used when
 ;;;***
 ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
-;;;;;;  "speedbar.el" (19845 45374))
+;;;;;;  "speedbar.el" (19886 45771))
 ;;; Generated autoloads from speedbar.el
 (defalias 'speedbar 'speedbar-frame-mode)
@@ -25807,7 +25807,7 @@ Return a vector containing the lines from `spook-phrases-file'.
 ;;;;;;  sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix
 ;;;;;;  sql-sybase sql-oracle sql-product-interactive sql-connect
 ;;;;;;  sql-mode sql-help sql-add-product-keywords) "sql" "progmodes/sql.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/sql.el
 (autoload 'sql-add-product-keywords "sql" "\
@@ -26343,8 +26343,8 @@ GNUTLS requires a port number.
 ;;;;;;  strokes-mode strokes-list-strokes strokes-load-user-strokes
 ;;;;;;  strokes-help strokes-describe-stroke strokes-do-complex-stroke
 ;;;;;;  strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke
-;;;;;;  strokes-global-set-stroke) "strokes" "strokes.el" (19845
+;;;;;;  strokes-global-set-stroke) "strokes" "strokes.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from strokes.el
 (autoload 'strokes-global-set-stroke "strokes" "\
@@ -27206,7 +27206,50 @@ converts a table into plain text without frames.  It is a companion to
 ;;;***
-;;;### (autoloads (talk talk-connect) "talk" "talk.el" (19845 45374))
+;;;### (autoloads (tabulated-list-mode) "tabulated-list" "emacs-lisp/tabulated-list.el"
+;;;;;;  (19885 24894))
+;;; Generated autoloads from emacs-lisp/tabulated-list.el
+(autoload 'tabulated-list-mode "tabulated-list" "\
+Generic major mode for browsing a list of items.
+This mode is usually not used directly; instead, other major
+modes are derived from it, using `define-derived-mode'.
+In this major mode, the buffer is divided into multiple columns,
+which are labelled using the header line.  Each non-empty line
+belongs to one \"entry\", and the entries can be sorted according
+to their column values.
+An inheriting mode should usually do the following in their body:
+ - Set `tabulated-list-format', specifying the column format.
+ - Set `tabulated-list-revert-hook', if the buffer contents need
+   to be specially recomputed prior to `revert-buffer'.
+ - Maybe set a `tabulated-list-entries' function (see below).
+ - Maybe set `tabulated-list-printer' (see below).
+ - Maybe set `tabulated-list-padding'.
+ - Call `tabulated-list-init-header' to initialize `header-line-format'
+   according to `tabulated-list-format'.
+An inheriting mode is usually accompanied by a \"list-FOO\"
+command (e.g. `list-packages', `list-processes').  This command
+creates or switches to a buffer and enables the major mode in
+that buffer.  If `tabulated-list-entries' is not a function, the
+command should initialize it to a list of entries for displaying.
+Finally, it should call `tabulated-list-print'.
+`tabulated-list-print' calls the printer function specified by
+`tabulated-list-printer', once for each entry.  The default
+printer is `tabulated-list-print-entry', but a mode that keeps
+data in an ewoc may instead specify a printer function (e.g., one
+that calls `ewoc-enter-last'), with `tabulated-list-print-entry'
+as the ewoc pretty-printer.
+\(fn)" t nil)
+;;;***
+;;;### (autoloads (talk talk-connect) "talk" "talk.el" (19886 45771))
 ;;; Generated autoloads from talk.el
 (autoload 'talk-connect "talk" "\
@@ -27221,7 +27264,7 @@ Connect to the Emacs talk group from the current X display or tty frame.
 ;;;***
-;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (19845 45374))
+;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (19886 45771))
 ;;; Generated autoloads from tar-mode.el
 (autoload 'tar-mode "tar-mode" "\
@@ -27245,7 +27288,7 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'.
 ;;;***
 ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl"
-;;;;;;  "progmodes/tcl.el" (19845 45374))
+;;;;;;  "progmodes/tcl.el" (19890 42850))
 ;;; Generated autoloads from progmodes/tcl.el
 (autoload 'tcl-mode "tcl" "\
@@ -27363,8 +27406,8 @@ use in that buffer.
 ;;;***
-;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (19845
+;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from terminal.el
 (autoload 'terminal-emulator "terminal" "\
@@ -27411,7 +27454,7 @@ Start coverage on function under point.
 ;;;***
-;;;### (autoloads (tetris) "tetris" "play/tetris.el" (19845 45374))
+;;;### (autoloads (tetris) "tetris" "play/tetris.el" (19889 21967))
 ;;; Generated autoloads from play/tetris.el
 (autoload 'tetris "tetris" "\
@@ -28094,7 +28137,7 @@ This function performs no refilling of the changed text.
 ;;;### (autoloads (emacs-init-time emacs-uptime display-time-world
 ;;;;;;  display-time-mode display-time display-time-day-and-date)
-;;;;;;  "time" "time.el" (19845 45374))
+;;;;;;  "time" "time.el" (19886 45771))
 ;;; Generated autoloads from time.el
 (defvar display-time-day-and-date nil "\
@@ -28159,7 +28202,7 @@ Return a string giving the duration of the Emacs initialization.
 ;;;;;;  time-to-day-in-year date-leap-year-p days-between date-to-day
 ;;;;;;  time-add time-subtract time-since days-to-time time-less-p
 ;;;;;;  seconds-to-time date-to-time) "time-date" "calendar/time-date.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19885 24894))
 ;;; Generated autoloads from calendar/time-date.el
 (autoload 'date-to-time "time-date" "\
@@ -28273,7 +28316,7 @@ This function does not work for SECONDS greater than `most-positive-fixnum'.
 ;;;***
 ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp"
-;;;;;;  "time-stamp.el" (19845 45374))
+;;;;;;  "time-stamp.el" (19886 45771))
 ;;; Generated autoloads from time-stamp.el
 (put 'time-stamp-format 'safe-local-variable 'stringp)
 (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p)
@@ -28540,7 +28583,7 @@ Show TODO list.
 ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu
 ;;;;;;  tool-bar-local-item tool-bar-add-item toggle-tool-bar-mode-from-frame)
-;;;;;;  "tool-bar" "tool-bar.el" (19845 45374))
+;;;;;;  "tool-bar" "tool-bar.el" (19886 45771))
 ;;; Generated autoloads from tool-bar.el
 (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\
@@ -28723,7 +28766,7 @@ BUFFER defaults to `trace-buffer'.
 ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion
 ;;;;;;  tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers
 ;;;;;;  tramp-file-name-handler tramp-syntax tramp-mode) "tramp"
-;;;;;;  "net/tramp.el" (19845 45374))
+;;;;;;  "net/tramp.el" (19894 39890))
 ;;; Generated autoloads from net/tramp.el
 (defvar tramp-mode t "\
@@ -28959,7 +29002,7 @@ First column's text    sSs  Second column's text
 ;;;;;;  type-break type-break-mode type-break-keystroke-threshold
 ;;;;;;  type-break-good-break-interval type-break-good-rest-interval
 ;;;;;;  type-break-interval type-break-mode) "type-break" "type-break.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from type-break.el
 (defvar type-break-mode nil "\
@@ -29494,7 +29537,7 @@ accessible.
 ;;;***
 ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p
-;;;;;;  url-http) "url-http" "url/url-http.el" (19845 45374))
+;;;;;;  url-http) "url-http" "url/url-http.el" (19882 48702))
 ;;; Generated autoloads from url/url-http.el
 (autoload 'url-http "url-http" "\
@@ -29725,7 +29768,7 @@ Setup variables that expose info about you and your system.
 ;;;;;;  url-pretty-length url-strip-leading-spaces url-eat-trailing-space
 ;;;;;;  url-get-normalized-date url-lazy-message url-normalize-url
 ;;;;;;  url-insert-entities-in-string url-parse-args url-debug url-debug)
-;;;;;;  "url-util" "url/url-util.el" (19845 45374))
+;;;;;;  "url-util" "url/url-util.el" (19867 59212))
 ;;; Generated autoloads from url/url-util.el
 (defvar url-debug nil "\
@@ -29956,9 +29999,10 @@ If FILE-NAME is non-nil, save the result to FILE-NAME.
 ;;;;;;  vc-delete-file vc-transfer-file vc-switch-backend vc-pull
 ;;;;;;  vc-rollback vc-revert vc-log-outgoing vc-log-incoming vc-print-root-log
 ;;;;;;  vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers
-;;;;;;  vc-revision-other-window vc-root-diff vc-diff vc-version-diff
+;;;;;;  vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff
-;;;;;;  vc-register vc-next-action vc-before-checkin-hook vc-checkin-hook
+;;;;;;  vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook
-;;;;;;  vc-checkout-hook) "vc" "vc/vc.el" (19845 45374))
+;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (19888
+;;;;;;  1100))
 ;;; Generated autoloads from vc/vc.el
 (defvar vc-checkout-hook nil "\
@@ -30044,6 +30088,23 @@ saving the buffer.
 \(fn HISTORIC &optional NOT-URGENT)" t nil)
+(autoload 'vc-version-ediff "vc" "\
+Show differences between revisions of the fileset in the
+repository history using ediff.
+\(fn FILES REV1 REV2)" t nil)
+(autoload 'vc-ediff "vc" "\
+Display diffs between file revisions using ediff.
+Normally this compares the currently selected fileset with their
+working revisions.  With a prefix argument HISTORIC, it reads two revision
+designators specifying which revisions to compare.
+The optional argument NOT-URGENT non-nil means it is ok to say no to
+saving the buffer.
+\(fn HISTORIC &optional NOT-URGENT)" t nil)
 (autoload 'vc-root-diff "vc" "\
 Display diffs between VC-controlled whole tree revisions.
 Normally, this compares the tree corresponding to the current
@@ -30224,7 +30285,7 @@ Return the branch part of a revision number REV.
 ;;;***
 ;;;### (autoloads (vc-annotate) "vc-annotate" "vc/vc-annotate.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19893 19022))
 ;;; Generated autoloads from vc/vc-annotate.el
 (autoload 'vc-annotate "vc-annotate" "\
@@ -30426,7 +30487,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 ;;;***
 ;;;### (autoloads (vera-mode) "vera-mode" "progmodes/vera-mode.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19890 42850))
 ;;; Generated autoloads from progmodes/vera-mode.el
 (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'")  'vera-mode))
@@ -31265,7 +31326,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics.
 ;;;;;;  view-mode view-buffer-other-frame view-buffer-other-window
 ;;;;;;  view-buffer view-file-other-frame view-file-other-window
 ;;;;;;  view-file kill-buffer-if-not-modified view-remove-frame-by-deleting)
-;;;;;;  "view" "view.el" (19845 45374))
+;;;;;;  "view" "view.el" (19886 45771))
 ;;; Generated autoloads from view.el
 (defvar view-remove-frame-by-deleting t "\
@@ -31635,7 +31696,7 @@ this is equivalent to `display-warning', using
 ;;;***
 ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from wdired.el
 (autoload 'wdired-change-to-wdired-mode "wdired" "\
@@ -31699,7 +31760,7 @@ and off otherwise.
 ;;;### (autoloads (whitespace-report-region whitespace-report whitespace-cleanup-region
 ;;;;;;  whitespace-cleanup global-whitespace-toggle-options whitespace-toggle-options
 ;;;;;;  global-whitespace-newline-mode global-whitespace-mode whitespace-newline-mode
-;;;;;;  whitespace-mode) "whitespace" "whitespace.el" (19845 45374))
+;;;;;;  whitespace-mode) "whitespace" "whitespace.el" (19901 13134))
 ;;; Generated autoloads from whitespace.el
 (autoload 'whitespace-mode "whitespace" "\
@@ -32102,7 +32163,7 @@ cleaning up these problems.
 ;;;***
 ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse
-;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (19845 45374))
+;;;;;;  widget-browse-at) "wid-browse" "wid-browse.el" (19886 45771))
 ;;; Generated autoloads from wid-browse.el
 (autoload 'widget-browse-at "wid-browse" "\
@@ -32129,8 +32190,8 @@ With arg, turn widget mode on if and only if arg is positive.
 ;;;***
 ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create
-;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19845
+;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from wid-edit.el
 (autoload 'widgetp "wid-edit" "\
@@ -32173,8 +32234,8 @@ Setup current buffer so editing string widgets works.
 ;;;***
 ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right
-;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (19845
+;;;;;;  windmove-up windmove-left) "windmove" "windmove.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from windmove.el
 (autoload 'windmove-left "windmove" "\
@@ -32246,7 +32307,7 @@ With arg, turn Winner mode on if and only if arg is positive.
 ;;;***
 ;;;### (autoloads (woman-bookmark-jump woman-find-file woman-dired-find-file
-;;;;;;  woman woman-locale) "woman" "woman.el" (19845 45374))
+;;;;;;  woman woman-locale) "woman" "woman.el" (19886 45771))
 ;;; Generated autoloads from woman.el
 (defvar woman-locale nil "\
@@ -32427,7 +32488,7 @@ Example:
 ;;;***
 ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19886 45771))
 ;;; Generated autoloads from xml.el
 (autoload 'xml-parse-file "xml" "\
@@ -32471,8 +32532,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT.
 ;;;***
-;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (19845
+;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (19886
-;;;;;;  45374))
+;;;;;;  45771))
 ;;; Generated autoloads from xt-mouse.el
 (defvar xterm-mouse-mode nil "\
@@ -32543,7 +32604,7 @@ Zippy goes to the analyst.
 ;;;***
-;;;### (autoloads (zone) "zone" "play/zone.el" (19845 45374))
+;;;### (autoloads (zone) "zone" "play/zone.el" (19889 21967))
 ;;; Generated autoloads from play/zone.el
 (autoload 'zone "zone" "\
@@ -32559,47 +32620,46 @@ Zone out, completely.
 ;;;;;;  "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el"
 ;;;;;;  "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el"
 ;;;;;;  "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el"
-;;;;;;  "calc/calc-loaddefs.el" "calc/calc-macs.el" "calc/calc-map.el"
+;;;;;;  "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el"
-;;;;;;  "calc/calc-math.el" "calc/calc-menu.el" "calc/calc-misc.el"
+;;;;;;  "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el"
-;;;;;;  "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-nlfit.el"
+;;;;;;  "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el"
-;;;;;;  "calc/calc-poly.el" "calc/calc-prog.el" "calc/calc-rewr.el"
+;;;;;;  "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el"
-;;;;;;  "calc/calc-rules.el" "calc/calc-sel.el" "calc/calc-stat.el"
+;;;;;;  "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el"
-;;;;;;  "calc/calc-store.el" "calc/calc-stuff.el" "calc/calc-trail.el"
+;;;;;;  "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-units.el"
-;;;;;;  "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el"
+;;;;;;  "calc/calc-vec.el" "calc/calc-yank.el" "calc/calcalg2.el"
-;;;;;;  "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el"
+;;;;;;  "calc/calcalg3.el" "calc/calccomp.el" "calc/calcsel2.el"
-;;;;;;  "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el"
+;;;;;;  "calendar/cal-bahai.el" "calendar/cal-coptic.el" "calendar/cal-french.el"
-;;;;;;  "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el"
+;;;;;;  "calendar/cal-html.el" "calendar/cal-islam.el" "calendar/cal-iso.el"
-;;;;;;  "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el"
+;;;;;;  "calendar/cal-julian.el" "calendar/cal-loaddefs.el" "calendar/cal-mayan.el"
-;;;;;;  "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el"
+;;;;;;  "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el"
-;;;;;;  "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el"
+;;;;;;  "calendar/cal-tex.el" "calendar/cal-x.el" "calendar/diary-loaddefs.el"
-;;;;;;  "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el"
+;;;;;;  "calendar/hol-loaddefs.el" "cdl.el" "cedet/cedet-cscope.el"
-;;;;;;  "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el"
+;;;;;;  "cedet/cedet-files.el" "cedet/cedet-global.el" "cedet/cedet-idutils.el"
-;;;;;;  "cedet/cedet-idutils.el" "cedet/cedet.el" "cedet/ede/auto.el"
+;;;;;;  "cedet/cedet.el" "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el"
-;;;;;;  "cedet/ede/autoconf-edit.el" "cedet/ede/base.el" "cedet/ede/cpp-root.el"
+;;;;;;  "cedet/ede/base.el" "cedet/ede/cpp-root.el" "cedet/ede/custom.el"
-;;;;;;  "cedet/ede/custom.el" "cedet/ede/dired.el" "cedet/ede/emacs.el"
+;;;;;;  "cedet/ede/dired.el" "cedet/ede/emacs.el" "cedet/ede/files.el"
-;;;;;;  "cedet/ede/files.el" "cedet/ede/generic.el" "cedet/ede/linux.el"
+;;;;;;  "cedet/ede/generic.el" "cedet/ede/linux.el" "cedet/ede/locate.el"
-;;;;;;  "cedet/ede/loaddefs.el" "cedet/ede/locate.el" "cedet/ede/make.el"
+;;;;;;  "cedet/ede/make.el" "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el"
-;;;;;;  "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el" "cedet/ede/pmake.el"
+;;;;;;  "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el"
-;;;;;;  "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el"
+;;;;;;  "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el"
-;;;;;;  "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el"
+;;;;;;  "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el"
-;;;;;;  "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el"
+;;;;;;  "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" "cedet/ede/proj.el"
-;;;;;;  "cedet/ede/proj-shared.el" "cedet/ede/proj.el" "cedet/ede/project-am.el"
+;;;;;;  "cedet/ede/project-am.el" "cedet/ede/shell.el" "cedet/ede/simple.el"
-;;;;;;  "cedet/ede/shell.el" "cedet/ede/simple.el" "cedet/ede/source.el"
+;;;;;;  "cedet/ede/source.el" "cedet/ede/speedbar.el" "cedet/ede/srecode.el"
-;;;;;;  "cedet/ede/speedbar.el" "cedet/ede/srecode.el" "cedet/ede/system.el"
+;;;;;;  "cedet/ede/system.el" "cedet/ede/util.el" "cedet/inversion.el"
-;;;;;;  "cedet/ede/util.el" "cedet/inversion.el" "cedet/mode-local.el"
+;;;;;;  "cedet/mode-local.el" "cedet/pulse.el" "cedet/semantic/analyze.el"
-;;;;;;  "cedet/pulse.el" "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el"
+;;;;;;  "cedet/semantic/analyze/complete.el" "cedet/semantic/analyze/debug.el"
-;;;;;;  "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el"
+;;;;;;  "cedet/semantic/analyze/fcn.el" "cedet/semantic/analyze/refs.el"
-;;;;;;  "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el"
+;;;;;;  "cedet/semantic/bovine.el" "cedet/semantic/bovine/c-by.el"
-;;;;;;  "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el"
+;;;;;;  "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el"
-;;;;;;  "cedet/semantic/bovine/debug.el" "cedet/semantic/bovine/el.el"
+;;;;;;  "cedet/semantic/bovine/el.el" "cedet/semantic/bovine/gcc.el"
-;;;;;;  "cedet/semantic/bovine/gcc.el" "cedet/semantic/bovine/make-by.el"
+;;;;;;  "cedet/semantic/bovine/make-by.el" "cedet/semantic/bovine/make.el"
-;;;;;;  "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm-by.el"
+;;;;;;  "cedet/semantic/bovine/scm-by.el" "cedet/semantic/bovine/scm.el"
-;;;;;;  "cedet/semantic/bovine/scm.el" "cedet/semantic/chart.el"
+;;;;;;  "cedet/semantic/chart.el" "cedet/semantic/complete.el" "cedet/semantic/ctxt.el"
-;;;;;;  "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" "cedet/semantic/db-debug.el"
+;;;;;;  "cedet/semantic/db-debug.el" "cedet/semantic/db-ebrowse.el"
-;;;;;;  "cedet/semantic/db-ebrowse.el" "cedet/semantic/db-el.el"
+;;;;;;  "cedet/semantic/db-el.el" "cedet/semantic/db-file.el" "cedet/semantic/db-find.el"
-;;;;;;  "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" "cedet/semantic/db-global.el"
+;;;;;;  "cedet/semantic/db-global.el" "cedet/semantic/db-javascript.el"
-;;;;;;  "cedet/semantic/db-javascript.el" "cedet/semantic/db-mode.el"
+;;;;;;  "cedet/semantic/db-mode.el" "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el"
-;;;;;;  "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el"
 ;;;;;;  "cedet/semantic/db.el" "cedet/semantic/debug.el" "cedet/semantic/decorate.el"
 ;;;;;;  "cedet/semantic/decorate/include.el" "cedet/semantic/decorate/mode.el"
 ;;;;;;  "cedet/semantic/dep.el" "cedet/semantic/doc.el" "cedet/semantic/ede-grammar.el"
@@ -32607,13 +32667,13 @@ Zone out, completely.
 ;;;;;;  "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el"
 ;;;;;;  "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el"
 ;;;;;;  "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el"
-;;;;;;  "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el"
+;;;;;;  "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el"
-;;;;;;  "cedet/semantic/mru-bookmark.el" "cedet/semantic/sb.el" "cedet/semantic/scope.el"
+;;;;;;  "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el"
-;;;;;;  "cedet/semantic/senator.el" "cedet/semantic/sort.el" "cedet/semantic/symref.el"
+;;;;;;  "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el"
-;;;;;;  "cedet/semantic/symref/cscope.el" "cedet/semantic/symref/filter.el"
+;;;;;;  "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el"
-;;;;;;  "cedet/semantic/symref/global.el" "cedet/semantic/symref/grep.el"
+;;;;;;  "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el"
-;;;;;;  "cedet/semantic/symref/idutils.el" "cedet/semantic/symref/list.el"
+;;;;;;  "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el"
-;;;;;;  "cedet/semantic/tag-file.el" "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el"
+;;;;;;  "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el"
 ;;;;;;  "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el"
 ;;;;;;  "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el"
 ;;;;;;  "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el"
@@ -32625,33 +32685,32 @@ Zone out, completely.
 ;;;;;;  "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el"
 ;;;;;;  "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el"
 ;;;;;;  "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el"
-;;;;;;  "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el"
+;;;;;;  "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el"
-;;;;;;  "cedet/srecode/semantic.el" "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el"
+;;;;;;  "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el"
-;;;;;;  "cedet/srecode/table.el" "cedet/srecode/template.el" "cedet/srecode/texi.el"
+;;;;;;  "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el"
-;;;;;;  "cus-dep.el" "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el"
+;;;;;;  "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el"
-;;;;;;  "dos-vars.el" "dos-w32.el" "dynamic-setting.el" "emacs-lisp/assoc.el"
+;;;;;;  "dos-w32.el" "dynamic-setting.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el"
-;;;;;;  "emacs-lisp/authors.el" "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el"
+;;;;;;  "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el"
-;;;;;;  "emacs-lisp/byte-opt.el" "emacs-lisp/chart.el" "emacs-lisp/cl-extra.el"
+;;;;;;  "emacs-lisp/chart.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-loaddefs.el"
-;;;;;;  "emacs-lisp/cl-loaddefs.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el"
+;;;;;;  "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el" "emacs-lisp/cl-specs.el"
-;;;;;;  "emacs-lisp/cl-specs.el" "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el"
+;;;;;;  "emacs-lisp/cust-print.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-custom.el"
-;;;;;;  "emacs-lisp/eieio-custom.el" "emacs-lisp/eieio-datadebug.el"
+;;;;;;  "emacs-lisp/eieio-datadebug.el" "emacs-lisp/eieio-opt.el"
-;;;;;;  "emacs-lisp/eieio-opt.el" "emacs-lisp/eieio-speedbar.el"
+;;;;;;  "emacs-lisp/eieio-speedbar.el" "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el"
-;;;;;;  "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el" "emacs-lisp/gulp.el"
+;;;;;;  "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el"
-;;;;;;  "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" "emacs-lisp/regi.el"
+;;;;;;  "emacs-lisp/regi.el" "emacs-lisp/smie.el" "emacs-lisp/tcover-ses.el"
-;;;;;;  "emacs-lisp/smie.el" "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el"
+;;;;;;  "emacs-lisp/tcover-unsafep.el" "emacs-lock.el" "emulation/cua-gmrk.el"
-;;;;;;  "emacs-lock.el" "emulation/cua-gmrk.el" "emulation/cua-rect.el"
+;;;;;;  "emulation/cua-rect.el" "emulation/edt-lk201.el" "emulation/edt-mapper.el"
-;;;;;;  "emulation/edt-lk201.el" "emulation/edt-mapper.el" "emulation/edt-pc.el"
+;;;;;;  "emulation/edt-pc.el" "emulation/edt-vt100.el" "emulation/tpu-extras.el"
-;;;;;;  "emulation/edt-vt100.el" "emulation/tpu-extras.el" "emulation/viper-cmd.el"
+;;;;;;  "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el"
-;;;;;;  "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el"
+;;;;;;  "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el"
-;;;;;;  "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el"
+;;;;;;  "emulation/viper-util.el" "erc/erc-backend.el" "erc/erc-goodies.el"
-;;;;;;  "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el"
+;;;;;;  "erc/erc-ibuffer.el" "erc/erc-lang.el" "eshell/em-alias.el"
-;;;;;;  "erc/erc-lang.el" "eshell/em-alias.el" "eshell/em-banner.el"
+;;;;;;  "eshell/em-banner.el" "eshell/em-basic.el" "eshell/em-cmpl.el"
-;;;;;;  "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el"
+;;;;;;  "eshell/em-dirs.el" "eshell/em-glob.el" "eshell/em-hist.el"
-;;;;;;  "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el"
+;;;;;;  "eshell/em-ls.el" "eshell/em-pred.el" "eshell/em-prompt.el"
-;;;;;;  "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el"
+;;;;;;  "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el"
-;;;;;;  "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el"
+;;;;;;  "eshell/em-term.el" "eshell/em-unix.el" "eshell/em-xtra.el"
-;;;;;;  "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el"
+;;;;;;  "eshell/esh-arg.el" "eshell/esh-cmd.el" "eshell/esh-ext.el"
-;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-groups.el"
 ;;;;;;  "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el"
 ;;;;;;  "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el"
 ;;;;;;  "ezimage.el" "foldout.el" "format-spec.el" "forms-d2.el"
@@ -32754,8 +32813,8 @@ Zone out, completely.
 ;;;;;;  "vc/ediff-init.el" "vc/ediff-merg.el" "vc/ediff-ptch.el"
 ;;;;;;  "vc/ediff-vers.el" "vc/ediff-wind.el" "vc/pcvs-info.el" "vc/pcvs-parse.el"
 ;;;;;;  "vc/pcvs-util.el" "vc/vc-dav.el" "vcursor.el" "vt-control.el"
-;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19867
+;;;;;;  "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19901
-;;;;;;  53579 794540))
+;;;;;;  13383 538856))
 ;;;***
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 09519e14870..2071f790656 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -109,7 +109,10 @@ values:
 :starttls-function specifies a function for handling STARTTLS.
  This function should take one parameter, the response to the
  capability command, and should return the command to switch on
-  STARTTLS if the server supports STARTTLS, and nil otherwise."
+  STARTTLS if the server supports STARTTLS, and nil otherwise.
+:nowait is a boolean that says the connection should be made
+asynchronously, if possible."
  (unless (featurep 'make-network-process)
    (error "Emacs was compiled without networking support"))
  (let ((type (plist-get parameters :type))
@@ -121,7 +124,8 @@ values:
                                (plist-get parameters :capability-command))))))
        ;; The simplest case: wrapper around `make-network-process'.
        (make-network-process :name name :buffer buffer
-                              :host host :service service)
+                              :host host :service service
+                              :nowait (plist-get parameters :nowait))
      (let ((work-buffer (or buffer
                             (generate-new-buffer " *stream buffer*")))
            (fun (cond ((eq type 'plain) 'network-stream-open-plain)
@@ -150,10 +154,11 @@ values:
 (defun network-stream-open-plain (name buffer host service parameters)
  (let ((start (with-current-buffer buffer (point)))
        (stream (make-network-process :name name :buffer buffer
-                                      :host host :service service)))
+                                      :host host :service service
+                                      :nowait (plist-get parameters :nowait))))
    (list stream
          (network-stream-get-response stream start
-                                     (plist-get parameters :end-of-command))
+                                       (plist-get parameters :end-of-command))
          nil
          'plain)))
diff --git a/lisp/server.el b/lisp/server.el
index ce14f133f0a..c421ee09812 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1484,6 +1484,45 @@ only these files will be asked to be saved."
  ;; continue standard unloading
  nil)
+(defun server-eval-at (server form)
+  "Eval FORM on Emacs Server SERVER."
+  (let ((auth-file (expand-file-name server server-auth-dir))
+        (coding-system-for-read 'binary)
+        (coding-system-for-write 'binary)
+        address port secret process)
+    (unless (file-exists-p auth-file)
+      (error "No such server definition: %s" auth-file))
+    (with-temp-buffer
+      (insert-file-contents auth-file)
+      (unless (looking-at "\\([0-9.]+\\):\\([0-9]+\\)")
+        (error "Invalid auth file"))
+      (setq address (match-string 1)
+            port (string-to-number (match-string 2)))
+      (forward-line 1)
+      (setq secret (buffer-substring (point) (line-end-position)))
+      (erase-buffer)
+      (unless (setq process (open-network-stream "eval-at" (current-buffer)
+                                                 address port))
+        (error "Unable to contact the server"))
+      (set-process-query-on-exit-flag process nil)
+      (process-send-string
+       process
+       (concat "-auth " secret " -eval "
+               (replace-regexp-in-string
+                " " "&_" (format "%S" form))
+               "\n"))
+      (while (memq (process-status process) '(open run))
+        (accept-process-output process 0 10))
+      (goto-char (point-min))
+      ;; If the result is nil, there's nothing in the buffer.  If the
+      ;; result is non-nil, it's after "-print ".
+      (when (search-forward "\n-print" nil t)
+        (let ((start (point)))
+          (while (search-forward "&_" nil t)
+            (replace-match " " t t))
+          (goto-char start)
+          (read (current-buffer)))))))
 (provide 'server)
diff --git a/lisp/simple.el b/lisp/simple.el
index 3cfc579aad0..9fd221819c5 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1154,6 +1154,9 @@ in *Help* buffer.  See also the command `describe-char'."
 ;; Initialize read-expression-map.  It is defined at C level.
 (let ((m (make-sparse-keymap)))
  (define-key m "\M-\t" 'lisp-complete-symbol)
+  ;; Might as well bind TAB to completion, since inserting a TAB char is much
+  ;; too rarely useful.
+  (define-key m "\t" 'lisp-complete-symbol)
  (set-keymap-parent m minibuffer-local-map)
  (setq read-expression-map m))
@@ -2168,19 +2171,10 @@ to the end of the list of defaults just after the default value."
 (defvar shell-file-name-chars)
 (defvar shell-file-name-quote-list)
-(defun minibuffer-complete-shell-command ()
-  "Dynamically complete shell command at point."
-  (interactive)
-  (require 'shell)
-  (let ((comint-delimiter-argument-list shell-delimiter-argument-list)
-        (comint-file-name-chars shell-file-name-chars)
-        (comint-file-name-quote-list shell-file-name-quote-list))
-    (run-hook-with-args-until-success 'shell-dynamic-complete-functions)))
 (defvar minibuffer-local-shell-command-map
  (let ((map (make-sparse-keymap)))
    (set-keymap-parent map minibuffer-local-map)
-    (define-key map "\t" 'minibuffer-complete-shell-command)
+    (define-key map "\t" 'completion-at-point)
    map)
  "Keymap used for completing shell commands in minibuffer.")
@@ -2189,8 +2183,18 @@ to the end of the list of defaults just after the default value."
 The arguments are the same as the ones of `read-from-minibuffer',
 except READ and KEYMAP are missing and HIST defaults
 to `shell-command-history'."
+  (require 'shell)
  (minibuffer-with-setup-hook
      (lambda ()
+        (set (make-local-variable 'comint-delimiter-argument-list)
+             shell-delimiter-argument-list)
+        (set (make-local-variable 'comint-file-name-chars) shell-file-name-chars)
+        (set (make-local-variable 'comint-file-name-quote-list)
+             shell-file-name-quote-list)
+        (set (make-local-variable 'comint-dynamic-complete-functions)
+             shell-dynamic-complete-functions)
+        (add-hook 'completion-at-point-functions
+                  'comint-completion-at-point nil 'local)
        (set (make-local-variable 'minibuffer-default-add-function)
             'minibuffer-default-add-shell-commands))
    (apply 'read-from-minibuffer prompt initial-contents
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index ab31fed7069..35409d64289 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2300,48 +2300,42 @@ if defined."
         (wild-p (string-match "\\*" word))
         (look-p (and ispell-look-p     ; Only use look for an exact match.
                      (or ispell-have-new-look (not wild-p))))
-         (ispell-grep-buffer (get-buffer-create "*Ispell-Temp*")) ; result buf
         (prog (if look-p ispell-look-command ispell-grep-command))
         (args (if look-p ispell-look-options ispell-grep-options))
         status results loc)
-    (unwind-protect
+    (with-temp-buffer
-        (save-window-excursion
+      (message "Starting \"%s\" process..." (file-name-nondirectory prog))
-          (message "Starting \"%s\" process..." (file-name-nondirectory prog))
+      (if look-p
-          (set-buffer ispell-grep-buffer)
+          nil
-          (if look-p
+        ;; Convert * to .*
-              nil
+        (insert "^" word "$")
-            ;; convert * to .*
+        (while (search-backward "*" nil t) (insert "."))
-            (insert "^" word "$")
+        (setq word (buffer-string))
-            (while (search-backward "*" nil t) (insert "."))
+        (erase-buffer))
-            (setq word (buffer-string))
+      (setq status (apply 'ispell-call-process prog nil t nil
-            (erase-buffer))
+                          (nconc (if (and args (> (length args) 0))
-          (setq status (apply 'ispell-call-process prog nil t nil
+                                     (list args)
-                              (nconc (if (and args (> (length args) 0))
+                                   (if look-p nil
-                                         (list args)
+                                     (list "-e")))
-                                       (if look-p nil
+                                 (list word)
-                                         (list "-e")))
+                                 (if lookup-dict (list lookup-dict)))))
-                                     (list word)
+      ;; `grep' returns status 1 and no output when word not found, which
-                                     (if lookup-dict (list lookup-dict)))))
+      ;; is a perfectly normal thing.
-          ;; grep returns status 1 and no output when word not found, which
+      (if (stringp status)
-          ;; is a perfectly normal thing.
+          (error "error: %s exited with signal %s"
-          (if (stringp status)
+                 (file-name-nondirectory prog) status)
-              (setq results (cons (format "error: %s exited with signal %s"
+        ;; Else collect words into `results' in FIFO order.
-                                          (file-name-nondirectory prog) status)
+        (goto-char (point-max))
-                                  results))
+        ;; Assure we've ended with \n.
-            ;; else collect words into `results' in FIFO order
+        (or (bobp) (= (preceding-char) ?\n) (insert ?\n))
-            (goto-char (point-max))
+        (while (not (bobp))
-            ;; assure we've ended with \n
+          (setq loc (point))
-            (or (bobp) (= (preceding-char) ?\n) (insert ?\n))
+          (forward-line -1)
-            (while (not (bobp))
+          (push (buffer-substring-no-properties (point)
-              (setq loc (point))
+                                                (1- loc))
-              (forward-line -1)
+                results))))
-              (setq results (cons (buffer-substring-no-properties (point)
+    (if (and results (string-match ".+: " (car results)))
-                                                                  (1- loc))
+        (error "%s error: %s" ispell-grep-command (car results)))
-                                  results)))))
-      ;; protected
-      (kill-buffer ispell-grep-buffer)
-      (if (and results (string-match ".+: " (car results)))
-          (error "%s error: %s" ispell-grep-command (car results))))
    results))
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 528b63a6448..1049d09d6db 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * url-queue.el: New file.
+        (url-queue-run-queue): Pick the first waiting job, and not the
+        last.
+        (url-queue-parallel-processes): Lower the concurrency level, since
+        Emacs doesn't seem to like too many async processes.
+        (url-queue-prune-old-entries): Fix up the pruning code.
 2011-04-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
        * url-http.el (url-http-wait-for-headers-change-function): Protect
diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el
new file mode 100644
index 00000000000..08496ad5afb
--- /dev/null
+++ b/lisp/url/url-queue.el
@@ -0,0 +1,112 @@
+;;; url-queue.el --- Fetching web pages in parallel
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;; Keywords: comm
+;; This file is part of GNU Emacs.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;;; Commentary:
+;; The point of this package is to allow fetching web pages in
+;; parallel -- but control the level of parallelism to avoid DoS-ing
+;; web servers and Emacs.
+;;; Code:
+(eval-when-compile (require 'cl))
+(require 'browse-url)
+(defcustom url-queue-parallel-processes 2
+  "The number of concurrent processes."
+  :type 'integer
+  :group 'url)
+(defcustom url-queue-timeout 5
+  "How long to let a job live once it's started (in seconds)."
+  :type 'integer
+  :group 'url)
+;;; Internal variables.
+(defvar url-queue nil)
+(defstruct url-queue
+  url callback cbargs silentp
+  buffer start-time)
+;;;###autoload
+(defun url-queue-retrieve (url callback &optional cbargs silent)
+  "Retrieve URL asynchronously and call CALLBACK with CBARGS when finished.
+Like `url-retrieve' (which see for details of the arguments), but
+controls the level of parallelism via the
+`url-queue-parallel-processes' variable."
+  (setq url-queue
+        (append url-queue
+                (list (make-url-queue :url url
+                                      :callback callback
+                                      :cbargs cbargs
+                                      :silentp silent))))
+  (url-queue-run-queue))
+(defun url-queue-run-queue ()
+  (url-queue-prune-old-entries)
+  (let ((running 0)
+        waiting)
+    (dolist (entry url-queue)
+      (cond
+       ((url-queue-start-time entry)
+        (incf running))
+       ((not waiting)
+        (setq waiting entry))))
+    (when (and waiting
+               (< running url-queue-parallel-processes))
+      (setf (url-queue-start-time waiting) (float-time))
+      (url-queue-start-retrieve waiting))))
+(defun url-queue-callback-function (status job)
+  (setq url-queue (delq job url-queue))
+  (url-queue-run-queue)
+  (apply (url-queue-callback job) (cons status (url-queue-cbargs job))))
+(defun url-queue-start-retrieve (job)
+  (setf (url-queue-buffer job)
+        (ignore-errors
+          (url-retrieve (url-queue-url job)
+                        #'url-queue-callback-function (list job)
+                        (url-queue-silentp job)))))
+(defun url-queue-prune-old-entries ()
+  (let (dead-jobs)
+    (dolist (job url-queue)
+      ;; Kill jobs that have lasted longer than the timeout.
+      (when (and (url-queue-start-time job)
+                 (> (- (float-time) (url-queue-start-time job))
+                    url-queue-timeout))
+        (push job dead-jobs)))
+    (dolist (job dead-jobs)
+      (when (bufferp (url-queue-buffer job))
+        (while (get-buffer-process (url-queue-buffer job))
+          (ignore-errors
+            (delete-process (get-buffer-process (url-queue-buffer job)))))
+        (ignore-errors
+          (kill-buffer (url-queue-buffer job))))
+      (setq url-queue (delq job url-queue)))))
+(provide 'url-queue)
+;;; url-queue.el ends here
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 4bc3466f13f..9655ce64a99 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -1,4 +1,4 @@
-;;; diff.el --- run `diff' in compilation-mode
+;;; diff.el --- run `diff'
 ;; Copyright (C) 1992, 1994, 1996, 2001-2011 Free Software Foundation, Inc.
diff --git a/src/ChangeLog b/src/ChangeLog
index 75917224ca9..c237ba24b0f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -92,6 +92,40 @@
        * fns.c (Frandom): Let EMACS_UINT be wider than unsigned long.
+2011-05-02  Juanma Barranquero  <lekktu@gmail.com>
+        * sysdep.c (get_tty_size) [WINDOWSNT]: Implement.  (Bug#8596)
+2011-05-02  Juanma Barranquero  <lekktu@gmail.com>
+        * gnutls.c (Qgnutls_log_level, Qgnutls_code, Qgnutls_anon)
+        (Qgnutls_x509pki, Qgnutls_e_interrupted, Qgnutls_e_again)
+        (Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake)
+        (gnutls_global_initialized, Qgnutls_bootprop_priority)
+        (Qgnutls_bootprop_trustfiles, Qgnutls_bootprop_keyfiles)
+        (Qgnutls_bootprop_callbacks, Qgnutls_bootprop_loglevel)
+        (Qgnutls_bootprop_hostname, Qgnutls_bootprop_verify_flags)
+        (Qgnutls_bootprop_verify_error, Qgnutls_bootprop_verify_hostname_error)
+        (Qgnutls_bootprop_callbacks_verify): Make static.
+2011-05-01  Andreas Schwab  <schwab@linux-m68k.org>
+        * callproc.c: Indentation fixup.
+        * sysdep.c (wait_for_termination_1): Make static.
+        (wait_for_termination, interruptible_wait_for_termination): Move
+        after wait_for_termination_1.
+2011-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * sysdep.c (interruptible_wait_for_termination): New function
+        which is like wait_for_termination, but allows keyboard
+        interruptions.
+        * callproc.c (Fcall_process): Add (:file "file") as an option for
+        the STDOUT buffer.
+        (Fcall_process_region): Ditto.
 2011-04-30  Eli Zaretskii  <eliz@gnu.org>
        * dosfns.c (Fint86, Fdos_memget, Fdos_memput): Use `ASIZE (FOO)'
diff --git a/src/callproc.c b/src/callproc.c
index 3726eb3cc7f..4a29e95b356 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1,6 +1,6 @@
 /* Synchronous subprocess invocation for GNU Emacs.
   Copyright (C) 1985-1988, 1993-1995, 1999-2011
-                 Free Software Foundation, Inc.
+                 Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -156,8 +156,9 @@ DEFUN ("call-process", Fcall_process, Scall_process, 1, MANY, 0,
       doc: /* Call PROGRAM synchronously in separate process.
 The remaining arguments are optional.
 The program's input comes from file INFILE (nil means `/dev/null').
-Insert output in BUFFER before point; t means current buffer;
+Insert output in BUFFER before point; t means current buffer; nil for BUFFER
- nil for BUFFER means discard it; 0 means discard and don't wait.
+ means discard it; 0 means discard and don't wait; and `(:file FILE)', where
+ FILE is a file name string, means that it should be written to that file.
 BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
 REAL-BUFFER says what to do with standard output, as above,
 while STDERR-FILE says what to do with standard error in the child.
@@ -196,14 +197,17 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
  /* File to use for stderr in the child.
     t means use same as standard output.  */
  Lisp_Object error_file;
+  Lisp_Object output_file = Qnil;
 #ifdef MSDOS    /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */
  char *outf, *tempfile;
  int outfilefd;
 #endif
+  int fd_output = -1;
  struct coding_system process_coding; /* coding-system of process output */
  struct coding_system argument_coding; /* coding-system of arguments */
  /* Set to the return value of Ffind_operation_coding_system.  */
  Lisp_Object coding_systems;
+  int output_to_buffer = 1;
  /* Qt denotes that Ffind_operation_coding_system is not yet called.  */
  coding_systems = Qt;
@@ -273,9 +277,12 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
    {
      buffer = args[2];
-      /* If BUFFER is a list, its meaning is
+      /* If BUFFER is a list, its meaning is (BUFFER-FOR-STDOUT
-         (BUFFER-FOR-STDOUT FILE-FOR-STDERR).  */
+         FILE-FOR-STDERR), unless the first element is :file, in which case see
-      if (CONSP (buffer))
+         the next paragraph. */
+      if (CONSP (buffer)
+          && (! SYMBOLP (XCAR (buffer))
+              || strcmp (SSDATA (SYMBOL_NAME (XCAR (buffer))), ":file")))
        {
          if (CONSP (XCDR (buffer)))
            {
@@ -291,6 +298,17 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
          buffer = XCAR (buffer);
        }
+      /* If the buffer is (still) a list, it might be a (:file "file") spec. */
+      if (CONSP (buffer)
+          && SYMBOLP (XCAR (buffer))
+          && ! strcmp (SSDATA (SYMBOL_NAME (XCAR (buffer))), ":file"))
+        {
+          output_file = Fexpand_file_name (XCAR (XCDR (buffer)),
+                                           BVAR (current_buffer, directory));
+          CHECK_STRING (output_file);
+          buffer = Qnil;
+        }
      if (!(EQ (buffer, Qnil)
            || EQ (buffer, Qt)
            || INTEGERP (buffer)))
@@ -318,11 +336,11 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     protected by the caller, so all we really have to worry about is
     buffer.  */
  {
-    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
+    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
    current_dir = BVAR (current_buffer, directory);
-    GCPRO4 (infile, buffer, current_dir, error_file);
+    GCPRO5 (infile, buffer, current_dir, error_file, output_file);
    current_dir = Funhandled_file_name_directory (current_dir);
    if (NILP (current_dir))
@@ -342,6 +360,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
      current_dir = ENCODE_FILE (current_dir);
    if (STRINGP (error_file) && STRING_MULTIBYTE (error_file))
      error_file = ENCODE_FILE (error_file);
+    if (STRINGP (output_file) && STRING_MULTIBYTE (output_file))
+      output_file = ENCODE_FILE (output_file);
    UNGCPRO;
  }
@@ -353,6 +373,26 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
      infile = DECODE_FILE (infile);
      report_file_error ("Opening process input file", Fcons (infile, Qnil));
    }
+  if (STRINGP (output_file))
+    {
+#ifdef DOS_NT
+      fd_output = emacs_open (SSDATA (output_file),
+                              O_WRONLY | O_TRUNC | O_CREAT | O_TEXT,
+                              S_IREAD | S_IWRITE);
+#else  /* not DOS_NT */
+      fd_output = creat (SSDATA (output_file), 0666);
+#endif /* not DOS_NT */
+      if (fd_output < 0)
+        {
+          output_file = DECODE_FILE (output_file);
+          report_file_error ("Opening process output file",
+                             Fcons (output_file, Qnil));
+        }
+      if (STRINGP (error_file) || NILP (error_file))
+        output_to_buffer = 0;
+    }
  /* Search for program; barf if not found.  */
  {
    struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
@@ -413,13 +453,18 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
  strcat (tempfile, "detmp.XXX");
  mktemp (tempfile);
-  outfilefd = creat (tempfile, S_IREAD | S_IWRITE);
+  /* If we're redirecting STDOUT to a file, this is already opened. */
-  if (outfilefd < 0)
+  if (fd_output < 0)
    {
-      emacs_close (filefd);
+      outfilefd = creat (tempfile, S_IREAD | S_IWRITE);
-      report_file_error ("Opening process output file",
+      if (outfilefd < 0) {
-                         Fcons (build_string (tempfile), Qnil));
+        emacs_close (filefd);
+        report_file_error ("Opening process output file",
+                           Fcons (build_string (tempfile), Qnil));
+      }
    }
+  else
+    outfilefd = fd_output;
  fd[0] = filefd;
  fd[1] = outfilefd;
 #endif /* MSDOS */
@@ -450,6 +495,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
    struct sigaction sigpipe_action;
 #endif
+    if (fd_output >= 0)
+      fd1 = fd_output;
 #if 0  /* Some systems don't have sigblock.  */
    mask = sigblock (sigmask (SIGCHLD));
 #endif
@@ -552,12 +599,12 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
        if (fd[0] >= 0)
          emacs_close (fd[0]);
 #ifdef HAVE_SETSID
-        setsid ();
+        setsid ();
 #endif
 #if defined (USG)
-        setpgrp ();
+        setpgrp ();
 #else
-        setpgrp (pid, pid);
+        setpgrp (pid, pid);
 #endif /* USG */
        /* GConf causes us to ignore SIGPIPE, make sure it is restored
@@ -591,6 +638,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
    /* Close most of our fd's, but not fd[0]
       since we will use that to read input from.  */
    emacs_close (filefd);
+    if (fd_output >= 0)
+      emacs_close (fd_output);
    if (fd1 >= 0 && fd1 != fd_error)
      emacs_close (fd1);
  }
@@ -673,136 +722,140 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
  immediate_quit = 1;
  QUIT;
-  {
+  if (output_to_buffer)
-    register EMACS_INT nread;
+    {
-    int first = 1;
+      register EMACS_INT nread;
-    EMACS_INT total_read = 0;
+      int first = 1;
-    int carryover = 0;
+      EMACS_INT total_read = 0;
-    int display_p = display_p_volatile;
+      int carryover = 0;
-    int display_on_the_fly = display_p;
+      int display_p = display_p_volatile;
-    struct coding_system saved_coding;
+      int display_on_the_fly = display_p;
+      struct coding_system saved_coding;
-    saved_coding = process_coding;
-    while (1)
+      saved_coding = process_coding;
-      {
+      while (1)
-        /* Repeatedly read until we've filled as much as possible
+        {
-           of the buffer size we have.  But don't read
+          /* Repeatedly read until we've filled as much as possible
-           less than 1024--save that for the next bufferful.  */
+             of the buffer size we have.  But don't read
-        nread = carryover;
+             less than 1024--save that for the next bufferful.  */
-        while (nread < bufsize - 1024)
+          nread = carryover;
-          {
+          while (nread < bufsize - 1024)
-            int this_read = emacs_read (fd[0], buf + nread,
+            {
-                                        bufsize - nread);
+              int this_read = emacs_read (fd[0], buf + nread,
+                                          bufsize - nread);
-            if (this_read < 0)
+              if (this_read < 0)
-              goto give_up;
+                goto give_up;
-            if (this_read == 0)
+              if (this_read == 0)
-              {
+                {
-                process_coding.mode |= CODING_MODE_LAST_BLOCK;
+                  process_coding.mode |= CODING_MODE_LAST_BLOCK;
-                break;
+                  break;
-              }
+                }
-            nread += this_read;
+              nread += this_read;
-            total_read += this_read;
+              total_read += this_read;
-            if (display_on_the_fly)
+              if (display_on_the_fly)
-              break;
+                break;
-          }
+            }
-        /* Now NREAD is the total amount of data in the buffer.  */
+          /* Now NREAD is the total amount of data in the buffer.  */
-        immediate_quit = 0;
+          immediate_quit = 0;
-        if (!NILP (buffer))
+          if (!NILP (buffer))
-          {
+            {
-            if (NILP (BVAR (current_buffer, enable_multibyte_characters))
+              if (NILP (BVAR (current_buffer, enable_multibyte_characters))
-                && ! CODING_MAY_REQUIRE_DECODING (&process_coding))
+                  && ! CODING_MAY_REQUIRE_DECODING (&process_coding))
-              insert_1_both (buf, nread, nread, 0, 1, 0);
+                insert_1_both (buf, nread, nread, 0, 1, 0);
-            else
+              else
-              {                 /* We have to decode the input.  */
+                {                       /* We have to decode the input.  */
-                Lisp_Object curbuf;
+                  Lisp_Object curbuf;
-                int count1 = SPECPDL_INDEX ();
+                  int count1 = SPECPDL_INDEX ();
-                XSETBUFFER (curbuf, current_buffer);
+                  XSETBUFFER (curbuf, current_buffer);
-                /* We cannot allow after-change-functions be run
+                  /* We cannot allow after-change-functions be run
-                   during decoding, because that might modify the
+                     during decoding, because that might modify the
-                   buffer, while we rely on process_coding.produced to
+                     buffer, while we rely on process_coding.produced to
-                   faithfully reflect inserted text until we
+                     faithfully reflect inserted text until we
-                   TEMP_SET_PT_BOTH below.  */
+                     TEMP_SET_PT_BOTH below.  */
-                specbind (Qinhibit_modification_hooks, Qt);
+                  specbind (Qinhibit_modification_hooks, Qt);
-                decode_coding_c_string (&process_coding, (unsigned char *) buf,
+                  decode_coding_c_string (&process_coding,
-                                        nread, curbuf);
+                                          (unsigned char *) buf, nread, curbuf);
-                unbind_to (count1, Qnil);
+                  unbind_to (count1, Qnil);
-                if (display_on_the_fly
+                  if (display_on_the_fly
-                    && CODING_REQUIRE_DETECTION (&saved_coding)
+                      && CODING_REQUIRE_DETECTION (&saved_coding)
-                    && ! CODING_REQUIRE_DETECTION (&process_coding))
+                      && ! CODING_REQUIRE_DETECTION (&process_coding))
-                  {
+                    {
-                    /* We have detected some coding system.  But,
+                      /* We have detected some coding system.  But,
-                       there's a possibility that the detection was
+                         there's a possibility that the detection was
-                       done by insufficient data.  So, we give up
+                         done by insufficient data.  So, we give up
-                       displaying on the fly.  */
+                         displaying on the fly.  */
-                    if (process_coding.produced > 0)
+                      if (process_coding.produced > 0)
-                      del_range_2 (process_coding.dst_pos,
+                        del_range_2 (process_coding.dst_pos,
-                                   process_coding.dst_pos_byte,
+                                     process_coding.dst_pos_byte,
-                                   process_coding.dst_pos
+                                     process_coding.dst_pos
-                                   + process_coding.produced_char,
+                                     + process_coding.produced_char,
-                                   process_coding.dst_pos_byte
+                                     process_coding.dst_pos_byte
-                                   + process_coding.produced, 0);
+                                     + process_coding.produced, 0);
-                    display_on_the_fly = 0;
+                      display_on_the_fly = 0;
-                    process_coding = saved_coding;
+                      process_coding = saved_coding;
-                    carryover = nread;
+                      carryover = nread;
-                    /* This is to make the above condition always
+                      /* This is to make the above condition always
-                       fails in the future.  */
+                         fails in the future.  */
-                    saved_coding.common_flags
+                      saved_coding.common_flags
-                      &= ~CODING_REQUIRE_DETECTION_MASK;
+                        &= ~CODING_REQUIRE_DETECTION_MASK;
-                    continue;
+                      continue;
-                  }
+                    }
-                TEMP_SET_PT_BOTH (PT + process_coding.produced_char,
+                  TEMP_SET_PT_BOTH (PT + process_coding.produced_char,
-                                  PT_BYTE + process_coding.produced);
+                                    PT_BYTE + process_coding.produced);
-                carryover = process_coding.carryover_bytes;
+                  carryover = process_coding.carryover_bytes;
-                if (carryover > 0)
+                  if (carryover > 0)
-                  memcpy (buf, process_coding.carryover,
+                    memcpy (buf, process_coding.carryover,
-                          process_coding.carryover_bytes);
+                            process_coding.carryover_bytes);
-              }
+                }
-          }
+            }
-        if (process_coding.mode & CODING_MODE_LAST_BLOCK)
+          if (process_coding.mode & CODING_MODE_LAST_BLOCK)
-          break;
+            break;
-        /* Make the buffer bigger as we continue to read more data,
+          /* Make the buffer bigger as we continue to read more data,
-           but not past CALLPROC_BUFFER_SIZE_MAX.  */
+             but not past CALLPROC_BUFFER_SIZE_MAX.  */
-        if (bufsize < CALLPROC_BUFFER_SIZE_MAX && total_read > 32 * bufsize)
+          if (bufsize < CALLPROC_BUFFER_SIZE_MAX && total_read > 32 * bufsize)
-          if ((bufsize *= 2) > CALLPROC_BUFFER_SIZE_MAX)
+            if ((bufsize *= 2) > CALLPROC_BUFFER_SIZE_MAX)
-            bufsize = CALLPROC_BUFFER_SIZE_MAX;
+              bufsize = CALLPROC_BUFFER_SIZE_MAX;
-        if (display_p)
+          if (display_p)
-          {
+            {
-            if (first)
+              if (first)
-              prepare_menu_bars ();
+                prepare_menu_bars ();
-            first = 0;
+              first = 0;
-            redisplay_preserve_echo_area (1);
+              redisplay_preserve_echo_area (1);
-            /* This variable might have been set to 0 for code
+              /* This variable might have been set to 0 for code
-               detection.  In that case, we set it back to 1 because
+                 detection.  In that case, we set it back to 1 because
-               we should have already detected a coding system.  */
+                 we should have already detected a coding system.  */
-            display_on_the_fly = 1;
+              display_on_the_fly = 1;
-          }
+            }
-        immediate_quit = 1;
+          immediate_quit = 1;
-        QUIT;
+          QUIT;
-      }
+        }
-  give_up: ;
+    give_up: ;
-    Vlast_coding_system_used = CODING_ID_NAME (process_coding.id);
+      Vlast_coding_system_used = CODING_ID_NAME (process_coding.id);
-    /* If the caller required, let the buffer inherit the
+      /* If the caller required, let the buffer inherit the
-       coding-system used to decode the process output.  */
+         coding-system used to decode the process output.  */
-    if (inherit_process_coding_system)
+      if (inherit_process_coding_system)
-      call1 (intern ("after-insert-file-set-buffer-file-coding-system"),
+        call1 (intern ("after-insert-file-set-buffer-file-coding-system"),
-             make_number (total_read));
+               make_number (total_read));
-  }
+    }
 #ifndef MSDOS
  /* Wait for it to terminate, unless it already has.  */
-  wait_for_termination (pid);
+  if (output_to_buffer)
+    wait_for_termination (pid);
+  else
+    interruptible_wait_for_termination (pid);
 #endif
  immediate_quit = 0;
@@ -822,7 +875,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
      signame = strsignal (synch_process_termsig);
      if (signame == 0)
-        signame = "unknown";
+        signame = "unknown";
      synch_process_death = signame;
    }
@@ -850,8 +903,10 @@ DEFUN ("call-process-region", Fcall_process_region, Scall_process_region,
 The remaining arguments are optional.
 Delete the text if fourth arg DELETE is non-nil.
-Insert output in BUFFER before point; t means current buffer;
+Insert output in BUFFER before point; t means current buffer; nil for
- nil for BUFFER means discard it; 0 means discard and don't wait.
+ BUFFER means discard it; 0 means discard and don't wait; and `(:file
+ FILE)', where FILE is a file name string, means that it should be
+ written to that file.
 BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
 REAL-BUFFER says what to do with standard output, as above,
 while STDERR-FILE says what to do with standard error in the child.
@@ -1003,18 +1058,18 @@ add_env (char **env, char **new_env, char *string)
    {
      char *p = *ep, *q = string;
      while (ok)
-        {
+        {
-          if (*q != *p)
+          if (*q != *p)
-            break;
+            break;
-          if (*q == 0)
+          if (*q == 0)
-            /* The string is a lone variable name; keep it for now, we
+            /* The string is a lone variable name; keep it for now, we
-               will remove it later.  It is a placeholder for a
+               will remove it later.  It is a placeholder for a
-               variable that is not to be included in the environment.  */
+               variable that is not to be included in the environment.  */
-            break;
+            break;
-          if (*q == '=')
+          if (*q == '=')
-            ok = 0;
+            ok = 0;
-          p++, q++;
+          p++, q++;
-        }
+        }
    }
  if (ok)
    *new_env++ = string;
@@ -1118,8 +1173,8 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L
    new_length = 0;
    for (tem = Vprocess_environment;
-         CONSP (tem) && STRINGP (XCAR (tem));
+         CONSP (tem) && STRINGP (XCAR (tem));
-         tem = XCDR (tem))
+         tem = XCDR (tem))
      {
        if (strncmp (SSDATA (XCAR (tem)), "DISPLAY", 7) == 0
            && (SDATA (XCAR (tem)) [7] == '\0'
@@ -1172,11 +1227,11 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L
    p = q = env;
    while (*p != 0)
      {
-        while (*q != 0 && strchr (*q, '=') == NULL)
+        while (*q != 0 && strchr (*q, '=') == NULL)
-          q++;
+          q++;
-        *p = *q++;
+        *p = *q++;
-        if (*p != 0)
+        if (*p != 0)
-          p++;
+          p++;
      }
  }
diff --git a/src/gnutls.c b/src/gnutls.c
index 16a459bd62f..8e41be20505 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -34,26 +34,26 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 static int
 emacs_gnutls_handle_error (gnutls_session_t, int err);
-Lisp_Object Qgnutls_log_level;
+static Lisp_Object Qgnutls_log_level;
-Lisp_Object Qgnutls_code;
+static Lisp_Object Qgnutls_code;
-Lisp_Object Qgnutls_anon, Qgnutls_x509pki;
+static Lisp_Object Qgnutls_anon, Qgnutls_x509pki;
-Lisp_Object Qgnutls_e_interrupted, Qgnutls_e_again,
+static Lisp_Object Qgnutls_e_interrupted, Qgnutls_e_again,
  Qgnutls_e_invalid_session, Qgnutls_e_not_ready_for_handshake;
-int gnutls_global_initialized;
+static int gnutls_global_initialized;
 /* The following are for the property list of `gnutls-boot'.  */
-Lisp_Object Qgnutls_bootprop_priority;
+static Lisp_Object Qgnutls_bootprop_priority;
-Lisp_Object Qgnutls_bootprop_trustfiles;
+static Lisp_Object Qgnutls_bootprop_trustfiles;
-Lisp_Object Qgnutls_bootprop_keyfiles;
+static Lisp_Object Qgnutls_bootprop_keyfiles;
-Lisp_Object Qgnutls_bootprop_callbacks;
+static Lisp_Object Qgnutls_bootprop_callbacks;
-Lisp_Object Qgnutls_bootprop_loglevel;
+static Lisp_Object Qgnutls_bootprop_loglevel;
-Lisp_Object Qgnutls_bootprop_hostname;
+static Lisp_Object Qgnutls_bootprop_hostname;
-Lisp_Object Qgnutls_bootprop_verify_flags;
+static Lisp_Object Qgnutls_bootprop_verify_flags;
-Lisp_Object Qgnutls_bootprop_verify_error;
+static Lisp_Object Qgnutls_bootprop_verify_error;
-Lisp_Object Qgnutls_bootprop_verify_hostname_error;
+static Lisp_Object Qgnutls_bootprop_verify_hostname_error;
 /* Callback keys for `gnutls-boot'.  Unused currently.  */
-Lisp_Object Qgnutls_bootprop_callbacks_verify;
+static Lisp_Object Qgnutls_bootprop_callbacks_verify;
 static void
 gnutls_log_function (int level, const char* string)
@@ -490,7 +490,7 @@ one trustfile (usually a CA bundle).  */)
  /* callbacks          = Fplist_get (proplist, Qgnutls_bootprop_callbacks); */
  loglevel              = Fplist_get (proplist, Qgnutls_bootprop_loglevel);
  verify_flags          = Fplist_get (proplist, Qgnutls_bootprop_verify_flags);
-  /* verify_error    = Fplist_get (proplist, Qgnutls_bootprop_verify_error); */
+  /* verify_error       = Fplist_get (proplist, Qgnutls_bootprop_verify_error); */
  verify_hostname_error = Fplist_get (proplist, Qgnutls_bootprop_verify_hostname_error);
  if (!STRINGP (hostname))
@@ -918,4 +918,5 @@ syms_of_gnutls (void)
  defsubr (&Sgnutls_deinit);
  defsubr (&Sgnutls_bye);
 }
-#endif
+#endif /* HAVE_GNUTLS */
diff --git a/src/lisp.h b/src/lisp.h
index 76938a49ac4..bb3a8cc393c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3349,6 +3349,7 @@ extern void reset_sys_modes (struct tty_display_info *);
 extern void init_all_sys_modes (void);
 extern void reset_all_sys_modes (void);
 extern void wait_for_termination (int);
+extern void interruptible_wait_for_termination (int);
 extern void flush_pending_output (int);
 extern void child_setup_tty (int);
 extern void setup_pty (int);
diff --git a/src/sysdep.c b/src/sysdep.c
index 43f50cdb0a9..5ad3389dd8f 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -296,11 +296,9 @@ init_baud_rate (int fd)
 int wait_debugging EXTERNALLY_VISIBLE;
 #ifndef MSDOS
-/* Wait for subprocess with process id `pid' to terminate and
-   make sure it will get eliminated (not remain forever as a zombie) */
-void
+static void
-wait_for_termination (int pid)
+wait_for_termination_1 (int pid, int interruptible)
 {
  while (1)
    {
@@ -339,9 +337,27 @@ wait_for_termination (int pid)
      sigsuspend (&empty_mask);
 #endif /* not WINDOWSNT */
 #endif /* not BSD_SYSTEM, and not HPUX version >= 6 */
+      if (interruptible)
+        QUIT;
    }
 }
+/* Wait for subprocess with process id `pid' to terminate and
+   make sure it will get eliminated (not remain forever as a zombie) */
+void
+wait_for_termination (int pid)
+{
+  wait_for_termination_1 (pid, 0);
+}
+/* Like the above, but allow keyboard interruption. */
+void
+interruptible_wait_for_termination (int pid)
+{
+  wait_for_termination_1 (pid, 1);
+}
 /*
 *      flush any pending output
 *      (may flush input as well; it does not matter the way we use it)
@@ -1109,8 +1125,7 @@ tabs_safe_p (int fd)
 void
 get_tty_size (int fd, int *widthp, int *heightp)
 {
+#if defined TIOCGWINSZ
-#ifdef TIOCGWINSZ
  /* BSD-style.  */
  struct winsize size;
@@ -1123,8 +1138,7 @@ get_tty_size (int fd, int *widthp, int *heightp)
      *heightp = size.ws_row;
    }
-#else
+#elif defined TIOCGSIZE
-#ifdef TIOCGSIZE
  /* SunOS - style.  */
  struct ttysize size;
@@ -1137,16 +1151,28 @@ get_tty_size (int fd, int *widthp, int *heightp)
      *heightp = size.ts_lines;
    }
-#else
+#elif defined WINDOWSNT
-#ifdef MSDOS
+  CONSOLE_SCREEN_BUFFER_INFO info;
+  if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info))
+    {
+      *widthp = info.srWindow.Right - info.srWindow.Left + 1;
+      *heightp = info.srWindow.Bottom - info.srWindow.Top + 1;
+    }
+  else
+    *widthp = *heightp = 0;
+#elif defined MSDOS
  *widthp = ScreenCols ();
  *heightp = ScreenRows ();
 #else /* system doesn't know size */
  *widthp = 0;
  *heightp = 0;
 #endif
-#endif /* not SunOS-style */
-#endif /* not BSD-style */
 }
 /* Set the logical window size associated with descriptor FD