diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-29 01:09:50 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-29 01:09:50 +0000 |
| commit | 0c43b6f8d5d1458b51dc144efca682c811ebfc44 (patch) | |
| tree | c457f4d674ce6623bfbf5134e986afab162dc39d /lisp/gnus/nnrss.el | |
| parent | a6f3211f1090a904aaa81c388fbae7b560794432 (diff) | |
| download | emacs-0c43b6f8d5d1458b51dc144efca682c811ebfc44.tar.gz emacs-0c43b6f8d5d1458b51dc144efca682c811ebfc44.tar.bz2 emacs-0c43b6f8d5d1458b51dc144efca682c811ebfc44.zip | |
Remove Emacs 21 stuff.
mm-util.el (mm-codepage-iso-8859-list, mm-charset-eval-alist, mm-mime-charset): Comment fix.
rfc2047.el (rfc2047-syntax-table): Comment fix.
utf7.el (utf7-utf-16-coding-system): Comment fix.
nnrss.el (nnrss-read-server-data, nnrss-read-group-data): Use `load' rather than `insert-file-contents' and `eval-region'.
pgg.el (pgg-run-at-time-1): Define it for XEmacs only; fix if/else construction.
time-date.el: No need to require cl for Emacs 21.
Diffstat (limited to 'lisp/gnus/nnrss.el')
| -rw-r--r-- | lisp/gnus/nnrss.el | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 379fee2eb8f..aa3b79a1022 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -561,12 +561,7 @@ which RSS 2.0 allows." (let ((file (nnrss-make-filename "nnrss" server)) (file-name-coding-system nnmail-pathname-coding-system)) (when (file-exists-p file) - ;; In Emacs 21.3 and earlier, `load' doesn't support non-ASCII - ;; file names. So, we use `insert-file-contents' instead. - (mm-with-multibyte-buffer - (let ((coding-system-for-read nnrss-file-coding-system)) - (insert-file-contents file) - (eval-region (point-min) (point-max))))))) + (load file nil t t)))) (defun nnrss-save-server-data (server) (gnus-make-directory nnrss-directory) @@ -590,12 +585,7 @@ which RSS 2.0 allows." (let ((file (nnrss-make-filename group server)) (file-name-coding-system nnmail-pathname-coding-system)) (when (file-exists-p file) - ;; In Emacs 21.3 and earlier, `load' doesn't support non-ASCII - ;; file names. So, we use `insert-file-contents' instead. - (mm-with-multibyte-buffer - (let ((coding-system-for-read nnrss-file-coding-system)) - (insert-file-contents file) - (eval-region (point-min) (point-max)))) + (load file nil t t) (dolist (e nnrss-group-data) (puthash (nth 9 e) t nnrss-group-hashtb) (when (and (car e) (> nnrss-group-min (car e))) |