From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carsten Dominik Subject: Re: [PATCH] Detect Mac OS X in iCal import Date: Wed, 31 Mar 2010 00:16:26 +0200 Message-ID: <3D9256A1-BA7B-41AF-A019-A900E652B6B1@gmail.com> References: Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NwjkF-0000un-3R for emacs-orgmode@gnu.org; Tue, 30 Mar 2010 18:17:11 -0400 Received: from [140.186.70.92] (port=45693 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nwjk4-0000sJ-S3 for emacs-orgmode@gnu.org; Tue, 30 Mar 2010 18:17:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nwjjk-0006xQ-Jr for emacs-orgmode@gnu.org; Tue, 30 Mar 2010 18:16:52 -0400 Received: from mail-ew0-f218.google.com ([209.85.219.218]:33971) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nwjjk-0006wp-5b for emacs-orgmode@gnu.org; Tue, 30 Mar 2010 18:16:40 -0400 Received: by ewy10 with SMTP id 10so1207169ewy.32 for ; Tue, 30 Mar 2010 15:16:29 -0700 (PDT) In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 Cc: emacs-orgmode@gnu.org Applied, thanks. - Carsten On Mar 30, 2010, at 11:03 PM, Jonathan Creekmore 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 > > --8<---------------cut here---------------start------------->8--- > 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 > --8<---------------cut here---------------start------------->8--- > > > _______________________________________________ > 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 - Carsten