diff options
| author | Deepak Goel | 2007-12-06 17:19:22 +0000 |
|---|---|---|
| committer | Deepak Goel | 2007-12-06 17:19:22 +0000 |
| commit | 23f3a1407c9af51d95ee3d6f885be5ae11cf0f35 (patch) | |
| tree | bd123f7d4b93531d6ae77f02aece163e3d4e54de | |
| parent | fd0c71e869db245bf4304373b6dd5ec5160b8642 (diff) | |
| download | emacs-23f3a1407c9af51d95ee3d6f885be5ae11cf0f35.tar.gz emacs-23f3a1407c9af51d95ee3d6f885be5ae11cf0f35.zip | |
Merge gnus-art.el and gnus-start.el after fixing buggy `error' calls.
| -rw-r--r-- | lisp/gnus/gnus-art.el | 2 | ||||
| -rw-r--r-- | 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." | |||
| 3402 | ":" | 3402 | ":" |
| 3403 | (format "%02d" (nth 1 dtime))))))) | 3403 | (format "%02d" (nth 1 dtime))))))) |
| 3404 | (error | 3404 | (error |
| 3405 | (format "Date: %s (from Gnus)" date)))) | 3405 | "Date: %s (from Gnus)" date))) |
| 3406 | 3406 | ||
| 3407 | (defun article-date-local (&optional highlight) | 3407 | (defun article-date-local (&optional highlight) |
| 3408 | "Convert the current article date to the local timezone." | 3408 | "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." | |||
| 2392 | (eval form)) | 2392 | (eval form)) |
| 2393 | (error | 2393 | (error |
| 2394 | (unless (eq (car type) 'end-of-file) | 2394 | (unless (eq (car type) 'end-of-file) |
| 2395 | (let ((error (format "Error in %s line %d" file | 2395 | (let ((error "Error in %s line %d" file |
| 2396 | (count-lines (point-min) (point))))) | 2396 | (count-lines (point-min (point))))) |
| 2397 | (ding) | 2397 | (ding) |
| 2398 | (unless (gnus-yes-or-no-p (concat error "; continue? ")) | 2398 | (unless (gnus-yes-or-no-p (concat error "; continue? ")) |
| 2399 | (error "%s" error))))))))) | 2399 | (error "%s" error))))))))) |