[gnus git] branch master updated: n0-13-134-g2d826b7 =3= Require mouse, which the build bot seems to say is needed. ; Use `url-retrieve' on XEmacs, since it doesn't have url-retrieve-synchronously. ; (format-seconds): Use assoc instead of assoc-string, since assoc-string doesn't exist in XEmacs.

       via  2d826b740684c249414dcb3611510b6e5e422a08 (commit)
       via  426b997612c057fd38de201db7ea03e46e8f1c5f (commit)
       via  1225a5c2546cffaab4efae846b48cee5a5203852 (commit)
      from  815377671559a047a77ff4788596ee3b5c253e7e (commit)


- Log -----------------------------------------------------------------
commit 2d826b740684c249414dcb3611510b6e5e422a08
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Mar 17 19:55:35 2011 +0100

    Require mouse, which the build bot seems to say is needed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43f3719..e2cde44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-17  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* gnus-art.el: Require mouse, which the build bot seems to say is
+	needed.
+
 	* dgnushack.el: Define url-retrieve-synchronously unless not defined.
 
 	* gravatar.el (gravatar-retrieve-synchronously): Use `url-retrieve' on
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index b994a28..7c7e053 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -44,6 +44,7 @@
 (require 'wid-edit)
 (require 'mm-uu)
 (require 'message)
+(require 'mouse)
 
 (autoload 'gnus-msg-mail "gnus-msg" nil t)
 (autoload 'gnus-button-mailto "gnus-msg")

commit 426b997612c057fd38de201db7ea03e46e8f1c5f
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Mar 17 19:53:07 2011 +0100

    Use `url-retrieve' on XEmacs, since it doesn't have url-retrieve-synchronously.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3e0f6d..43f3719 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2011-03-17  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* dgnushack.el: Define url-retrieve-synchronously unless not defined.
+
+	* gravatar.el (gravatar-retrieve-synchronously): Use `url-retrieve' on
+	XEmacs, since it doesn't have url-retrieve-synchronously.
+
 	* time-date.el (format-seconds): Use assoc instead of assoc-string,
 	since assoc-string doesn't exist in XEmacs.
 
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index d5f8d01..9fa42d3 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -137,6 +137,8 @@
     (autoload 'iswitchb-read-buffer "iswitchb")
     (autoload 'netrc-credentials "netrc")
     (defalias 'x-defined-colors 'ignore)
+    (unless (fboundp 'url-retrieve-synchronously)
+      (defalias 'url-retrieve-synchronously 'url-retrieve))
     (defalias 'read-color 'ignore)))
 
 (eval-and-compile
diff --git a/lisp/gravatar.el b/lisp/gravatar.el
index 0c97080..4b0c9a1 100644
--- a/lisp/gravatar.el
+++ b/lisp/gravatar.el
@@ -129,7 +129,9 @@ You can provide a list of argument to pass to CB in CBARGS."
   "Retrieve MAIL-ADDRESS gravatar and returns it."
   (let ((url (gravatar-build-url mail-address)))
     (if (gravatar-cache-expired url)
-        (with-current-buffer (url-retrieve-synchronously url)
+        (with-current-buffer (if (featurep 'xemacs)
+				 (url-retrieve url)
+			       (url-retrieve-synchronously url))
           (when gravatar-automatic-caching
             (url-store-in-cache (current-buffer)))
           (let ((data (gravatar-data->image)))

commit 1225a5c2546cffaab4efae846b48cee5a5203852
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Mar 17 19:47:17 2011 +0100

    (format-seconds): Use assoc instead of assoc-string, since assoc-string doesn't exist in XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4463ba..a3e0f6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-17  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* time-date.el (format-seconds): Use assoc instead of assoc-string,
+	since assoc-string doesn't exist in XEmacs.
+
 2011-03-17  Antoine Levitt  <[email protected]>
 
 	* gnus-group.el (gnus-group-list-ticked): New function.
diff --git a/lisp/time-date.el b/lisp/time-date.el
index a1bfad3..3e59534 100644
--- a/lisp/time-date.el
+++ b/lisp/time-date.el
@@ -308,11 +308,7 @@ This function does not work for SECONDS greater than `most-positive-fixnum'."
       (setq start (match-end 0)
             spec (match-string 1 string))
       (unless (string-equal spec "%")
-	;; `assoc-string' is not available in XEmacs.  So when compiling
-	;; Gnus (`time-date.el' is part of Gnus) with XEmacs, we get
-	;; a warning here.  But `format-seconds' is not used anywhere in
-	;; Gnus so it's not a real problem. --rsteib
-        (or (setq match (assoc-string spec units t))
+        (or (setq match (assoc (downcase spec) units))
             (error "Bad format specifier: `%s'" spec))
         (if (assoc-string spec usedunits t)
             (error "Multiple instances of specifier: `%s'" spec))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog    |   13 +++++++++++++
 lisp/dgnushack.el |    2 ++
 lisp/gnus-art.el  |    1 +
 lisp/gravatar.el  |    6 ++++--
 lisp/time-date.el |    6 +-----
 5 files changed, 21 insertions(+), 7 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project