diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-04-13 18:46:06 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-04-13 18:46:06 -0700 |
| commit | 35dc09a19c606f9e7a078df32d030451c7c90ba1 (patch) | |
| tree | 8df2ade99ad8620568094d61bba9dd4ac8856c43 /lisp/gnus/gnus-start.el | |
| parent | 327732d994c98849c765659aa2164a7482b6beab (diff) | |
| parent | ad3a2b411dc2b34f5d6fa434aee3ca56fa7a88e7 (diff) | |
| download | emacs-35dc09a19c606f9e7a078df32d030451c7c90ba1.tar.gz | |
Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org
Diffstat (limited to 'lisp/gnus/gnus-start.el')
| -rw-r--r-- | lisp/gnus/gnus-start.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index bb7dd76d590..f025960c348 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -2442,7 +2442,9 @@ If FORCE is non-nil, the .newsrc file is read." (when gnus-newsrc-assoc (setq gnus-newsrc-alist gnus-newsrc-assoc)))) (dolist (elem gnus-newsrc-alist) - (setcar elem (mm-string-as-unibyte (car elem)))) + ;; Protect against broken .newsrc.el files. + (when (car elem) + (setcar elem (mm-string-as-unibyte (car elem))))) (gnus-make-hashtable-from-newsrc-alist) (when (file-newer-than-file-p file ding-file) ;; Old format quick file |