Synch to No Gnus 200412270113.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a17192..081244c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2004-12-27  Simon Josefsson  <jas@extundo.com>
+
+       * mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used
+       when mm-use-ultra-safe-encoding is enabled (e.g., for PGP/MIME)
+       and we have trailing white space.  Reported by Werner Koch
+       <wk@gnupg.org>.
+
+2004-12-17  Kim F. Storm  <storm@cua.dk>
+
+       * gnus-group.el (gnus-group-mode-map): Map follow-link to mouse-face.
+
+       * gnus-sum.el (gnus-summary-mode-map): Likewise.
+
 2004-12-26  Tsuyoshi AKIHO  <akiho@kawachi.zaq.ne.jp>
 
        * gnus-sum.el (gnus-summary-walk-group-buffer): Decode group name.
@@ -1175,7 +1188,7 @@
        * gnus-delay.el (gnus-delay-default-hour): Add :version.
 
        * gnus-cite.el (gnus-cite-blank-line-after-header)
-       (gnus-article-boring-faces): 
+       (gnus-article-boring-faces):
 
        * gnus-art.el (gnus-buttonized-mime-types)
        (gnus-inhibit-mime-unbuttonizing)

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index b22d616..3e3c86f 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -614,6 +614,7 @@ simple manner.")
   "\M-e" gnus-group-edit-group-method
   "^" gnus-group-enter-server-mode
   gnus-mouse-2 gnus-mouse-pick-group
+  [follow-link] mouse-face
   "<" beginning-of-buffer
   ">" end-of-buffer
   "\C-c\C-b" gnus-bug

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 47744d9..76ee009 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1774,6 +1774,7 @@ increase the score of each group you read."
   "Q" gnus-summary-exit-no-update
   "\C-c\C-i" gnus-info-find-node
   gnus-mouse-2 gnus-mouse-pick-article
+  [follow-link] mouse-face
   "m" gnus-summary-mail-other-window
   "a" gnus-summary-post-news
   "i" gnus-summary-news-other-window
@@ -5154,7 +5155,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 
     (when gnus-agent
       (gnus-agent-possibly-alter-active group (gnus-active group) info)
-      
+
       (setq gnus-summary-use-undownloaded-faces
            (gnus-agent-find-parameter
             group
@@ -7092,7 +7093,7 @@ If optional argument UNREAD is non-nil, only unread article is selected."
       (gnus-summary-goto-subject article t)))
   (gnus-summary-limit (append articles gnus-newsgroup-limit))
   (gnus-summary-position-point))
- 
+
 (defun gnus-summary-goto-subject (article &optional force silent)
   "Go the subject line of ARTICLE.
 If FORCE, also allow jumping to articles not currently shown."
@@ -9358,7 +9359,7 @@ ACTION can be either `move' (the default), `crosspost' or `copy'."
 
        ;;;!!!Why is this necessary?
        (set-buffer gnus-summary-buffer)
-       
+
        (gnus-summary-goto-subject article)
        (when (eq action 'move)
          (gnus-summary-mark-article article gnus-canceled-mark))))

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index 6470ddf..2320793 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -1,6 +1,6 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2003
+;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -137,7 +137,8 @@ If no encoding was done, nil is returned."
     (cond
      ((and (not longp)
           (not (and mm-use-ultra-safe-encoding
-                    (save-excursion (re-search-forward "^From " nil t))))
+                    (or (save-excursion (re-search-forward " $" nil t))
+                        (save-excursion (re-search-forward "^From " nil t)))))
           (eq bits '7bit))
       bits)
      ((and (not mm-use-ultra-safe-encoding)