aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-12 16:25:13 +1100
committerLars Ingebrigtsen2016-02-12 16:25:13 +1100
commita8480fbc5af63fd9c60e7a490f50bf9cf7117873 (patch)
treecd00ff43ac5828f97339ca40611a2b95323421f6
parent303390bda34f98b400798d5383cf0d722e35ba19 (diff)
downloademacs-a8480fbc5af63fd9c60e7a490f50bf9cf7117873.tar.gz
emacs-a8480fbc5af63fd9c60e7a490f50bf9cf7117873.zip
Avoid the obsoleted defmethod
* lisp/gnus/gnus-icalendar.el: Use cl-defmethod instead of defmethod.
-rw-r--r--lisp/gnus/gnus-icalendar.el32
1 files changed, 16 insertions, 16 deletions
diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el
index 1cf372a6af0..17faac451a6 100644
--- a/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/gnus-icalendar.el
@@ -119,17 +119,17 @@
119 nil 119 nil
120 "iCalendar class for REPLY events") 120 "iCalendar class for REPLY events")
121 121
122(defmethod gnus-icalendar-event:recurring-p ((event gnus-icalendar-event)) 122(cl-defmethod gnus-icalendar-event:recurring-p ((event gnus-icalendar-event))
123 "Return t if EVENT is recurring." 123 "Return t if EVENT is recurring."
124 (not (null (gnus-icalendar-event:recur event)))) 124 (not (null (gnus-icalendar-event:recur event))))
125 125
126(defmethod gnus-icalendar-event:recurring-freq ((event gnus-icalendar-event)) 126(cl-defmethod gnus-icalendar-event:recurring-freq ((event gnus-icalendar-event))
127 "Return recurring frequency of EVENT." 127 "Return recurring frequency of EVENT."
128 (let ((rrule (gnus-icalendar-event:recur event))) 128 (let ((rrule (gnus-icalendar-event:recur event)))
129 (string-match "FREQ=\\([[:alpha:]]+\\)" rrule) 129 (string-match "FREQ=\\([[:alpha:]]+\\)" rrule)
130 (match-string 1 rrule))) 130 (match-string 1 rrule)))
131 131
132(defmethod gnus-icalendar-event:recurring-interval ((event gnus-icalendar-event)) 132(cl-defmethod gnus-icalendar-event:recurring-interval ((event gnus-icalendar-event))
133 "Return recurring interval of EVENT." 133 "Return recurring interval of EVENT."
134 (let ((rrule (gnus-icalendar-event:recur event)) 134 (let ((rrule (gnus-icalendar-event:recur event))
135 (default-interval 1)) 135 (default-interval 1))
@@ -138,7 +138,7 @@
138 (or (match-string 1 rrule) 138 (or (match-string 1 rrule)
139 default-interval))) 139 default-interval)))
140 140
141(defmethod gnus-icalendar-event:start ((event gnus-icalendar-event)) 141(cl-defmethod gnus-icalendar-event:start ((event gnus-icalendar-event))
142 (format-time-string "%Y-%m-%d %H:%M" (gnus-icalendar-event:start-time event))) 142 (format-time-string "%Y-%m-%d %H:%M" (gnus-icalendar-event:start-time event)))
143 143
144(defun gnus-icalendar-event--decode-datefield (event field zone-map) 144(defun gnus-icalendar-event--decode-datefield (event field zone-map)
@@ -376,7 +376,7 @@ on the IDENTITIES list."
376(defvar gnus-icalendar-org-enabled-p nil) 376(defvar gnus-icalendar-org-enabled-p nil)
377 377
378 378
379(defmethod gnus-icalendar-event:org-repeat ((event gnus-icalendar-event)) 379(cl-defmethod gnus-icalendar-event:org-repeat ((event gnus-icalendar-event))
380 "Return `org-mode' timestamp repeater string for recurring EVENT. 380 "Return `org-mode' timestamp repeater string for recurring EVENT.
381Return nil for non-recurring EVENT." 381Return nil for non-recurring EVENT."
382 (when (gnus-icalendar-event:recurring-p event) 382 (when (gnus-icalendar-event:recurring-p event)
@@ -390,7 +390,7 @@ Return nil for non-recurring EVENT."
390 (when org-freq 390 (when org-freq
391 (format "+%s%s" (gnus-icalendar-event:recurring-interval event) org-freq))))) 391 (format "+%s%s" (gnus-icalendar-event:recurring-interval event) org-freq)))))
392 392
393(defmethod gnus-icalendar-event:org-timestamp ((event gnus-icalendar-event)) 393(cl-defmethod gnus-icalendar-event:org-timestamp ((event gnus-icalendar-event))
394 "Build `org-mode' timestamp from EVENT start/end dates and recurrence info." 394 "Build `org-mode' timestamp from EVENT start/end dates and recurrence info."
395 (let* ((start (gnus-icalendar-event:start-time event)) 395 (let* ((start (gnus-icalendar-event:start-time event))
396 (end (gnus-icalendar-event:end-time event)) 396 (end (gnus-icalendar-event:end-time event))
@@ -447,7 +447,7 @@ Return nil for non-recurring EVENT."
447 (mapconcat #'identity participants ", ")) 447 (mapconcat #'identity participants ", "))
448 448
449;; TODO: make the template customizable 449;; TODO: make the template customizable
450(defmethod gnus-icalendar-event->org-entry ((event gnus-icalendar-event) reply-status) 450(cl-defmethod gnus-icalendar-event->org-entry ((event gnus-icalendar-event) reply-status)
451 "Return string with new `org-mode' entry describing EVENT." 451 "Return string with new `org-mode' entry describing EVENT."
452 (with-temp-buffer 452 (with-temp-buffer
453 (org-mode) 453 (org-mode)
@@ -640,12 +640,12 @@ is searched."
640 640
641 (org-agenda-list nil (gnus-icalendar-event:start event) duration-days))) 641 (org-agenda-list nil (gnus-icalendar-event:start event) duration-days)))
642 642
643(defmethod gnus-icalendar-event:sync-to-org ((event gnus-icalendar-event-request) reply-status) 643(cl-defmethod gnus-icalendar-event:sync-to-org ((event gnus-icalendar-event-request) reply-status)
644 (if (gnus-icalendar-find-org-event-file event) 644 (if (gnus-icalendar-find-org-event-file event)
645 (gnus-icalendar--update-org-event event reply-status) 645 (gnus-icalendar--update-org-event event reply-status)
646 (gnus-icalendar:org-event-save event reply-status))) 646 (gnus-icalendar:org-event-save event reply-status)))
647 647
648(defmethod gnus-icalendar-event:sync-to-org ((event gnus-icalendar-event-cancel) reply-status) 648(cl-defmethod gnus-icalendar-event:sync-to-org ((event gnus-icalendar-event-cancel) reply-status)
649 (when (gnus-icalendar-find-org-event-file event) 649 (when (gnus-icalendar-find-org-event-file event)
650 (gnus-icalendar--cancel-org-event event))) 650 (gnus-icalendar--cancel-org-event event)))
651 651
@@ -712,7 +712,7 @@ These will be used to retrieve the RSVP information from ical events."
712 (mapcar #'regexp-quote gnus-icalendar-additional-identities))))) 712 (mapcar #'regexp-quote gnus-icalendar-additional-identities)))))
713 713
714;; TODO: make the template customizable 714;; TODO: make the template customizable
715(defmethod gnus-icalendar-event->gnus-calendar ((event gnus-icalendar-event) &optional reply-status) 715(cl-defmethod gnus-icalendar-event->gnus-calendar ((event gnus-icalendar-event) &optional reply-status)
716 "Format an overview of EVENT details." 716 "Format an overview of EVENT details."
717 (gmm-labels ((format-header (x) 717 (gmm-labels ((format-header (x)
718 (format "%-12s%s" 718 (format "%-12s%s"
@@ -818,27 +818,27 @@ These will be used to retrieve the RSVP information from ical events."
818(defun gnus-icalendar-sync-event-to-org (event) 818(defun gnus-icalendar-sync-event-to-org (event)
819 (gnus-icalendar-event:sync-to-org event gnus-icalendar-reply-status)) 819 (gnus-icalendar-event:sync-to-org event gnus-icalendar-reply-status))
820 820
821(defmethod gnus-icalendar-event:inline-reply-buttons ((event gnus-icalendar-event) handle) 821(cl-defmethod gnus-icalendar-event:inline-reply-buttons ((event gnus-icalendar-event) handle)
822 (when (gnus-icalendar-event:rsvp event) 822 (when (gnus-icalendar-event:rsvp event)
823 `(("Accept" gnus-icalendar-reply (,handle accepted ,event)) 823 `(("Accept" gnus-icalendar-reply (,handle accepted ,event))
824 ("Tentative" gnus-icalendar-reply (,handle tentative ,event)) 824 ("Tentative" gnus-icalendar-reply (,handle tentative ,event))
825 ("Decline" gnus-icalendar-reply (,handle declined ,event))))) 825 ("Decline" gnus-icalendar-reply (,handle declined ,event)))))
826 826
827(defmethod gnus-icalendar-event:inline-reply-buttons ((event gnus-icalendar-event-reply) handle) 827(cl-defmethod gnus-icalendar-event:inline-reply-buttons ((event gnus-icalendar-event-reply) handle)
828 "No buttons for REPLY events." 828 "No buttons for REPLY events."
829 nil) 829 nil)
830 830
831(defmethod gnus-icalendar-event:inline-reply-status ((event gnus-icalendar-event)) 831(cl-defmethod gnus-icalendar-event:inline-reply-status ((event gnus-icalendar-event))
832 (or (when gnus-icalendar-org-enabled-p 832 (or (when gnus-icalendar-org-enabled-p
833 (gnus-icalendar--get-org-event-reply-status event)) 833 (gnus-icalendar--get-org-event-reply-status event))
834 "Not replied yet")) 834 "Not replied yet"))
835 835
836(defmethod gnus-icalendar-event:inline-reply-status ((event gnus-icalendar-event-reply)) 836(cl-defmethod gnus-icalendar-event:inline-reply-status ((event gnus-icalendar-event-reply))
837 "No reply status for REPLY events." 837 "No reply status for REPLY events."
838 nil) 838 nil)
839 839
840 840
841(defmethod gnus-icalendar-event:inline-org-buttons ((event gnus-icalendar-event)) 841(cl-defmethod gnus-icalendar-event:inline-org-buttons ((event gnus-icalendar-event))
842 (let* ((org-entry-exists-p (gnus-icalendar-find-org-event-file event)) 842 (let* ((org-entry-exists-p (gnus-icalendar-find-org-event-file event))
843 (export-button-text (if org-entry-exists-p "Update Org Entry" "Export to Org"))) 843 (export-button-text (if org-entry-exists-p "Update Org Entry" "Export to Org")))
844 844
@@ -850,7 +850,7 @@ These will be used to retrieve the RSVP information from ical events."
850 `("Show Org Entry" gnus-icalendar--show-org-event ,event)))))) 850 `("Show Org Entry" gnus-icalendar--show-org-event ,event))))))
851 851
852 852
853(defmethod gnus-icalendar-event:inline-org-buttons ((event gnus-icalendar-event-cancel)) 853(cl-defmethod gnus-icalendar-event:inline-org-buttons ((event gnus-icalendar-event-cancel))
854 (let ((org-entry-exists-p (gnus-icalendar-find-org-event-file event))) 854 (let ((org-entry-exists-p (gnus-icalendar-find-org-event-file event)))
855 855
856 (delq nil (list 856 (delq nil (list