aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReiner Steib2007-12-06 20:04:55 +0000
committerReiner Steib2007-12-06 20:04:55 +0000
commitaf5370adb4887d65416f7792476ab47cd9ec92e7 (patch)
tree50e5e4417dcdc2c49e90c6bed793547574f56d56
parentd8c47d3c575ee8561e1e65c7a2366047702ac5d2 (diff)
downloademacs-af5370adb4887d65416f7792476ab47cd9ec92e7.tar.gz
emacs-af5370adb4887d65416f7792476ab47cd9ec92e7.zip
(gnus-load): Rename local variable to avoid confusion.
-rw-r--r--lisp/gnus/ChangeLog4
-rw-r--r--lisp/gnus/gnus-start.el8
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 @@
12007-12-06 Reiner Steib <Reiner.Steib@gmx.de>
2
3 * gnus-start.el (gnus-load): Rename local variable to avoid confusion.
4
12007-12-06 D. Goel <deego3@gmail.com> 52007-12-06 D. Goel <deego3@gmail.com>
2 * gnus-start.el (gnus-load): Fix breakage from last change. 6 * gnus-start.el (gnus-load): Fix breakage from last change.
3 7
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."
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 ((errmsg (format "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 errmsg "; continue? "))
2399 (error "%s" error))))))))) 2399 (error "%s" errmsg)))))))))
2400 2400
2401(defun gnus-read-newsrc-el-file (file) 2401(defun gnus-read-newsrc-el-file (file)
2402 (let ((ding-file (concat file "d"))) 2402 (let ((ding-file (concat file "d")))