Merge changes made in Gnus trunk.

nnimap.el: Use nnheader-message throughout.
gnus.el: Autoload gnus-html-show-images.
mml.el (mml-generate-mime-1): Add `mml-enable-flow' variable to add a possibility to disable format=flow encoding when using hard newlines.
gnus-diary.el (gnus-diary-check-message): Fix gnus-completing-read call.
gnus-sum.el (gnus-summary-refer-thread): unconditionally ignore duplicates.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 765309e28a0ab2b025c258f99f4d134668c611de..5242947c2f558de0acb2df619135f55bd010e322 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,12 +1,30 @@
+2010-10-15  Andrew Cohen  <cohen@andy.bu.edu>
+
+       * gnus-sum.el (gnus-summary-refer-thread): unconditionally ignore
+       duplicates.
+
+2010-10-15  Kan-Ru Chen  <kanru@kanru.info>  (tiny change)
+
+       * gnus-diary.el (gnus-diary-check-message): Fix gnus-completing-read
+       call.
+
 2010-10-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus.el: Autoload gnus-html-show-images.
+
+       * nnimap.el: Use nnheader-message throughout.
+
        * shr.el (shr-tag-img): Ignore images with no data.
 
+2010-10-15  Julien Danjou  <julien@danjou.info>
+
+       * mml.el (mml-generate-mime-1): Add `mml-enable-flow' variable to add a
+       possibility to disable format=flow encoding when using hard newlines.
+
 2010-10-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * shr.el (shr-generic): Remove trailing space.
-       (shr-insert): Remove space inserted before or after a breakable
-       character or at the beginning or the end of a line.
+       * shr.el (shr-insert): Remove space inserted before or after a
+       breakable character or at the beginning or the end of a line.
        (shr-find-fill-point): Do kinsoku; find the second best point or give
        it up if there's no breakable point.
 

diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 76d469b66f99ebaad9c288cea7e6cb1c66aa7b76..c2b95c7099bc0b157838ec05fdb70391568d369a 100644 (file)
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -368,7 +368,7 @@ If ARG (or prefix) is non-nil, force prompting for all fields."
                                 header ": ")))
             (setq value
                   (if (listp (nth 1 head))
-                      (gnus-completing-read prompt (cons '("*" nil) (nth 1 head))
+                      (gnus-completing-read prompt (cons "*" (mapcar 'car (nth 1 head)))
                                              t value
                                              'gnus-diary-header-value-history)
                     (read-string prompt value

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 568e29762685d7eedc04e93811f6dfaa0d76fdb5..c50d8aabf7b1615ecd402c5a4c6b5aefe256fce1 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8830,6 +8830,7 @@ fetch what's specified by the `gnus-refer-thread-limit'
 variable."
   (interactive "P")
   (let ((id (mail-header-id (gnus-summary-article-header)))
+       (gnus-summary-ignore-duplicates t)
        (limit (if limit (prefix-numeric-value limit)
                 gnus-refer-thread-limit)))
     (if  (gnus-check-backend-function 'request-thread gnus-newsgroup-name)

diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index c944f4a307d72f5ae2f9937c95342e48e08485dc..19b71551c1401e7e94fdb6445b855d315c401e4c 100644 (file)
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2911,6 +2911,7 @@ gnus-registry.el will populate this if it's loaded.")
       gnus-start-date-timer gnus-stop-date-timer
       gnus-mime-view-all-parts)
      ("gnus-int" gnus-request-type)
+     ("gnus-html" gnus-html-show-images)
      ("gnus-start" gnus-newsrc-parse-options gnus-1 gnus-no-server-1
       gnus-dribble-enter gnus-read-init-file gnus-dribble-touch
       gnus-check-reasonable-setup)

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 43e86cb6c34b1d2686071b523d3f6e09e0c8825c..1975af4183af637d8c82df19eeed6f1c2d5d3286 100644 (file)
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -128,6 +128,14 @@ It is necessary to work against a bug in certain clients."
   :type 'boolean
   :group 'message)
 
+(defcustom mml-enable-flowed t
+  "If non-nil, enable format=flowed usage when encoding a message.
+This is only performed when filling on text/plain with hard
+newlines in the text."
+  :version "24.1"
+  :type 'boolean
+  :group 'message)
+
 (defvar mml-tweak-type-alist nil
   "A list of (TYPE . FUNCTION) for tweaking MML parts.
 TYPE is a string containing a regexp to match the MIME type.  FUNCTION
@@ -546,7 +554,8 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
                    ;; in the mml tag or it says "flowed" and there
                    ;; actually are hard newlines in the text.
                    (let (use-hard-newlines)
-                     (when (and (string= type "text/plain")
+                     (when (and mml-enable-flowed
+                                 (string= type "text/plain")
                                 (not (string= (cdr (assq 'sign cont)) "pgp"))
                                 (or (null (assq 'format cont))
                                     (string= (cdr (assq 'format cont))

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index bb9f569198476567827c27b0ba3c53508b6839ef..8f0a112c7f31be23fbeab49d1152c2d70621066d 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -304,7 +304,8 @@ textual parts.")
               ((or (eq nnimap-stream 'network)
                    (and (eq nnimap-stream 'starttls)
                         (fboundp 'open-gnutls-stream)))
-               (message "Opening connection to %s..." nnimap-address)
+               (nnheader-message 7 "Opening connection to %s..."
+                                 nnimap-address)
                (open-network-stream
                 "*nnimap*" (current-buffer) nnimap-address
                 (setq port
@@ -314,13 +315,14 @@ textual parts.")
                             "143"))))
                '("143" "imap"))
               ((eq nnimap-stream 'shell)
-               (message "Opening connection to %s via shell..." nnimap-address)
+               (nnheader-message 7 "Opening connection to %s via shell..."
+                                 nnimap-address)
                (nnimap-open-shell-stream
                 "*nnimap*" (current-buffer) nnimap-address
                 (setq port (or nnimap-server-port "imap")))
                '("imap"))
               ((eq nnimap-stream 'starttls)
-               (message "Opening connection to %s via starttls..."
+               (nnheader-message 7 "Opening connection to %s via starttls..."
                         nnimap-address)
                (let ((tls-program
                       '("openssl s_client -connect %h:%p -no_ssl2 -ign_eof -starttls imap")))
@@ -329,7 +331,8 @@ textual parts.")
                   (setq port (or nnimap-server-port "imap"))))
                '("imap"))
               ((memq nnimap-stream '(ssl tls))
-               (message "Opening connection to %s via tls..." nnimap-address)
+               (nnheader-message 7 "Opening connection to %s via tls..."
+                                 nnimap-address)
                (funcall (if (fboundp 'open-gnutls-stream)
                             'open-gnutls-stream
                           'open-tls-stream)
@@ -734,7 +737,7 @@ textual parts.")
    ((and force
         (eq nnmail-expiry-target 'delete))
     (unless (nnimap-delete-article (gnus-compress-sequence articles))
-      (message "Article marked for deletion, but not expunged."))
+      (nnheader-message 7 "Article marked for deletion, but not expunged."))
     nil)
    (t
     (let ((deletable-articles
@@ -760,7 +763,7 @@ textual parts.")
       (let ((target nnmail-expiry-target))
        (with-temp-buffer
          (when (nnimap-request-article article group server (current-buffer))
-           (message "Expiring article %s:%d" group article)
+           (nnheader-message 7 "Expiring article %s:%d" group article)
            (when (functionp target)
              (setq target (funcall target group)))
            (when (and target
@@ -830,7 +833,7 @@ textual parts.")
   (when (and (nnimap-possibly-change-group nil server)
             nnimap-inbox
             nnimap-split-methods)
-    (message "nnimap %s splitting mail..." server)
+    (nnheader-message 7 "nnimap %s splitting mail..." server)
     (nnimap-split-incoming-mail)))
 
 (defun nnimap-marks-to-flags (marks)
@@ -882,7 +885,7 @@ textual parts.")
        (let ((result (nnimap-get-response sequence)))
          (if (not (car result))
              (progn
-               (message "%s" (nnheader-get-report-string 'nnimap))
+               (nnheader-message 7 "%s" (nnheader-get-report-string 'nnimap))
                nil)
            (cons group
                  (nnimap-find-article-by-message-id group message-id))))))))
@@ -1431,7 +1434,7 @@ textual parts.")
                              (point-min))
                            t)))
            (when messagep
-             (message "nnimap read %dk" (/ (buffer-size) 1000)))
+             (nnheader-message 7 "nnimap read %dk" (/ (buffer-size) 1000)))
            (nnheader-accept-process-output process)
            (goto-char (point-max)))
           openp)