upstream

10 files changed, 104 insertions, 21 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c655c4968df..e383f86971f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,24 @@
+2011-08-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/smtpmail.el (smtpmail-smtp-user): New variable.
+        (smtpmail-try-auth-methods): Use it.
+
+2011-08-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * font-lock.el (font-lock-fontify-region)
+        (font-lock-unfontify-region, font-lock-default-fontify-buffer)
+        (font-lock-default-unfontify-buffer)
+        (font-lock-default-fontify-region)
+        (font-lock-default-unfontify-region): Add docstrings (Bug#8624).
+
+        * progmodes/compile.el (compilation-error-properties): Fix
+        confusion between file struct and message struct (Bug#9319).
+        (compilation-error-regexp-alist-alist): Fix 2011-05-09 change to
+        `ant' regexp.
+
+        * net/browse-url.el (browse-url-firefox): Don't call
+        browse-url-firefox-sentinel unless using -remote (Bug#9328).
+
 2011-08-20  Glenn Morris  <rgm@gnu.org>
 
         * tutorial.el (help-with-tutorial): Avoid an error on short screens.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 9cf889e1aec..c37a9ae916e 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1018,14 +1018,20 @@ The region it returns may start or end in the middle of a line.")
   (funcall font-lock-unfontify-buffer-function))
 
 (defun font-lock-fontify-region (beg end &optional loudly)
+  "Fontify the text between BEG and END.
+If LOUDLY is non-nil, print status messages while fontifying.
+This works by calling `font-lock-fontify-region-function'."
   (font-lock-set-defaults)
   (funcall font-lock-fontify-region-function beg end loudly))
 
 (defun font-lock-unfontify-region (beg end)
+  "Unfontify the text between BEG and END.
+This works by calling `font-lock-unfontify-region-function'."
   (save-buffer-state
     (funcall font-lock-unfontify-region-function beg end)))
 
 (defun font-lock-default-fontify-buffer ()
+  "Fontify the whole buffer using `font-lock-fontify-region-function'."
   (let ((verbose (if (numberp font-lock-verbose)
                      (> (buffer-size) font-lock-verbose)
                    font-lock-verbose)))
@@ -1045,6 +1051,7 @@ The region it returns may start or end in the middle of a line.")
           (quit (font-lock-unfontify-buffer)))))))
 
 (defun font-lock-default-unfontify-buffer ()
+  "Unfontify the whole buffer using `font-lock-unfontify-region-function'."
   ;; Make sure we unfontify etc. in the whole buffer.
   (save-restriction
     (widen)
@@ -1114,6 +1121,9 @@ Put first the functions more likely to cause a change and cheaper to compute.")
     changed))
 
 (defun font-lock-default-fontify-region (beg end loudly)
+  "Fontify the text between BEG and END.
+If LOUDLY is non-nil, print status messages while fontifying.
+This function is the default `font-lock-fontify-region-function'."
   (save-buffer-state
     ;; Use the fontification syntax table, if any.
     (with-syntax-table (or font-lock-syntax-table (syntax-table))
@@ -1162,6 +1172,8 @@ This is used by `font-lock-default-unfontify-region' to decide
 what properties to clear before refontifying a region.")
 
 (defun font-lock-default-unfontify-region (beg end)
+  "Unfontify the text between BEG and END.
+This function is the default `font-lock-unfontify-region-function'."
   (remove-list-of-text-properties
    beg end (append
             font-lock-extra-managed-props
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 744817e68f2..4fc144b81b9 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,23 @@
+2011-08-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nntp.el (nntp-authinfo-file): Mark as obsolete -- use auth-source
+        instead.
+
+        * pop3.el (pop3-wait-for-messages): Don't use Gnus functions here.
+
+        * gnus-util.el (gnus-process-live-p): Copy over compat function.
+
+        * pop3.el (pop3-wait-for-messages): If the pop3 process dies, stop
+        processing.
+
+        * nntp.el (nntp-kill-buffer): Kill the process before killing the
+        buffer to avoid warnings.
+
+2011-08-20  Simon Josefsson  <simon@josefsson.org>
+
+        * gnus-agent.el (gnus-agent-expire-done-message): Use %.f as format
+        specified to reduce precision.
+
 2011-08-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * nnimap.el (nnimap-transform-headers): Protect against (NIL ...)
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 424c55c40f5..26222119b98 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -3560,7 +3560,7 @@ articles in every agentized group? "))
                 units (cdr units)))
 
         (format "Expiry recovered %d NOV entries, deleted %d files,\
- and freed %f %s."
+ and freed %.f %s."
                 (nth 0 stats)
                 (nth 1 stats)
                 size (car units)))
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 03ff4a2ea4b..34953611966 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1249,6 +1249,13 @@ This function saves the current buffer."
        (with-current-buffer gnus-group-buffer
          (eq major-mode 'gnus-group-mode))))
 
+(defun gnus-process-live-p (process)
+  "Returns non-nil if PROCESS is alive.
+A process is considered alive if its status is `run', `open',
+`listen', `connect' or `stop'."
+  (memq (process-status process)
+        '(run open listen connect stop)))
+
 (defun gnus-remove-if (predicate sequence &optional hash-table-p)
   "Return a copy of SEQUENCE with all items satisfying PREDICATE removed.
 SEQUENCE should be a list, a vector, or a string.  Returns always a list.
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 986fd51a613..325aa67f80d 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -261,6 +261,8 @@ See `nnml-marks-is-evil' for more information.")
                                           (const :format "" "password")
                                           (string :format "Password: %v")))))))
 
+(make-obsolete 'nntp-authinfo-file nil "Emacs 24.1")
+
 
 
 (defvoo nntp-connection-timeout nil
@@ -430,6 +432,9 @@ be restored and the command retried."
 
 (defun nntp-kill-buffer (buffer)
   (when (buffer-name buffer)
+    (let ((process (get-buffer-process buffer)))
+      (when process
+        (delete-process process)))
     (kill-buffer buffer)
     (nnheader-init-server-buffer)))
 
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index e29ddb0d44e..54c21703836 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -178,6 +178,8 @@ Use streaming commands."
 
 (defun pop3-wait-for-messages (process count total-size)
   (while (< (pop3-number-of-responses total-size) count)
+    (unless (memq (process-status process) '(open run))
+      (error "pop3 process died"))
     (when total-size
       (message "pop3 retrieved %dKB (%d%%)"
                (truncate (/ (buffer-size) 1000))
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 637d10135fa..caec69e7e9e 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -86,6 +86,11 @@ The default value would be \"smtp\" or 25."
   :type '(choice (integer :tag "Port") (string :tag "Service"))
   :group 'smtpmail)
 
+(defcustom smtpmail-smtp-user nil
+  "User name to use when looking up credentials."
+  :type '(choice (const nil) string)
+  :group 'smtpmail)
+
 (defcustom smtpmail-local-domain nil
   "Local domain name without a host name.
 If the function `system-name' returns the full internet address,
@@ -490,6 +495,7 @@ The list is in preference order.")
                      (auth-source-search
                       :host host
                       :port port
+                      :user smtpmail-smtp-user
                       :max 1
                       :require (and ask-for-password
                                     '(:user :secret))
@@ -510,6 +516,7 @@ The list is in preference order.")
               :max 1
               :host host
               :port port
+              :user smtpmail-smtp-user
               :require '(:user :secret)
               :create t))
             password (plist-get auth-info :secret)))
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index e18b42a275f..f9bc13e1e25 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1103,26 +1103,32 @@ URL in a new window."
   (interactive (browse-url-interactive-arg "URL: "))
   (setq url (browse-url-encode-url url))
   (let* ((process-environment (browse-url-process-environment))
+         (use-remote
+          (not (memq system-type '(windows-nt ms-dos))))
          (process
           (apply 'start-process
                  (concat "firefox " url) nil
                  browse-url-firefox-program
                  (append
                   browse-url-firefox-arguments
-                  (if (memq system-type '(windows-nt ms-dos))
-                      (list url)
-                    (list "-remote"
-                          (concat "openURL("
-                                  url
-                                  (if (browse-url-maybe-new-window
-                                       new-window)
-                                      (if browse-url-firefox-new-window-is-tab
-                                          ",new-tab"
-                                        ",new-window"))
-                                  ")")))))))
-    (set-process-sentinel process
-                          `(lambda (process change)
-                             (browse-url-firefox-sentinel process ,url)))))
+                  (if use-remote
+                      (list "-remote"
+                            (concat
+                             "openURL("
+                             url
+                             (if (browse-url-maybe-new-window new-window)
+                                 (if browse-url-firefox-new-window-is-tab
+                                     ",new-tab"
+                                   ",new-window"))
+                             ")"))
+                    (list url))))))
+    ;; If we use -remote, the process exits with status code 2 if
+    ;; Firefox is not already running.  The sentinel runs firefox
+    ;; directly if that happens.
+    (when use-remote
+      (set-process-sentinel process
+                            `(lambda (process change)
+                               (browse-url-firefox-sentinel process ,url))))))
 
 (defun browse-url-firefox-sentinel (process url)
   "Handle a change to the process communicating with Firefox."
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f3b873c8b1e..2fb0ac879b2 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -145,7 +145,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 
     (ant
      "^[ \t]*\\[[^] \n]+\\][ \t]*\\([^: \n]+\\):\\([0-9]+\\):\\(?:\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\):\\)?\
-\\( warning\\)?" 1 (2 . 4) (3 . 5) (4))
+\\( warning\\)?" 1 (2 . 4) (3 . 5) (6))
 
     (bash
      "^\\([^: \n\t]+\\): line \\([0-9]+\\):" 1 2)
@@ -985,12 +985,15 @@ POS and RES.")
             (let* ((prev
                     (or (get-text-property (1- prev-pos) 'compilation-message)
                         (get-text-property prev-pos 'compilation-message)))
-                   (prev-struct
-                    (car (nth 2 (car prev)))))
+                   (prev-file-struct
+                    (and prev
+                         (compilation--loc->file-struct
+                          (compilation--message->loc prev)))))
+
               ;; Construct FILE . DIR from that.
-              (if prev-struct
-                  (setq file (cons (car prev-struct)
-                                   (cadr prev-struct))))))
+              (if prev-file-struct
+                  (setq file (cons (caar prev-file-struct)
+                                   (cadr (car prev-file-struct)))))))
         (unless file
           (setq file '("*unknown*")))))
     ;; All of these fields are optional, get them only if we have an index, and