From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steve Purcell <steve@sanityinc.com>
Subject: Patch: org-mac-iCal is a no-op on OS X 10.8
Date: Sat, 1 Dec 2012 14:11:48 +0000
Message-ID: <8F625751-4E27-46A8-AC49-006ED41F4B05@sanityinc.com>
Mime-Version: 1.0 (Mac OS X Mail 6.2 \(1499\))
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: quoted-printable
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:58491)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <steve@sanityinc.com>) id 1TennN-0005Gz-7l
	for emacs-orgmode@gnu.org; Sat, 01 Dec 2012 09:11:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <steve@sanityinc.com>) id 1TennL-0006lK-Qi
	for emacs-orgmode@gnu.org; Sat, 01 Dec 2012 09:11:53 -0500
Received: from h1189701.stratoserver.net ([85.214.32.38]:40860)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <steve@sanityinc.com>) id 1TennL-0006lB-K2
	for emacs-orgmode@gnu.org; Sat, 01 Dec 2012 09:11:51 -0500
Received: from [192.168.1.100]
	(host81-154-126-238.range81-154.btcentralplus.com [81.154.126.238])
	by h1189701.stratoserver.net (Postfix) with ESMTPSA id A4C1611180C3
	for <emacs-orgmode@gnu.org>; Sat,  1 Dec 2012 15:11:47 +0100 (CET)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

I just found that org-mac-iCal.el doesn't work on OS X 10.8 (Mountain
Lion).

The trivial patch below fixes this.

Cheers,

-Steve


commit 71b50131b5e6ae00a5e6c2f0bff2cec377c68c0f (HEAD, =
refs/heads/master)
Author: Steve Purcell <steve@sanityinc.com>
Date:   Sat Dec 1 14:06:02 2012 +0000

    org-mac-iCal: also use post-Leopard logic to concatenate calendars =
in 10.8

	Modified   contrib/lisp/org-mac-iCal.el
diff --git a/contrib/lisp/org-mac-iCal.el b/contrib/lisp/org-mac-iCal.el
index 0fdc95f..a48cf22 100644
--- a/contrib/lisp/org-mac-iCal.el
+++ b/contrib/lisp/org-mac-iCal.el
@@ -99,7 +99,7 @@ the the Emacs diary"
   ;; for each calendar, concatenate individual events into a single ics =
file
   (with-temp-buffer
     (shell-command "sw_vers" (current-buffer))
-    (when (re-search-backward "10\\.[567]" nil t)
+    (when (re-search-backward "10\\.[5678]" nil t)
       (omi-concat-leopard-ics all-calendars)))
=20
   ;; move all caldav ics files to the same place as local ics files