summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-03-31 00:15:52 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-03-31 00:16:07 +0200
commit28b1059f093f645182cd44b52135a4e3b65c0a61 (patch)
tree1b6fe363c2a6f9feaadbae8d55c501fe3f704686
parentc0761cc7585b028b6b8f65077402089911bef9d0 (diff)
downloadorg-mode-28b1059f093f645182cd44b52135a4e3b65c0a61.tar.gz
Snow Leopard compatibility for org-mac-iCal.el
-rw-r--r--contrib/ChangeLog5
-rw-r--r--contrib/lisp/org-mac-iCal.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 3296d98..ce32dab 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-31 Carsten Dominik <carsten.dominik@gmail.com>
+
+ * lisp/org-mac-iCal.el (org-mac-iCal): Snow Leopard
+ compatibility.
+
2010-02-20 Carsten Dominik <carsten.dominik@gmail.com>
* lisp/org-git-link.el (org-git-store-link): Check if there is a
diff --git a/contrib/lisp/org-mac-iCal.el b/contrib/lisp/org-mac-iCal.el
index 0d0b4f8..2510aa7 100644
--- a/contrib/lisp/org-mac-iCal.el
+++ b/contrib/lisp/org-mac-iCal.el
@@ -98,8 +98,8 @@ the the Emacs diary"
;; for each calendar, concatenate individual events into a single ics file
(with-temp-buffer
- (shell-command "sw_vers" " *temp*")
- (when (re-search-backward "10.5" nil t)
+ (shell-command "sw_vers" (current-buffer))
+ (when (re-search-backward "10\\.[56]" nil t)
(omi-concat-leopard-ics all-calendars)))
;; move all caldav ics files to the same place as local ics files