upstream

21 files changed, 336 insertions, 89 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fdf25af86ee..0a65a759b7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,51 @@
+2012-02-07  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-engine.el (c-forward-objc-directive): Prevent
+        looping in "#pragma mark @implementation".
+
+2012-02-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        * notifications.el (notifications-on-closed-signal): Make `reason'
+        optional.  (Bug#10744)
+
+2012-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode):
+        Doc fixes for the macro and the mode it defines.
+
+        * image.el (imagemagick-types-inhibit): Doc fix.
+
+        * cus-start.el (imagemagick-render-type): Add it.
+
+2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * progmodes/cc-mode.el
+        (c-standard-font-lock-fontify-region-function): Set the default at
+        load time, too, so that `font-lock-fontify-buffer' can be called
+        without setting up the entire mode first.  This fixes a bug in
+        `mm-inline-text' with C MIME parts.
+
+2012-02-06  Chong Yidong  <cyd@gnu.org>
+
+        * simple.el (list-processes--refresh): Delete exited processes
+        (Bug#8094).
+
+        * comint.el (comint-next-prompt): next-single-char-property-change
+        and prev-single-char-property-change never return nil (Bug#8657).
+
+        * custom.el (defcustom): Doc fix (Bug#9711).
+
+2012-02-05  Chong Yidong  <cyd@gnu.org>
+
+        * cus-edit.el (custom-variable-reset-backup): Quote the value
+        before storing it in the customized-value property (Bug#6712).
+        (custom-display): Add a customization type tag.
+        (custom-buffer-create-internal): Improve tooltip message.
+
+        * wid-edit.el (widget-field-value-get): New optional arg to
+        suppress trailing whitespace truncation.
+        (character): Use it (Bug#2689).
+
 2012-02-05  Andreas Schwab  <schwab@linux-m68k.org>
 
         * progmodes/gud.el (gud-pv): Use pv instead of pv1.
@@ -5,6 +53,9 @@
 
 2012-02-05  Chong Yidong  <cyd@gnu.org>
 
+        * cus-edit.el (custom-variable-value-create): For mismatched
+        types, show the current value (Bug#7600).
+
         * custom.el (defcustom): Doc fix.
 
 2012-02-05  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/comint.el b/lisp/comint.el
index 2d0ae6920f9..975291471df 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2513,7 +2513,7 @@ text matching `comint-prompt-regexp'."
               (if (> n 0)
                   (next-single-char-property-change pos 'field)
                 (previous-single-char-property-change pos 'field)))
-        (cond ((or (null pos) (= pos prev-pos))
+        (cond ((= pos prev-pos)
                ;; Ran off the end of the buffer.
                (when (> n 0)
                  ;; There's always an input field at the end of the
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 0d7b0733b64..4ed72be06fb 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1624,7 +1624,9 @@ Otherwise use brackets."
     ;; Insert the search field.
     (when custom-search-field
       (widget-insert "\n")
-      (let* ((echo "Search for custom items")
+      (let* ((echo "Search for custom items.
+You can enter one or more words separated by spaces,
+or a regular expression.")
              (search-widget
               (widget-create
                'editable-field
@@ -2599,7 +2601,6 @@ try matching its doc string against `custom-guess-doc-alist'."
                   :parent widget)
                  buttons))
           ((memq form '(lisp mismatch))
-           ;; In lisp mode edit the saved value when possible.
            (push (widget-create-child-and-convert
                   widget 'custom-visibility
                   :help-echo "Hide the value of this option."
@@ -2611,11 +2612,10 @@ try matching its doc string against `custom-guess-doc-alist'."
                   t)
                  buttons)
            (insert " ")
-           (let* ((value (cond ((get symbol 'saved-value)
-                                (car (get symbol 'saved-value)))
-                               ((get symbol 'standard-value)
-                                (car (get symbol 'standard-value)))
-                               ((default-boundp symbol)
+           ;; This used to try presenting the saved value or the
+           ;; standard value, but it seems more intuitive to present
+           ;; the current value (Bug#7600).
+           (let* ((value (cond ((default-boundp symbol)
                                 (custom-quote (funcall get symbol)))
                                (t
                                 (custom-quote (widget-get conv :value))))))
@@ -3073,7 +3073,7 @@ to switch between two values."
               (funcall set symbol (car value))
              (error nil)))
       (error "No backup value for %s" symbol))
-    (put symbol 'customized-value (list (car value)))
+    (put symbol 'customized-value (list (custom-quote (car value))))
     (put symbol 'variable-comment comment)
     (put symbol 'customized-variable-comment comment)
     (custom-variable-state-set widget)
@@ -3251,6 +3251,7 @@ Also change :reverse-video to :inverse-video."
   :args '((const :tag "all" t)
           (const :tag "defaults" default)
           (checklist
+           :tag "specific display"
            :offset 0
            :extra-offset 9
            :args ((group :sibling-args (:help-echo "\
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2cee72d717e..a5032cf99e7 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -237,6 +237,8 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             :set custom-set-minor-mode)
              ;; fringe.c
              (overflow-newline-into-fringe fringe boolean)
+             ;; image.c
+             (imagemagick-render-type image integer "24.1")
              ;; indent.c
              (indent-tabs-mode indent boolean)
              ;; keyboard.c
@@ -504,6 +506,8 @@ since it could result in memory overflow and make Emacs crash."
                        (fboundp 'x-selection-exists-p))
                       ((string-match "fringe" (symbol-name symbol))
                        (fboundp 'define-fringe-bitmap))
+                      ((string-match "\\`imagemagick" (symbol-name symbol))
+                       (fboundp 'imagemagick-types))
                       ((equal "font-use-system-font" (symbol-name symbol))
                        (featurep 'system-font-setting))
                       ;; Conditioned on x-create-frame, because that's
diff --git a/lisp/custom.el b/lisp/custom.el
index 962336978b1..2d880d23955 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -198,12 +198,16 @@ set to nil, as the value is no longer rogue."
   (run-hooks 'custom-define-hook)
   symbol)
 
-(defmacro defcustom (symbol value doc &rest args)
-  "Declare SYMBOL as a customizable variable that defaults to VALUE.
+(defmacro defcustom (symbol standard doc &rest args)
+  "Declare SYMBOL as a customizable variable.
+SYMBOL is the variable name; it should not be quoted.
+STANDARD is an expression specifying the variable's standard
+value.  It should not be quoted.  It is evaluated once by
+`defcustom', and the value is assigned to SYMBOL if the variable
+is unbound.  The expression itself is also stored, so that
+Customize can re-evaluate it later to get the standard value.
 DOC is the variable documentation.
 
-Neither SYMBOL nor VALUE need to be quoted.
-If SYMBOL is not already bound, initialize it to VALUE.
 The remaining arguments should have the form
 
    [KEYWORD VALUE]...
@@ -320,14 +324,15 @@ for more information."
   `(custom-declare-variable
     ',symbol
     ,(if lexical-binding    ;FIXME: This is not reliable, but is all we have.
-         ;; The `default' arg should be an expression that evaluates to
-         ;; the value to use.  The use of `eval' for it is spread over
-         ;; many different places and hence difficult to eliminate, yet
-         ;; we want to make sure that the `value' expression is checked by the
-         ;; byte-compiler, and that lexical-binding is obeyed, so quote the
-         ;; expression with `lambda' rather than with `quote'.
-         `(list (lambda () ,value))
-       `',value)
+         ;; The STANDARD arg should be an expression that evaluates to
+         ;; the standard value.  The use of `eval' for it is spread
+         ;; over many different places and hence difficult to
+         ;; eliminate, yet we want to make sure that the `standard'
+         ;; expression is checked by the byte-compiler, and that
+         ;; lexical-binding is obeyed, so quote the expression with
+         ;; `lambda' rather than with `quote'.
+         `(list (lambda () ,standard))
+       `',standard)
     ,doc
     ,@args))
 
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index d871f6f1212..dbacba6cd29 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -90,6 +90,14 @@ This defines the toggle command MODE and (by default) a control variable
 MODE (you can override this with the :variable keyword, see below).
 DOC is the documentation for the mode toggle command.
 
+The defined mode command takes one optional (prefix) argument.
+Interactively with no prefix argument it toggles the mode.
+With a prefix argument, it enables the mode if the argument is
+positive and otherwise disables it.  When called from Lisp, it
+enables the mode if the argument is omitted or nil, and toggles
+the mode if the argument is `toggle'.  If DOC is nil this
+function adds a basic doc-string stating these facts.
+
 Optional INIT-VALUE is the initial value of the mode's variable.
 Optional LIGHTER is displayed in the modeline when the mode is on.
 Optional KEYMAP is the default keymap bound to the mode keymap.
@@ -242,7 +250,7 @@ or call the function `%s'."))))
               (format (concat "Toggle %s on or off.
 With a prefix argument ARG, enable %s if ARG is
 positive, and disable it otherwise.  If called from Lisp, enable
-the mode if ARG is omitted or nil.
+the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
 \\{%s}") pretty-name pretty-name keymap-sym))
          ;; Use `toggle' rather than (if ,mode 0 1) so that using
          ;; repeat-command still does the toggling correctly.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 740a2340243..7c83b9d99de 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,43 @@
+2012-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-summary-show-thread): Revert last two changes.
+
+2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-transform-headers): Remove unused variable.
+        (nnimap-transform-headers): Fix parsing BODYSTRUCTURE elements that
+        have newlines within the strings, and where the UID comes after the
+        BODYSTRUCTURE element (bug#10537).
+
+        * shr-color.el (shr-color-set-minimum-interval): Renamed to add prefix
+        (bug#10732).
+
+        * shr.el (shr-insert-document): Add doc string.
+        (shr-visit-file): Ditto.
+        (shr-remove-trailing-whitespace): New function.
+        (shr-insert-document): Use it to clean up trailing whitespace as the
+        final step (bug#10714).
+
+2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-summary-exit-no-update): Really deaden the summary
+        buffer if `gnus-kill-summary-on-exit' is nil.
+
+2012-02-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-summary-show-thread):
+        next-single-char-property-change may return nil in XEmacs.
+
+2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-handle-ephemeral-exit): Allow exiting from Gnus
+        when just reading a single group from "without" Gnus.
+
+2012-02-06  Chong Yidong  <cyd@gnu.org>
+
+        * gnus-sum.el (gnus-summary-show-thread):
+        next-single-char-property-change never returns nil (Bug#8657).
+
 2012-02-05  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * nnimap.el (nnimap-open-server): Allow switching the nnoo server
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index d0a582e2712..296f25a09f9 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7328,9 +7328,11 @@ If FORCE (the prefix), also save the .newsrc file(s)."
         (gnus-kill-buffer gnus-original-article-buffer)
         (setq gnus-article-current nil))
       ;; Return to the group buffer.
-      (gnus-configure-windows 'group 'force)
       (if (not gnus-kill-summary-on-exit)
-          (gnus-deaden-summary)
+          (progn
+            (gnus-deaden-summary)
+            (gnus-configure-windows 'group 'force))
+        (gnus-configure-windows 'group 'force)
         (gnus-close-group group)
         (gnus-kill-buffer gnus-summary-buffer))
       (unless gnus-single-article-buffer
@@ -7352,7 +7354,7 @@ If FORCE (the prefix), also save the .newsrc file(s)."
 (defun gnus-handle-ephemeral-exit (quit-config)
   "Handle movement when leaving an ephemeral group.
 The state which existed when entering the ephemeral is reset."
-  (if (not (buffer-name (car quit-config)))
+  (if (not (buffer-live-p (car quit-config)))
       (gnus-configure-windows 'group 'force)
     (set-buffer (car quit-config))
     (unless (eq (cdr quit-config) 'group)
@@ -11579,6 +11581,7 @@ Returns nil if no thread was there to be shown."
          (beg (progn (beginning-of-line) (if (bobp) (point) (1- (point)))))
          (eoi (when end
                 (if (fboundp 'next-single-char-property-change)
+                    ;; Note: XEmacs version of n-s-c-p-c may return nil
                     (or (next-single-char-property-change end 'invisible)
                         (point-max))
                   (while (progn
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 09cf554312b..4c75f721ff6 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -189,25 +189,32 @@ textual parts.")
 
 (defun nnimap-transform-headers ()
   (goto-char (point-min))
-  (let (article bytes lines size string)
+  (let (article lines size string)
     (block nil
       (while (not (eobp))
-        (while (not (looking-at "\\* [0-9]+ FETCH.+?UID \\([0-9]+\\)"))
+        (while (not (looking-at "\\* [0-9]+ FETCH"))
           (delete-region (point) (progn (forward-line 1) (point)))
           (when (eobp)
             (return)))
-        (setq article (match-string 1))
+        (goto-char (match-end 0))
         ;; Unfold quoted {number} strings.
-        (while (re-search-forward "[^]][ (]{\\([0-9]+\\)}\r?\n"
-                                  (1+ (line-end-position)) t)
+        (while (re-search-forward
+                "[^]][ (]{\\([0-9]+\\)}\r?\n"
+                (save-excursion
+                  (or (re-search-forward "\\* [0-9]+ FETCH" nil t)
+                      (point-max)))
+                t)
           (setq size (string-to-number (match-string 1)))
           (delete-region (+ (match-beginning 0) 2) (point))
           (setq string (buffer-substring (point) (+ (point) size)))
           (delete-region (point) (+ (point) size))
-          (insert (format "%S" string)))
-        (setq bytes (nnimap-get-length)
-              lines nil)
+          (insert (format "%S" (mm-subst-char-in-string ?\n ?\s string))))
         (beginning-of-line)
+        (setq article
+              (and (re-search-forward "UID \\([0-9]+\\)" (line-end-position)
+                                      t)
+                   (match-string 1)))
+        (setq lines nil)
         (setq size
               (and (re-search-forward "RFC822.SIZE \\([0-9]+\\)"
                                       (line-end-position)
diff --git a/lisp/gnus/shr-color.el b/lisp/gnus/shr-color.el
index e23ab57965e..7011034d242 100644
--- a/lisp/gnus/shr-color.el
+++ b/lisp/gnus/shr-color.el
@@ -267,7 +267,8 @@ Like rgb() or hsl()."
      (t
       nil))))
 
-(defun set-minimum-interval (val1 val2 min max interval &optional fixed)
+(defun shr-color-set-minimum-interval (val1 val2 min max interval
+                                            &optional fixed)
   "Set minimum interval between VAL1 and VAL2 to INTERVAL.
 The values are bound by MIN and MAX.
 If FIXED is t, then VAL1 will not be touched."
@@ -341,9 +342,9 @@ color will be adapted to be visible on BG."
                  (>= luminance-distance shr-color-visible-luminance-min))
             (list bg fg)
           ;; Not visible, try to change luminance to make them visible
-          (let ((Ls (set-minimum-interval (car bg-lab) (car fg-lab) 0 100
-                                          shr-color-visible-luminance-min
-                                          fixed-background)))
+          (let ((Ls (shr-color-set-minimum-interval
+                     (car bg-lab) (car fg-lab) 0 100
+                     shr-color-visible-luminance-min fixed-background)))
             (unless fixed-background
               (setcar bg-lab (car Ls)))
             (setcar fg-lab (cadr Ls))
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index acce7660263..deaef1d3f25 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -128,6 +128,7 @@ cid: URL as the argument.")
 ;; Public functions and commands.
 
 (defun shr-visit-file (file)
+  "Parse FILE as an HTML document, and render it in a new buffer."
   (interactive "fHTML file name: ")
   (pop-to-buffer "*html*")
   (erase-buffer)
@@ -139,12 +140,29 @@ cid: URL as the argument.")
 
 ;;;###autoload
 (defun shr-insert-document (dom)
+  "Render the parsed document DOM into the current buffer.
+DOM should be a parse tree as generated by
+`libxml-parse-html-region' or similar."
   (setq shr-content-cache nil)
-  (let ((shr-state nil)
+  (let ((start (point))
+        (shr-state nil)
         (shr-start nil)
         (shr-base nil)
         (shr-width (or shr-width (window-width))))
-    (shr-descend (shr-transform-dom dom))))
+    (shr-descend (shr-transform-dom dom))
+    (shr-remove-trailing-whitespace start (point))))
+
+(defun shr-remove-trailing-whitespace (start end)
+  (save-restriction
+    (narrow-to-region start end)
+    (delete-trailing-whitespace)
+    (goto-char start)
+    (while (not (eobp))
+      (end-of-line)
+      (dolist (overlay (overlays-at (point)))
+        (when (overlay-get overlay 'before-string)
+          (overlay-put overlay 'before-string nil)))
+      (forward-line 1))))
 
 (defun shr-copy-url ()
   "Copy the URL under point to the kill ring.
diff --git a/lisp/image.el b/lisp/image.el
index c4b51716dad..8c52db149a0 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -686,13 +686,16 @@ The minimum delay between successive frames is 0.01s."
   '(C HTML HTM TXT PDF)
   "ImageMagick types that Emacs should not use ImageMagick to handle.
 This should be a list of symbols, each of which has the same
-names as one of the format tags used internally by ImageMagick;
+name as one of the format tags used internally by ImageMagick;
 see `imagemagick-types'.  Entries in this list are excluded from
-being registered by `imagemagick-register-types'.
+being registered by `imagemagick-register-types', so if you change
+this variable you must do so before you call that function.
 
 If Emacs is compiled without ImageMagick, this variable has no effect."
   :type '(choice (const :tag "Let ImageMagick handle all types it can" nil)
                  (repeat symbol))
+  ;; Ideally, would have a :set function that checks if we already did
+  ;; imagemagick-register-types, and if so undoes it, then redoes it.
   :version "24.1"
   :group 'image)
 
diff --git a/lisp/notifications.el b/lisp/notifications.el
index c3b6c759506..9f7576b3f5d 100644
--- a/lisp/notifications.el
+++ b/lisp/notifications.el
@@ -107,9 +107,12 @@
    notifications-action-signal
    'notifications-on-action-signal))
 
-(defun notifications-on-closed-signal (id reason)
+(defun notifications-on-closed-signal (id &optional reason)
   "Dispatch signals to callback functions from `notifications-on-closed-map'."
-  (let ((entry (assoc id notifications-on-close-map)))
+  ;; notification-daemon prior 0.4.0 does not send a reason.  So we
+  ;; make it optional, and assume `undefined' as default.
+  (let ((entry (assoc id notifications-on-close-map))
+        (reason (or reason 4)))
     (when entry
       (funcall (cadr entry)
                id (cadr (assoc reason notifications-closed-reason)))
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 52f18a89849..47ceec309f4 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -7396,6 +7396,7 @@ comment at the start of cc-engine.el for more info."
     (let ((start (point))
           start-char
           (c-promote-possible-types t)
+          lim
           ;; Turn off recognition of angle bracket arglists while parsing
           ;; types here since the protocol reference list might then be
           ;; considered part of the preceding name or superclass-name.
@@ -7423,6 +7424,7 @@ comment at the start of cc-engine.el for more info."
 ;             (c-forward-token-2) ; 2006/1/13 This doesn't move if the token's
 ;             at EOB.
               (goto-char (match-end 0))
+              (setq lim (point))
               (c-skip-ws-forward)
               (c-forward-type))
 
@@ -7447,7 +7449,7 @@ comment at the start of cc-engine.el for more info."
                 t))))
 
           (progn
-            (c-backward-syntactic-ws)
+            (c-backward-syntactic-ws lim)
             (c-clear-c-type-property start (1- (point)) 'c-decl-end)
             (c-put-c-type-property (1- (point)) 'c-decl-end)
             t)
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 0c86b68f1d9..374c9b434d1 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1155,7 +1155,8 @@ Note that the style variables are always made local to the buffer."
   ;; `c-set-fl-decl-start' for the detailed functionality.
   (cons (c-set-fl-decl-start beg) end))
 
-(defvar c-standard-font-lock-fontify-region-function nil
+(defvar c-standard-font-lock-fontify-region-function
+  (default-value 'font-lock-fontify-region-function)
   "Standard value of `font-lock-fontify-region-function'")
 
 (defun c-font-lock-fontify-region (beg end &optional verbose)
diff --git a/lisp/simple.el b/lisp/simple.el
index 8bd32a8db8d..610d4a3be42 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2713,47 +2713,50 @@ support pty association, if PROGRAM is nil."
   (tabulated-list-init-header))
 
 (defun list-processes--refresh ()
-  "Recompute the list of processes for the Process List buffer."
+  "Recompute the list of processes for the Process List buffer.
+Also, delete any process that is exited or signaled."
   (setq tabulated-list-entries nil)
   (dolist (p (process-list))
-    (when (or (not process-menu-query-only)
-              (process-query-on-exit-flag p))
-      (let* ((buf (process-buffer p))
-             (type (process-type p))
-             (name (process-name p))
-             (status (symbol-name (process-status p)))
-             (buf-label (if (buffer-live-p buf)
-                            `(,(buffer-name buf)
-                              face link
-                              help-echo ,(concat "Visit buffer `"
-                                                 (buffer-name buf) "'")
-                              follow-link t
-                              process-buffer ,buf
-                              action process-menu-visit-buffer)
-                          "--"))
-             (tty (or (process-tty-name p) "--"))
-             (cmd
-              (if (memq type '(network serial))
-                  (let ((contact (process-contact p t)))
-                    (if (eq type 'network)
-                        (format "(%s %s)"
-                                (if (plist-get contact :type)
-                                    "datagram"
-                                  "network")
-                                (if (plist-get contact :server)
-                                    (format "server on %s"
-                                            (plist-get contact :server))
-                                  (format "connection to %s"
-                                          (plist-get contact :host))))
-                      (format "(serial port %s%s)"
-                              (or (plist-get contact :port) "?")
-                              (let ((speed (plist-get contact :speed)))
-                                (if speed
-                                    (format " at %s b/s" speed)
-                                  "")))))
-                (mapconcat 'identity (process-command p) " "))))
-        (push (list p (vector name status buf-label tty cmd))
-              tabulated-list-entries)))))
+    (cond ((memq (process-status p) '(exit signal closed))
+           (delete-process p))
+          ((or (not process-menu-query-only)
+               (process-query-on-exit-flag p))
+           (let* ((buf (process-buffer p))
+                  (type (process-type p))
+                  (name (process-name p))
+                  (status (symbol-name (process-status p)))
+                  (buf-label (if (buffer-live-p buf)
+                                 `(,(buffer-name buf)
+                                   face link
+                                   help-echo ,(concat "Visit buffer `"
+                                                      (buffer-name buf) "'")
+                                   follow-link t
+                                   process-buffer ,buf
+                                   action process-menu-visit-buffer)
+                               "--"))
+                  (tty (or (process-tty-name p) "--"))
+                  (cmd
+                   (if (memq type '(network serial))
+                       (let ((contact (process-contact p t)))
+                         (if (eq type 'network)
+                             (format "(%s %s)"
+                                     (if (plist-get contact :type)
+                                         "datagram"
+                                       "network")
+                                     (if (plist-get contact :server)
+                                         (format "server on %s"
+                                                 (plist-get contact :server))
+                                       (format "connection to %s"
+                                               (plist-get contact :host))))
+                           (format "(serial port %s%s)"
+                                   (or (plist-get contact :port) "?")
+                                   (let ((speed (plist-get contact :speed)))
+                                     (if speed
+                                         (format " at %s b/s" speed)
+                                       "")))))
+                     (mapconcat 'identity (process-command p) " "))))
+             (push (list p (vector name status buf-label tty cmd))
+                   tabulated-list-entries))))))
 
 (defun process-menu-visit-buffer (button)
   (display-buffer (button-get button 'process-buffer)))
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 7c92fc33490..f4cca618b49 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,19 @@
+2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * url-cache.el (url-cache-prune-cache): New function.
+        (url-cache-prune-cache): Check that the directory exists before
+        trying to delete it.
+
+        * url.el (url-retrieve-number-of-calls): New variable.
+        (url-retrieve-internal): Use it to expire the cache once in a
+        while.
+
+        * url-queue.el (url-queue-setup-runners): New function that uses
+        `run-with-idle-timer' for extra asynchronicity.
+        (url-queue-remove-jobs-from-host): New function.
+        (url-queue-callback-function): Remove jobs from the same host if
+        connection failed.
+
 2012-01-12  Glenn Morris  <rgm@gnu.org>
 
         * url-auth.el (url-basic-auth, url-digest-auth):
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 20602a2f8ef..6559de4deb7 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -209,6 +209,34 @@ If `url-standalone-mode' is non-nil, cached items never expire."
             (seconds-to-time (or expire-time url-cache-expire-time)))
            (current-time))))))
 
+(defun url-cache-prune-cache (&optional directory)
+  "Remove all expired files from the cache.
+`url-cache-expire-time' says how old a file has to be to be
+considered \"expired\"."
+  (let ((current-time (current-time))
+        (total-files 0)
+        (deleted-files 0))
+    (setq directory (or directory url-cache-directory))
+    (when (file-exists-p directory)
+      (dolist (file (directory-files directory t))
+        (unless (member (file-name-nondirectory file) '("." ".."))
+          (setq total-files (1+ total-files))
+          (cond
+           ((file-directory-p file)
+            (when (url-cache-prune-cache file)
+              (setq deleted-files (1+ deleted-files))))
+           ((time-less-p
+             (time-add
+              (nth 5 (file-attributes file))
+              (seconds-to-time url-cache-expire-time))
+             current-time)
+            (delete-file file)
+            (setq deleted-files (1+ deleted-files))))))
+      (if (< deleted-files total-files)
+          nil
+        (delete-directory directory)
+        t))))
+
 (provide 'url-cache)
 
 ;;; url-cache.el ends here
diff --git a/lisp/url/url-queue.el b/lisp/url/url-queue.el
index 534c94b4d52..976a26635cd 100644
--- a/lisp/url/url-queue.el
+++ b/lisp/url/url-queue.el
@@ -30,6 +30,7 @@
 
 (eval-when-compile (require 'cl))
 (require 'browse-url)
+(require 'url-parse)
 
 (defcustom url-queue-parallel-processes 6
   "The number of concurrent processes."
@@ -49,7 +50,7 @@
 
 (defstruct url-queue
   url callback cbargs silentp
-  buffer start-time)
+  buffer start-time pre-triggered)
 
 ;;;###autoload
 (defun url-queue-retrieve (url callback &optional cbargs silent)
@@ -63,7 +64,30 @@ controls the level of parallelism via the
                                       :callback callback
                                       :cbargs cbargs
                                       :silentp silent))))
-  (url-queue-run-queue))
+  (url-queue-setup-runners))
+
+;; To ensure asynch behaviour, we start the required number of queue
+;; runners from `run-with-idle-timer'.  So we're basically going
+;; through the queue in two ways: 1) synchronously when a program
+;; calls `url-queue-retrieve' (which will then start the required
+;; number of queue runners), and 2) at the exit of each job, which
+;; will then not start any further threads, but just reuse the
+;; previous "slot".
+
+(defun url-queue-setup-runners ()
+  (let ((running 0)
+        waiting)
+    (dolist (entry url-queue)
+      (cond
+       ((or (url-queue-start-time entry)
+            (url-queue-pre-triggered entry))
+        (incf running))
+       ((not waiting)
+        (setq waiting entry))))
+    (when (and waiting
+               (< running url-queue-parallel-processes))
+      (setf (url-queue-pre-triggered waiting) t)
+      (run-with-idle-timer 0.01 nil 'url-queue-run-queue))))
 
 (defun url-queue-run-queue ()
   (url-queue-prune-old-entries)
@@ -81,10 +105,27 @@ controls the level of parallelism via the
       (url-queue-start-retrieve waiting))))
 
 (defun url-queue-callback-function (status job)
+  (when (and (eq (car status) :error)
+             (eq (cadr (cadr status)) 'connection-failed))
+    ;; If we get a connection error, then flush all other jobs from
+    ;; the host from the queue.  This particularly makes sense if the
+    ;; error really is a DNS resolver issue, which happens
+    ;; synchronously and totally halts Emacs.
+    (url-queue-remove-jobs-from-host
+     (plist-get (nthcdr 3 (cadr status)) :host)))
   (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-remove-jobs-from-host (host)
+  (let ((jobs nil))
+    (dolist (job url-queue)
+      (when (equal (url-host (url-generic-parse-url (url-queue-url job)))
+                   host)
+        (push job jobs)))
+    (dolist (job jobs)
+      (setq url-queue (delq job url-queue)))))
+  
 (defun url-queue-start-retrieve (job)
   (setf (url-queue-buffer job)
         (ignore-errors
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 883e1a0c765..03b66b15232 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -119,6 +119,9 @@ Sometimes while retrieving a URL, the URL library needs to use another buffer
 than the one returned initially by `url-retrieve'.  In this case, it sets this
 variable in the original buffer as a forwarding pointer.")
 
+(defvar url-retrieve-number-of-calls 0)
+(autoload 'url-cache-prune-cache "url-cache")
+
 ;;;###autoload
 (defun url-retrieve (url callback &optional cbargs silent)
   "Retrieve URL asynchronously and call CALLBACK with CBARGS when finished.
@@ -174,6 +177,10 @@ If SILENT, don't message progress reports and the like."
   (unless (url-type url)
     (error "Bad url: %s" (url-recreate-url url)))
   (setf (url-silent url) silent)
+  ;; Once in a while, remove old entries from the URL cache.
+  (when (zerop (% url-retrieve-number-of-calls 1000))
+    (url-cache-prune-cache))
+  (setq url-retrieve-number-of-calls (1+ url-retrieve-number-of-calls))
   (let ((loader (url-scheme-get-property (url-type url) 'loader))
         (url-using-proxy (if (url-host url)
                              (url-find-proxy-for-url url (url-host url))))
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 27922327f44..61bb4db558c 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1987,10 +1987,14 @@ the earlier input."
     (when (overlayp overlay)
       (delete-overlay overlay))))
 
-(defun widget-field-value-get (widget)
-  "Return current text in editing field."
+(defun widget-field-value-get (widget &optional no-truncate)
+  "Return current text in editing field.
+Normally, trailing spaces within the editing field are truncated.
+But if NO-TRUNCATE is non-nil, include them."
   (let ((from (widget-field-start widget))
-        (to (widget-field-text-end widget))
+        (to   (if no-truncate
+                  (widget-field-end widget)
+                (widget-field-text-end widget)))
         (buffer (widget-field-buffer widget))
         (secret (widget-get widget :secret))
         (old (current-buffer)))
@@ -3407,6 +3411,7 @@ To use this type, you must define :match or :match-alternatives."
   :format "%{%t%}: %v\n"
   :valid-regexp "\\`.\\'"
   :error "This field should contain a single character"
+  :value-get (lambda (w) (widget-field-value-get w t))
   :value-to-internal (lambda (_widget value)
                        (if (stringp value)
                            value