[gnus git] branch master updated: m0-7-208-gc289124 =2= * dgnushack.el (dgnushack-compile): Allow building on Emacs 23. ; Make gnus-icalendar work on Emacs 23

       via  c2891244481522aad3533d527f9ad655700ec6a8 (commit)
       via  ec0f4ea52104dc05316d81936ab0c1025f594e27 (commit)
      from  aab98157ce3deed625ba701eecb1856dc775d426 (commit)


- Log -----------------------------------------------------------------
commit c2891244481522aad3533d527f9ad655700ec6a8
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Tue Aug 6 22:36:29 2013 +0200

    * dgnushack.el (dgnushack-compile): Allow building on Emacs 23.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a36670..df62d44 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-06  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* dgnushack.el (dgnushack-compile): Allow building on Emacs 23.
+
 2013-08-06  Jan Tatarik  <[email protected]>
 
 	* gnus-icalendar.el (gnus-icalendar-event-from-ical): Replace pcase
diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 3f73152..fb638f7 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -339,9 +339,7 @@ This means that every warning will be reported as an error."
     (unless (locate-library "epg")
       (setq files (delete "plstore.el" files)))
     ;; Temporary code until we fix pcase and defmethod stuff.
-    (when (or (featurep 'xemacs)
-	      (or (< emacs-major-version 24)
-		  (< emacs-minor-version 3)))
+    (when (featurep 'xemacs)
       (setq files (delete "gnus-icalendar.el" files)))
     (dolist (file files)
       (setq file (expand-file-name file srcdir))

commit ec0f4ea52104dc05316d81936ab0c1025f594e27
Author: Jan Tatarik <[email protected]>
Date:   Tue Aug 6 22:35:44 2013 +0200

    Make gnus-icalendar work on Emacs 23
    
    * gnus-icalendar.el (gnus-icalendar-event-from-ical): Replace pcase
    with cond for backwards compatability.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1eed896..6a36670 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-06  Jan Tatarik  <[email protected]>
+
+	* gnus-icalendar.el (gnus-icalendar-event-from-ical): Replace pcase
+	with cond for backwards compatability.
+
 2013-08-06  Katsumi Yamaoka  <[email protected]>
 
 	* mm-decode.el (mm-display-external): Bind process-connection-type to
diff --git a/lisp/gnus-icalendar.el b/lisp/gnus-icalendar.el
index 0286fd5..3a9e743 100644
--- a/lisp/gnus-icalendar.el
+++ b/lisp/gnus-icalendar.el
@@ -183,11 +183,11 @@
                      :end (gnus-icalendar-event--decode-datefield event 'DTEND zone-map)
                      :rsvp (string= (plist-get (cadr attendee) 'RSVP)
                                     "TRUE")))
-         (event-class (pcase method
-                        ("REQUEST" 'gnus-icalendar-event-request)
-                        ("CANCEL" 'gnus-icalendar-event-cancel)
-                        ("REPLY" 'gnus-icalendar-event-reply)
-                        (_ 'gnus-icalendar-event))))
+         (event-class (cond
+                       ((string= method "REQUEST") 'gnus-icalendar-event-request)
+                       ((string= method "CANCEL") 'gnus-icalendar-event-cancel)
+                       ((string= method "REPLY") 'gnus-icalendar-event-reply)
+                       (t 'gnus-icalendar-event))))
 
     (labels ((map-property (prop)
                    (let ((value (icalendar--get-event-property event prop)))
@@ -252,14 +252,15 @@ status will be retrieved from the first matching attendee record."
                             ;; NOTE: not all of the below fields are mandatory,
                             ;; but they are often present in other clients'
                             ;; replies. Can be helpful for debugging, too.
-                            (new-line (pcase key
-                                        ("ATTENDEE" (update-attendee-status line))
-                                        ("SUMMARY" (update-summary line))
-                                        ("DTSTAMP" (update-dtstamp))
-                                        ((or "ORGANIZER" "DTSTART" "DTEND"
+                            (new-line
+                             (cond
+                              ((string= key "ATTENDEE") (update-attendee-status line))
+                              ((string= key "SUMMARY") (update-summary line))
+                              ((string= key "DTSTAMP") (update-dtstamp))
+                              ((find key '("ORGANIZER" "DTSTART" "DTEND"
                                              "LOCATION" "DURATION" "SEQUENCE"
-                                             "RECURRENCE-ID" "UID") line)
-                                        (_ nil))))
+                                           "RECURRENCE-ID" "UID")) line)
+                              (t nil))))
                        (when new-line
                          (push new-line reply-event-lines))))))
 
@@ -405,7 +406,8 @@ Return nil for non-recurring EVENT."
 
 (defun gnus-icalendar--deactivate-org-timestamp (ts)
   (replace-regexp-in-string "[<>]"
-                            (lambda (m) (pcase m ("<" "[") (">" "]")))
+                            (lambda (m) (cond ((string= m "<") "[")
+                                              ((string= m ">") "]")))
                             ts))
 
 (defun gnus-icalendar-find-org-event-file (event &optional org-file)

-----------------------------------------------------------------------
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         |    9 +++++++++
 lisp/dgnushack.el      |    4 +---
 lisp/gnus-icalendar.el |   30 ++++++++++++++++--------------
 3 files changed, 26 insertions(+), 17 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