diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2012-09-03 22:12:02 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2012-09-03 22:12:02 +0000 |
| commit | 8a8507e9b726ac9eb347270b04cb9daafb093cbe (patch) | |
| tree | 409439a805e55c0baaca28b2648e8da36713fea9 /lisp/gnus | |
| parent | d42f4f0fb374051f2f80228821e5c0b824451807 (diff) | |
| download | emacs-8a8507e9b726ac9eb347270b04cb9daafb093cbe.tar.gz | |
[Gnus] Silence XEmacs compilation warnings
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/gnus/gnus-fun.el | 4 | ||||
| -rw-r--r-- | lisp/gnus/gnus-notifications.el | 16 |
3 files changed, 24 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index a4e3d9bde2b..37d89ba8cad 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,12 @@ +2012-09-03 Lars Ingebrigtsen <larsi@gnus.org> + + * dgnushack.el: XEmacs 21.5 compilation fix. + + * gnus-notifications.el (gnus-notifications-notify): Use it. + + * gnus-fun.el (gnus-funcall-no-warning): New function to silence + warnings on XEmacs. + 2012-09-01 Paul Eggert <eggert@cs.ucla.edu> Better seeds for (random). diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el index f33eb910c6a..f5e1c5ad691 100644 --- a/lisp/gnus/gnus-fun.el +++ b/lisp/gnus/gnus-fun.el @@ -278,6 +278,10 @@ colors of the displayed X-Faces." values)) (mapconcat 'identity values " "))) +(defun gnus-funcall-no-warning (function &rest args) + (when (fboundp function) + (apply function args))) + (provide 'gnus-fun) ;;; gnus-fun.el ends here diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el index c5129958997..f9c2d309a35 100644 --- a/lisp/gnus/gnus-notifications.el +++ b/lisp/gnus/gnus-notifications.el @@ -29,13 +29,16 @@ ;;; Code: -(require 'notifications nil t) +(ignore-errors + (require 'notifications)) (require 'gnus-sum) (require 'gnus-group) (require 'gnus-int) (require 'gnus-art) (require 'gnus-util) -(require 'google-contacts nil t) ; Optional +(ignore-errors + (require 'google-contacts)) ; Optional +(require 'gnus-fun) (defgroup gnus-notifications nil "Send notifications on new message in Gnus." @@ -81,12 +84,14 @@ not get notifications." "Send a notification about a new mail. Return a notification id if any, or t on success." (if (fboundp 'notifications-notify) - (notifications-notify + (gnus-funcall-no-warning + 'notifications-notify :title from :body subject :actions '("read" "Read") :on-action 'gnus-notifications-action - :app-icon (image-search-load-path "gnus/gnus.png") + :app-icon (gnus-funcall-no-warning + 'image-search-load-path "gnus/gnus.png") :app-name "Gnus" :category "email.arrived" :timeout gnus-notifications-timeout @@ -100,7 +105,8 @@ Return a notification id if any, or t on success." (let ((google-photo (when (and gnus-notifications-use-google-contacts (fboundp 'google-contacts-get-photo)) (ignore-errors - (google-contacts-get-photo mail-address))))) + (gnus-funcall-no-warning + 'google-contacts-get-photo mail-address))))) (if google-photo google-photo (when gnus-notifications-use-gravatar |