diff options
| author | Glenn Morris | 2016-01-28 21:16:12 -0500 |
|---|---|---|
| committer | Glenn Morris | 2016-01-28 21:16:12 -0500 |
| commit | 487bd7aedf9bbbf0b939b653912253fbeb7d16b9 (patch) | |
| tree | d95c7d708982087963dede6a31db6b702c59254a | |
| parent | c3a2eded19fff4733a7ae15823808e80f9f188fb (diff) | |
| download | emacs-487bd7aedf9bbbf0b939b653912253fbeb7d16b9.tar.gz emacs-487bd7aedf9bbbf0b939b653912253fbeb7d16b9.zip | |
Remove some useless-use-of eval.
* lisp/gnus/gnus.el (gnus-load-hook): Don't use eval.
* lisp/gnus/nnrss.el (xml): Simply require it.
(xml-rpc-method-call): Use declare-function.
| -rw-r--r-- | lisp/gnus/gnus.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nnrss.el | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 5d2ce7ee19f..996bb9e6b7b 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | ;;; Code: | 28 | ;;; Code: |
| 29 | 29 | ||
| 30 | (eval '(run-hooks 'gnus-load-hook)) | 30 | (run-hooks 'gnus-load-hook) |
| 31 | 31 | ||
| 32 | (eval-when-compile (require 'cl)) | 32 | (eval-when-compile (require 'cl)) |
| 33 | (require 'wid-edit) | 33 | (require 'wid-edit) |
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index c17a13c54c3..bef8203ef27 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el | |||
| @@ -37,10 +37,7 @@ | |||
| 37 | (require 'mm-url) | 37 | (require 'mm-url) |
| 38 | (require 'rfc2047) | 38 | (require 'rfc2047) |
| 39 | (require 'mml) | 39 | (require 'mml) |
| 40 | (eval-when-compile | 40 | (require 'xml) |
| 41 | (ignore-errors | ||
| 42 | (require 'xml))) | ||
| 43 | (eval '(require 'xml)) | ||
| 44 | 41 | ||
| 45 | (nnoo-declare nnrss) | 42 | (nnoo-declare nnrss) |
| 46 | 43 | ||
| @@ -372,8 +369,6 @@ for decoding when the cdr that the data specify is not available.") | |||
| 372 | (nnoo-define-skeleton nnrss) | 369 | (nnoo-define-skeleton nnrss) |
| 373 | 370 | ||
| 374 | ;;; Internal functions | 371 | ;;; Internal functions |
| 375 | (eval-when-compile (defun xml-rpc-method-call (&rest args))) | ||
| 376 | |||
| 377 | (defun nnrss-get-encoding () | 372 | (defun nnrss-get-encoding () |
| 378 | "Return an encoding attribute specified in the current xml contents. | 373 | "Return an encoding attribute specified in the current xml contents. |
| 379 | If `nnrss-compatible-encoding-alist' specifies the compatible encoding, | 374 | If `nnrss-compatible-encoding-alist' specifies the compatible encoding, |
| @@ -959,6 +954,9 @@ Use Mark Pilgrim's `ultra-liberal rss locator'." | |||
| 959 | ;; 4. check syndic8 | 954 | ;; 4. check syndic8 |
| 960 | (nnrss-find-rss-via-syndic8 url)))))))) | 955 | (nnrss-find-rss-via-syndic8 url)))))))) |
| 961 | 956 | ||
| 957 | (declare-function xml-rpc-method-call "ext:xml-rpc" | ||
| 958 | (server-url method &rest params)) | ||
| 959 | |||
| 962 | (defun nnrss-find-rss-via-syndic8 (url) | 960 | (defun nnrss-find-rss-via-syndic8 (url) |
| 963 | "Query syndic8 for the rss feeds it has for URL." | 961 | "Query syndic8 for the rss feeds it has for URL." |
| 964 | (if (not (locate-library "xml-rpc")) | 962 | (if (not (locate-library "xml-rpc")) |