Commit 23f3a140 authored by Deepak Goel's avatar Deepak Goel
Browse files

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

parent fd0c71e8
......@@ -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."
......
......@@ -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)))))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment