From 23f3a1407c9af51d95ee3d6f885be5ae11cf0f35 Mon Sep 17 00:00:00 2001 From: Deepak Goel Date: Thu, 6 Dec 2007 17:19:22 +0000 Subject: [PATCH] Merge gnus-art.el and gnus-start.el after fixing buggy `error' calls. --- lisp/gnus/gnus-art.el | 2 +- lisp/gnus/gnus-start.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 4bb9ceb97ba..5e23b5313fc 100644 --- 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 7d6b91366e6..ca906d2d258 100644 --- 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))))))))) -- 2.39.2