Mercurial > emacs
comparison lisp/gnus/gnus-start.el @ 91239:2fcaae6177a5
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 16 Dec 2007 05:08:49 +0000 |
parents | 53108e6cea98 f6f228f943b2 |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
91238:5cf14a2107b5 | 91239:2fcaae6177a5 |
---|---|
2392 (condition-case type | 2392 (condition-case type |
2393 (let ((form (read (current-buffer)))) | 2393 (let ((form (read (current-buffer)))) |
2394 (eval form)) | 2394 (eval form)) |
2395 (error | 2395 (error |
2396 (unless (eq (car type) 'end-of-file) | 2396 (unless (eq (car type) 'end-of-file) |
2397 (let ((error (format "Error in %s line %d" file | 2397 (let ((errmsg (format "Error in %s line %d" file |
2398 (count-lines (point-min) (point))))) | 2398 (count-lines (point-min) (point))))) |
2399 (ding) | 2399 (ding) |
2400 (unless (gnus-yes-or-no-p (concat error "; continue? ")) | 2400 (unless (gnus-yes-or-no-p (concat errmsg "; continue? ")) |
2401 (error "%s" error))))))))) | 2401 (error "%s" errmsg))))))))) |
2402 | 2402 |
2403 (defun gnus-read-newsrc-el-file (file) | 2403 (defun gnus-read-newsrc-el-file (file) |
2404 (let ((ding-file (concat file "d"))) | 2404 (let ((ding-file (concat file "d"))) |
2405 (when (file-exists-p ding-file) | 2405 (when (file-exists-p ding-file) |
2406 ;; We always, always read the .eld file. | 2406 ;; We always, always read the .eld file. |