Merge from emacs-24 branch

[gnu-emacs] / lisp / org / org-icalendar.el

diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index 29f6c74c5293f33d3b553e701930d3c7975c2a0d..d73a6195b321cac4bee91fbfad05206c6337e4e7 100644 (file)
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -54,6 +54,7 @@ for timed events.  If non-zero, alarms are created.
 - The alarm will go off N minutes before the event
 - only a DISPLAY action is defined."
   :group 'org-export-icalendar
+  :version "24.1"
   :type 'integer)
 
 (defcustom org-icalendar-combined-name "OrgMode"
@@ -64,6 +65,7 @@ for timed events.  If non-zero, alarms are created.
 (defcustom org-icalendar-combined-description nil
   "Calendar description for the combined iCalendar (all agenda files)."
   :group 'org-export-icalendar
+  :version "24.1"
   :type 'string)
 
 (defcustom org-icalendar-use-plain-timestamp t
@@ -74,6 +76,7 @@ for timed events.  If non-zero, alarms are created.
 (defcustom org-icalendar-honor-noexport-tag nil
   "Non-nil means don't export entries with a tag in `org-export-exclude-tags'."
   :group 'org-export-icalendar
+  :version "24.1"
   :type 'boolean)
 
 (defcustom org-icalendar-use-deadline '(event-if-not-todo todo-due)
@@ -213,6 +216,7 @@ Interesting value are:
  - \":%Y%m%dT%H%M%SZ\" for time expressed in Universal Time"
 
   :group 'org-export-icalendar
+  :version "24.1"
   :type '(choice
          (const :tag "Local time" ":%Y%m%dT%H%M%S")
          (const :tag "Explicit local time" ";TZID=%Z:%Y%m%dT%H%M%S")