From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christopher Suckling <suckling.list@googlemail.com>
Subject: Re: [PATCH] Detect Mac OS X in iCal import
Date: Tue, 30 Mar 2010 22:25:04 +0100
Message-ID: <m2eij1biz3.fsf@gmail.com>
References: <m2oci5wmib.fsf@thecreekmores.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nwj3G-0000Bi-68
	for emacs-orgmode@gnu.org; Tue, 30 Mar 2010 17:32:46 -0400
Received: from [140.186.70.92] (port=34940 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nwj3E-0008Lb-FC
	for emacs-orgmode@gnu.org; Tue, 30 Mar 2010 17:32:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <suckling.list@googlemail.com>) id 1Nwivz-0001nb-OD
	for emacs-orgmode@gnu.org; Tue, 30 Mar 2010 17:25:17 -0400
Received: from fg-out-1718.google.com ([72.14.220.153]:35160)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <suckling.list@googlemail.com>) id 1Nwivu-0001n2-Jc
	for emacs-orgmode@gnu.org; Tue, 30 Mar 2010 17:25:15 -0400
Received: by fg-out-1718.google.com with SMTP id l26so3033221fgb.12
	for <emacs-orgmode@gnu.org>; Tue, 30 Mar 2010 14:25:08 -0700 (PDT)
In-Reply-To: <m2oci5wmib.fsf@thecreekmores.org> (Jonathan Creekmore's message
	of "Tue, 30 Mar 2010 16:03:08 -0500")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Jonathan Creekmore <jonathan@thecreekmores.org>
Cc: emacs-orgmode@gnu.org

Thanks. I did this in my local repository last September and completely
forgot to submit it. Though curiously the contrib version seems to work
fine on my Snow Leopard install.

Best, Christopher

On Tue, 30 Mar 2010 16:03:08 -0500, Jonathan Creekmore <jonathan@thecreekmores.org> wrote:

> This patch modifies the Mac OS X detection code to check for both
> Leopard and Snow Leopard, since they both store iCal events in separate
> files for Spotlight searching purposes.
>
> Jonathan
>
> 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
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode