Merge remote-tracking branch 'origin/no-gnus'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bdb9f3..c97bb93 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -24,6 +24,8 @@
 
 2012-02-08  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * dgnushack.el: Fix XEmacs compilation warning.
+
        * shr.el: Inhibit getting and sending cookies when fetching pictures.
 
        * gnus-html.el (gnus-html-schedule-image-fetching): Ditto.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 4a8f02d..3defe55 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -150,7 +150,8 @@
     (unless (fboundp 'url-retrieve-synchronously)
       (defalias 'url-retrieve-synchronously 'url-retrieve))
     (unless (fboundp 'url-queue-retrieve)
-      (defun url-queue-retrieve (url callback &optional cbargs silent)
+      (defun url-queue-retrieve (url callback &optional cbargs silent
+                                    inhibit-cookies)
        (url-retrieve url callback cbargs)))
     (autoload 'Info-directory "info" nil t)
     (autoload 'Info-index "info" nil t)