From e32a45ed36d6000db4b39171149072d11b77af72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= Date: Sun, 13 Jul 2014 13:35:27 +0200 Subject: Imported Upstream version 8.0.7 --- contrib/lisp/org-mac-iCal.el | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'contrib/lisp/org-mac-iCal.el') diff --git a/contrib/lisp/org-mac-iCal.el b/contrib/lisp/org-mac-iCal.el index 0fdc95f..afec84b 100644 --- a/contrib/lisp/org-mac-iCal.el +++ b/contrib/lisp/org-mac-iCal.el @@ -1,26 +1,25 @@ ;;; org-mac-iCal.el --- Imports events from iCal.app to the Emacs diary -;; Copyright (C) 2009-2012 Christopher Suckling +;; Copyright (C) 2009-2013 Christopher Suckling ;; Author: Christopher Suckling +;; Version: 0.1057.104 +;; Keywords: outlines, calendar + +;; This file is not part of GNU Emacs. -;; This file is Free Software; you can redistribute it and/or modify +;; This program is Free Software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 3, or (at your option) ;; any later version. -;; It is distributed in the hope that it will be useful, but WITHOUT -;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -;; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -;; License for more details. +;; This program is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +;; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +;; for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. - -;; Version: 0.1057.104 -;; Keywords: outlines, calendar +;; along with GNU Emacs. If not, see . ;;; Commentary: ;; @@ -99,7 +98,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))) ;; move all caldav ics files to the same place as local ics files -- cgit v1.2.3