From: Glenn Morris Date: Mon, 1 Nov 2010 02:38:33 +0000 (-0700) Subject: Silence nnir.el compilation. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~422^2~17 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e195d639a54c5a03dff4b55485414c1855703ebd;p=emacs.git Silence nnir.el compilation. * lisp/gnus/nnir.el (declare-function): Add compat stub. (mm-url-insert, mm-url-encode-www-form-urlencoded): Declare. (nnir-run-gmane): Require 'mm-url. --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index cd87019dd14..37c262ad3d0 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,5 +1,9 @@ 2010-11-01 Glenn Morris + * nnir.el (declare-function): Add compat stub. + (mm-url-insert, mm-url-encode-www-form-urlencoded): Declare. + (nnir-run-gmane): Require 'mm-url. + * mm-util.el (mm-string-to-multibyte): Simplify. * shr.el (declare-function): Add compat stub. diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 3e00158aad7..073df1928bc 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -164,6 +164,10 @@ ;;; Setup Code: +;; For Emacs <22.2 and XEmacs. +(eval-and-compile + (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) + (require 'nnoo) (require 'gnus-group) (require 'gnus-sum) @@ -1382,6 +1386,9 @@ Tested with Namazu 2.0.6 on a GNU/Linux system." artlist))) grouplist)))) +(declare-function mm-url-insert "mm-url" (url &optional follow-refresh)) +(declare-function mm-url-encode-www-form-urlencoded "mm-url" (pairs)) + ;; gmane interface (defun nnir-run-gmane (query srv &optional groups) "Run a search against a gmane back-end server." @@ -1401,6 +1408,7 @@ Tested with Namazu 2.0.6 on a GNU/Linux system." (search (format "%s %s %s" qstring groupspec authorspec)) artlist) + (require 'mm-url) (with-current-buffer nntp-server-buffer (erase-buffer) (mm-url-insert