diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/gnus-start.el | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index df1865b2767..afcb487bd1e 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2007-12-06 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus-start.el (gnus-load): Rename local variable to avoid confusion. + 2007-12-06 D. Goel <deego3@gmail.com> * gnus-start.el (gnus-load): Fix breakage from last change. diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 0b8a9cea67d..100c28b9e80 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -2392,11 +2392,11 @@ 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 ((errmsg (format "Error in %s line %d" file + (count-lines (point-min (point)))))) (ding) - (unless (gnus-yes-or-no-p (concat error "; continue? ")) - (error "%s" error))))))))) + (unless (gnus-yes-or-no-p (concat errmsg "; continue? ")) + (error "%s" errmsg))))))))) (defun gnus-read-newsrc-el-file (file) (let ((ding-file (concat file "d"))) |