SYnch to No Gnus 200409021450.

diff --git a/ChangeLog b/ChangeLog
index 07bcfb0..3e59a78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-02  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * etc/.cvsignore: Remove unused.
+
 2004-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * texi/gnus-ja.texi: Uncomment the @copying section.

diff --git a/GNUS-NEWS b/GNUS-NEWS
index 9cf36e9..cad566d 100644 (file)
--- a/GNUS-NEWS
+++ b/GNUS-NEWS
@@ -30,7 +30,11 @@ installation, and it will realize what articles you have read and
 marked.  The data in `~/News/marks' has priority over the same data
 in `~/.newsrc.eld'.
 
+** Picons can be displayed right from the textual address, see
+`gnus-picon-style'
+
 ** You can import and export your RSS subscriptions from OPML files.
+*Note RSS::.
 
 ** The option `mm-fill-flowed' can be used to disable treatment of
 format=flowed messages.  Also, flowed text is disabled when sending

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4010499..81ed1da 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-02  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus-picon.el: Fix indentation and closing parenthesis.
+
 2004-09-01  Simon Josefsson  <jas@extundo.com>
 
        * message.el (message-canlock-generate): Require sha1, not

diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index 710b7aa..408b76f 100644 (file)
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -165,108 +165,107 @@ replacement is added."
 
 (defun gnus-picon-transform-address (header category)
   (gnus-with-article-headers
-    (let ((addresses
-          (mail-header-parse-addresses
-           ;; mail-header-parse-addresses does not work (reliably) on
-           ;; decoded headers.
-           (or
-            (ignore-errors
-              (mail-encode-encoded-word-string
-               (or (mail-fetch-field header) "")))
-            (mail-fetch-field header))))
-         spec file point cache len)
-      (dolist (address addresses)
-       (setq address (car address))
-       (when (and (stringp address)
-                  (setq spec (gnus-picon-split-address address)))
-         (if (setq cache (cdr (assoc address gnus-picon-cache)))
-             (setq spec cache)
-           (when (setq file (or (gnus-picon-find-face
-                                 address gnus-picon-user-directories)
-                                (gnus-picon-find-face
-                                 (concat "unknown@"
-                                         (mapconcat
-                                          'identity (cdr spec) "."))
-                                 gnus-picon-user-directories)))
-             (setcar spec (cons (gnus-picon-create-glyph file)
-                                (car spec))))
-
-           (dotimes (i (1- (length spec)))
-             (when (setq file (gnus-picon-find-face
-                               (concat "unknown@"
-                                       (mapconcat
-                                        'identity (nthcdr (1+ i) spec) "."))
-                               gnus-picon-domain-directories t))
-               (setcar (nthcdr (1+ i) spec)
-                       (cons (gnus-picon-create-glyph file)
-                             (nth (1+ i) spec)))))
-           (setq spec (nreverse spec))
-           (push (cons address spec) gnus-picon-cache))
-
-         (gnus-article-goto-header header)
-         (mail-header-narrow-to-field)
-         (case gnus-picon-style
-           (right
-            (when (= (length addresses) 1)
-              (setq len (apply '+ (mapcar (lambda (x)
-                                            (condition-case nil
-                                                (car (image-size (car x)))
-                                              (error 0))) spec)))
-              (when (> len 0)
-                (goto-char (point-at-eol))
-                (insert (propertize
-                         " " 'display
-                         (cons 'space
-                               (list :align-to (- (window-width) 1 len))))))
-              (goto-char (point-at-eol))
-              (setq point (point-at-eol))
-              (dolist (image spec)
-                (unless (stringp image)
-                  (goto-char point)
-                  (gnus-picon-insert-glyph image category 'nostring)))))
-           (inline
-             (when (search-forward address nil t)
-               (delete-region (match-beginning 0) (match-end 0))
-               (setq point (point))
-               (while spec
-                 (goto-char point)
-                 (if (> (length spec) 2)
-                     (insert ".")
-                   (if (= (length spec) 2)
-                       (insert "@")))
-                 (gnus-picon-insert-glyph (pop spec) category)))))
-             )))))
+   (let ((addresses
+         (mail-header-parse-addresses
+          ;; mail-header-parse-addresses does not work (reliably) on
+          ;; decoded headers.
+          (or
+           (ignore-errors
+            (mail-encode-encoded-word-string
+             (or (mail-fetch-field header) "")))
+           (mail-fetch-field header))))
+        spec file point cache len)
+     (dolist (address addresses)
+       (setq address (car address))
+       (when (and (stringp address)
+                 (setq spec (gnus-picon-split-address address)))
+        (if (setq cache (cdr (assoc address gnus-picon-cache)))
+            (setq spec cache)
+          (when (setq file (or (gnus-picon-find-face
+                                address gnus-picon-user-directories)
+                               (gnus-picon-find-face
+                                (concat "unknown@"
+                                        (mapconcat
+                                         'identity (cdr spec) "."))
+                                gnus-picon-user-directories)))
+            (setcar spec (cons (gnus-picon-create-glyph file)
+                               (car spec))))
+
+          (dotimes (i (1- (length spec)))
+            (when (setq file (gnus-picon-find-face
+                              (concat "unknown@"
+                                      (mapconcat
+                                       'identity (nthcdr (1+ i) spec) "."))
+                              gnus-picon-domain-directories t))
+              (setcar (nthcdr (1+ i) spec)
+                      (cons (gnus-picon-create-glyph file)
+                            (nth (1+ i) spec)))))
+          (setq spec (nreverse spec))
+          (push (cons address spec) gnus-picon-cache))
+
+        (gnus-article-goto-header header)
+        (mail-header-narrow-to-field)
+        (case gnus-picon-style
+              (right
+               (when (= (length addresses) 1)
+                 (setq len (apply '+ (mapcar (lambda (x)
+                                               (condition-case nil
+                                                   (car (image-size (car x)))
+                                                 (error 0))) spec)))
+                 (when (> len 0)
+                   (goto-char (point-at-eol))
+                   (insert (propertize
+                            " " 'display
+                            (cons 'space
+                                  (list :align-to (- (window-width) 1 len))))))
+                 (goto-char (point-at-eol))
+                 (setq point (point-at-eol))
+                 (dolist (image spec)
+                   (unless (stringp image)
+                     (goto-char point)
+                     (gnus-picon-insert-glyph image category 'nostring)))))
+              (inline
+                (when (search-forward address nil t)
+                  (delete-region (match-beginning 0) (match-end 0))
+                  (setq point (point))
+                  (while spec
+                    (goto-char point)
+                    (if (> (length spec) 2)
+                        (insert ".")
+                      (if (= (length spec) 2)
+                          (insert "@")))
+                    (gnus-picon-insert-glyph (pop spec) category))))))))))
 
 (defun gnus-picon-transform-newsgroups (header)
   (interactive)
   (gnus-with-article-headers
-    (gnus-article-goto-header header)
-    (mail-header-narrow-to-field)
-    (let ((groups (message-tokenize-header (mail-fetch-field header)))
-         spec file point)
-      (dolist (group groups)
-       (unless (setq spec (cdr (assoc group gnus-picon-cache)))
-         (setq spec (nreverse (split-string group "[.]")))
-         (dotimes (i (length spec))
-           (when (setq file (gnus-picon-find-face
-                             (concat "unknown@"
-                                     (mapconcat
-                                      'identity (nthcdr i spec) "."))
-                             gnus-picon-news-directories t))
-             (setcar (nthcdr i spec)
-                     (cons (gnus-picon-create-glyph file)
-                           (nth i spec)))))
-           (push (cons group spec) gnus-picon-cache))
-       (when (search-forward group nil t)
-         (delete-region (match-beginning 0) (match-end 0))
-         (save-restriction
-           (narrow-to-region (point) (point))
-           (while spec
-             (goto-char (point-min))
-             (if (> (length spec) 1)
-                 (insert "."))
-             (gnus-picon-insert-glyph (pop spec) 'newsgroups-picon))
-           (goto-char (point-max))))))))
+   (gnus-article-goto-header header)
+   (mail-header-narrow-to-field)
+   (let ((groups (message-tokenize-header (mail-fetch-field header)))
+        spec file point)
+     (dolist (group groups)
+       (unless (setq spec (cdr (assoc group gnus-picon-cache)))
+        (setq spec (nreverse (split-string group "[.]")))
+        (dotimes (i (length spec))
+          (when (setq file (gnus-picon-find-face
+                            (concat "unknown@"
+                                    (mapconcat
+                                     'identity (nthcdr i spec) "."))
+                            gnus-picon-news-directories t))
+            (setcar (nthcdr i spec)
+                    (cons (gnus-picon-create-glyph file)
+                          (nth i spec)))))
+        (push (cons group spec) gnus-picon-cache))
+       (when (search-forward group nil t)
+        (delete-region (match-beginning 0) (match-end 0))
+        (save-restriction
+          (narrow-to-region (point) (point))
+          (while spec
+            (goto-char (point-min))
+            (if (> (length spec) 1)
+                (insert "."))
+            (gnus-picon-insert-glyph (pop spec) 'newsgroups-picon))
+          (goto-char (point-max))))))))
 
 ;;; Commands:
 
@@ -280,10 +279,9 @@ If picons are already displayed, remove them."
   (interactive)
   (let ((wash-picon-p buffer-read-only))
     (gnus-with-article-buffer
-      (if (and wash-picon-p (memq 'from-picon gnus-article-wash-types))
-         (gnus-delete-images 'from-picon)
-       (gnus-picon-transform-address "from" 'from-picon)))
-    ))
+     (if (and wash-picon-p (memq 'from-picon gnus-article-wash-types))
+        (gnus-delete-images 'from-picon)
+       (gnus-picon-transform-address "from" 'from-picon)))))
 
 ;;;###autoload
 (defun gnus-treat-mail-picon ()
@@ -292,11 +290,10 @@ If picons are already displayed, remove them."
   (interactive)
   (let ((wash-picon-p buffer-read-only))
     (gnus-with-article-buffer
-      (if (and wash-picon-p (memq 'mail-picon gnus-article-wash-types))
-         (gnus-delete-images 'mail-picon)
-       (gnus-picon-transform-address "cc" 'mail-picon)
-       (gnus-picon-transform-address "to" 'mail-picon)))
-    ))
+     (if (and wash-picon-p (memq 'mail-picon gnus-article-wash-types))
+        (gnus-delete-images 'mail-picon)
+       (gnus-picon-transform-address "cc" 'mail-picon)
+       (gnus-picon-transform-address "to" 'mail-picon)))))
 
 ;;;###autoload
 (defun gnus-treat-newsgroups-picon ()
@@ -305,11 +302,10 @@ If picons are already displayed, remove them."
   (interactive)
   (let ((wash-picon-p buffer-read-only))
     (gnus-with-article-buffer
-      (if (and wash-picon-p (memq 'newsgroups-picon gnus-article-wash-types))
-         (gnus-delete-images 'newsgroups-picon)
-       (gnus-picon-transform-newsgroups "newsgroups")
-       (gnus-picon-transform-newsgroups "followup-to")))
-    ))
+     (if (and wash-picon-p (memq 'newsgroups-picon gnus-article-wash-types))
+        (gnus-delete-images 'newsgroups-picon)
+       (gnus-picon-transform-newsgroups "newsgroups")
+       (gnus-picon-transform-newsgroups "followup-to")))))
 
 (provide 'gnus-picon)
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 629e1b6..d21073c 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,5 +1,7 @@
 2004-09-02  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * gnus-news.texi: Fix typo in previous commit.
+
        * gnus-news.el (gnus-news-makeinfo-switches): Add --no-validate to
        allow unresolved references.
 

diff --git a/texi/gnus-news.texi b/texi/gnus-news.texi
index 3c3c45b..17bc219 100644 (file)
--- a/texi/gnus-news.texi
+++ b/texi/gnus-news.texi
@@ -40,7 +40,7 @@ articles you have read and marked.  The data in @file{~/News/marks}
 has priority over the same data in @file{~/.newsrc.eld}.
 
 @item
-Picons can displayed right from the textual address, see
+Picons can be displayed right from the textual address, see
 @code{gnus-picon-style}
 
 @item