Merge gnus-art.el and gnus-start.el after fixing buggy `error' calls.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 4bb9ceb97ba84d86ad9bb1f738fbc97d9e864d57..5e23b5313fc066eaff278499a45e1741b13cc39d 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3402,7 +3402,7 @@ should replace the \"Date:\" one, or should be added below it."
             ":"
             (format "%02d" (nth 1 dtime)))))))
     (error
-     (format "Date: %s (from Gnus)" date))))
+     "Date: %s (from Gnus)" date)))
 
 (defun article-date-local (&optional highlight)
   "Convert the current article date to the local timezone."

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 7d6b91366e6596691eb375bf7029927ac9f03abd..ca906d2d258f099dd7de581c5ccad64d81ff1b54 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2392,8 +2392,8 @@ If FORCE is non-nil, the .newsrc file is read."
            (eval form))
        (error
         (unless (eq (car type) 'end-of-file)
-          (let ((error (format "Error in %s line %d" file
-                               (count-lines (point-min) (point)))))
+          (let ((error "Error in %s line %d" file
+                               (count-lines (point-min (point)))))
             (ding)
             (unless (gnus-yes-or-no-p (concat error "; continue? "))
               (error "%s" error)))))))))