(gnus-update-format-specifications): Force update format specifications, when

differ `gnus-version' and `gnus-newsrc-file-version' instead of `gnus-version'
and `gnus-vertsion' in `gnus-format-specs'.
Do not add `gnus-version' into `gnus-format-specs'.
(gnus-compile): Remove `gnus-version' from `gnus-format-specs'.

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 3fecea1..e625e2d 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -170,8 +170,7 @@
   (when (or force
            (not (equal emacs-version
                        (cdr (assq 'version gnus-format-specs))))
-           (not (equal gnus-version
-                       (cdr (assq 'gnus-version gnus-format-specs)))))
+           (not (equal gnus-version gnus-newsrc-file-version)))
     (message "%s" "Force update format specs.")
     (setq gnus-format-specs nil))
 
@@ -215,9 +214,7 @@
          (set (intern (format "gnus-%s-line-format-spec" type)) val)))))
 
   (unless (assq 'version gnus-format-specs)
-    (push (cons 'version emacs-version) gnus-format-specs))
-  (unless (assq 'gnus-version gnus-format-specs)
-    (push (cons 'gnus-version gnus-version) gnus-format-specs)))
+    (push (cons 'version emacs-version) gnus-format-specs)))
 
 (defvar gnus-mouse-face-0 'highlight)
 (defvar gnus-mouse-face-1 'highlight)
@@ -533,7 +530,7 @@ If PROPS, insert the result."
 
       (while entries
        (setq entry (pop entries))
-       (if (eq (car entry) 'version)
+       (if (memq (car entry) '(version gnus-version))
            (setq gnus-format-specs (delq entry gnus-format-specs))
          (let ((form (caddr entry)))
            (when (and (listp form)