[Emacs-diffs] trunk r113463: Merge Changes made in Gnus master

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 113463
revision-id: address@hidden
parent: address@hidden
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2013-07-19 14:50:21 +0000
message:
  Merge Changes made in Gnus master
  
  2013-07-19 Geoff Kuenning <address@hidden> (tiny change)
   * gnus.texi (Customizing Articles): Document function predicates.
  
  2013-07-19 Geoff Kuenning <address@hidden> (tiny change)
   * gnus-art.el (gnus-treat-predicate): Allow functions as predicates 
(bug#13384).
  
  2013-07-18 Lars Magne Ingebrigtsen <address@hidden>
   * gnus-start.el (gnus-clean-old-newsrc): Remove the newsrc cleanups
   that were only relevant in a development version a long time ago.
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/gnus.texi             gnus.texi-20091113204419-o5vbwnq5f7feedwu-6305
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/gnus-art.el          gnusart.el-20091113204419-o5vbwnq5f7feedwu-1108
  lisp/gnus/gnus-start.el        
gnusstart.el-20091113204419-o5vbwnq5f7feedwu-1136

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-07-08 23:51:26 +0000
+++ b/doc/misc/ChangeLog        2013-07-19 14:50:21 +0000
@@ -1,3 +1,7 @@
+2013-07-19  Geoff Kuenning  <address@hidden>  (tiny change)
+
+       * gnus.texi (Customizing Articles): Document function predicates.
+
 2013-07-08  Tassilo Horn  <address@hidden>
 
        * gnus.texi (lines): Correct description of

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2013-07-08 23:51:26 +0000
+++ b/doc/misc/gnus.texi        2013-07-19 14:50:21 +0000
@@ -11858,6 +11858,11 @@
     (typep "text/x-vcard"))
 @end lisp
 
address@hidden
+A function: the function is called with no arguments and should return
address@hidden or address@hidden  The current article is available in the
+buffer named by @code{gnus-article-buffer}.
+
 @end enumerate
 
 You may have noticed that the word @dfn{part} is used here.  This refers

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-07-18 11:26:04 +0000
+++ b/lisp/gnus/ChangeLog       2013-07-19 14:50:21 +0000
@@ -1,3 +1,13 @@
+2013-07-19  Geoff Kuenning  <address@hidden>  (tiny change)
+
+       * gnus-art.el (gnus-treat-predicate): Allow functions as predicates
+       (bug#13384).
+
+2013-07-18  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * gnus-start.el (gnus-clean-old-newsrc): Remove the newsrc cleanups
+       that were only relevant in a development version a long time ago.
+
 2013-07-18  Katsumi Yamaoka  <address@hidden>
 
        * gnus-art.el (gnus-shr-put-image): Make it work as well for shr.el's

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2013-07-18 11:26:04 +0000
+++ b/lisp/gnus/gnus-art.el     2013-07-19 14:50:21 +0000
@@ -8419,6 +8419,8 @@
        (not (gnus-treat-predicate (car val))))
        ((eq pred 'typep)
        (equal (car val) gnus-treat-type))
+       ((functionp pred)
+       (funcall pred))
        (t
        (error "%S is not a valid predicate" pred)))))
    ((eq val t)

=== modified file 'lisp/gnus/gnus-start.el'
--- a/lisp/gnus/gnus-start.el   2013-07-10 22:17:07 +0000
+++ b/lisp/gnus/gnus-start.el   2013-07-19 14:50:21 +0000
@@ -2305,24 +2305,8 @@
       (gnus-clean-old-newsrc))))
 
 (defun gnus-clean-old-newsrc (&optional force)
-  (when gnus-newsrc-file-version
-    ;; Remove totally bogus `unexists' entries.  The name is
-    ;; `unexist'.
-    (dolist (info (cdr gnus-newsrc-alist))
-      (let ((exist (assoc 'unexists (gnus-info-marks info))))
-       (when exist
-         (gnus-info-set-marks
-          info (delete exist (gnus-info-marks info))))))
-    (when (or force
-             (not (string= gnus-newsrc-file-version gnus-version)))
-      (message (concat "Removing unexist marks because newsrc "
-                      "version does not match Gnus version."))
-      ;; Remove old `exist' marks from old nnimap groups.
-      (dolist (info (cdr gnus-newsrc-alist))
-       (let ((exist (assoc 'unexist (gnus-info-marks info))))
-         (when exist
-           (gnus-info-set-marks
-            info (delete exist (gnus-info-marks info)))))))))
+  ;; Currently no cleanups.
+  )
 
 (defun gnus-convert-old-newsrc ()
   "Convert old newsrc formats into the current format, if needed."