Mercurial > emacs
changeset 87136:00b588069d34
Merge gnus-art.el and gnus-start.el after fixing buggy `error' calls.
| author | Deepak Goel <deego@gnufans.org> |
|---|---|
| date | Thu, 06 Dec 2007 17:19:22 +0000 |
| parents | 04590cd6c71c |
| children | 1d87492bc6e0 |
| files | lisp/gnus/gnus-art.el lisp/gnus/gnus-start.el |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/gnus-art.el Thu Dec 06 17:18:13 2007 +0000 +++ b/lisp/gnus/gnus-art.el Thu Dec 06 17:19:22 2007 +0000 @@ -3402,7 +3402,7 @@ ":" (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."
--- a/lisp/gnus/gnus-start.el Thu Dec 06 17:18:13 2007 +0000 +++ b/lisp/gnus/gnus-start.el Thu Dec 06 17:19:22 2007 +0000 @@ -2392,8 +2392,8 @@ (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)))))))))