[Emacs-diffs] /srv/bzr/emacs/trunk r112452: * lisp/calendar/diary-lib.el (diary-from-outlook-function): New variable.

[Glenn Morris]

------------------------------------------------------------
revno: 112452
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-05-04 16:55:57 -0700
message:
  * lisp/calendar/diary-lib.el (diary-from-outlook-function): New variable.
  (diary-from-outlook): Respect diary-from-outlook-function.
  
  * doc/emacs/calendar.texi (Importing Diary):
  Mention diary-from-outlook-function.
  
  * etc/NEWS: Mention this.
modified:
  doc/emacs/ChangeLog
  doc/emacs/calendar.texi
  etc/NEWS
  lisp/ChangeLog
  lisp/calendar/diary-lib.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-04-04 03:46:25 +0000
+++ b/doc/emacs/ChangeLog       2013-05-04 23:55:57 +0000
@@ -1,3 +1,7 @@
+2013-05-04  Glenn Morris  <address@hidden>
+
+       * calendar.texi (Importing Diary): Mention diary-from-outlook-function.
+
 2013-03-17  Paul Eggert  <address@hidden>
 
        doc: convert some TeX accents to UTF-8

=== modified file 'doc/emacs/calendar.texi'
--- a/doc/emacs/calendar.texi   2013-03-04 08:45:03 +0000
+++ b/doc/emacs/calendar.texi   2013-05-04 23:55:57 +0000
@@ -1542,7 +1542,8 @@
 messages.  While viewing such a message in Rmail or Gnus, do @kbd{M-x
 diary-from-outlook} to import the entry.  You can make this command
 recognize additional appointment message formats by customizing the
-variable @code{diary-outlook-formats}.
+variable @code{diary-outlook-formats}.  Other mail clients can set
address@hidden to an appropriate value.
 
 @c FIXME the name of the RFC is hardly very relevant.
 @cindex iCalendar support

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-04-27 20:55:00 +0000
+++ b/etc/NEWS  2013-05-04 23:55:57 +0000
@@ -146,6 +146,12 @@
 
 *** Battery information via the BSD `apm' utility is now supported.
 
+** Calendar and Diary
+
++++
+*** New variable `diary-from-outlook-function' for used by the command
+`diary-from-outlook'.
+
 ** cl-lib
 
 *** New macro cl-tagbody.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-04 19:27:41 +0000
+++ b/lisp/ChangeLog    2013-05-04 23:55:57 +0000
@@ -1,3 +1,8 @@
+2013-05-04  Glenn Morris  <address@hidden>
+
+       * calendar/diary-lib.el (diary-from-outlook-function): New variable.
+       (diary-from-outlook): Respect diary-from-outlook-function.
+
 2013-05-04  Stefan Monnier  <address@hidden>
 
        * simple.el (read-expression-map): Use completion-at-point (bug#14255).

=== modified file 'lisp/calendar/diary-lib.el'
--- a/lisp/calendar/diary-lib.el        2013-01-01 09:11:05 +0000
+++ b/lisp/calendar/diary-lib.el        2013-05-04 23:55:57 +0000
@@ -2611,14 +2611,23 @@
           (diary-from-outlook-internal subject body)
           (message "Diary entry added"))))))
 
+(defvar diary-from-outlook-function nil
+  "If non-nil, a function of one argument for `diary-from-outlook' to call.
+If the current buffer contains an Outlook-style appointment message,
+this function should extract it into a diary entry.  If the argument is
+nil, it should ask for confirmation before adding this entry to the diary.
+For examples, see `diary-from-outlook-rmail' and `diary-from-outlook-gnus'.")
+
 (defun diary-from-outlook (&optional noconfirm)
   "Maybe snarf diary entry from current Outlook-generated message.
-Currently knows about Gnus and Rmail modes.  Unless the optional
-argument NOCONFIRM is non-nil (which is the case when this
-function is called interactively), then if an entry is found the
-user is asked to confirm its addition."
+Uses `diary-from-outlook-function' if that is non-nil, else
+`diary-from-outlook-rmail' for Rmail or `diary-from-outlook-gnus' for Gnus.
+Unless the optional argument NOCONFIRM is non-nil (which is the
+case when this function is called interactively), then if an
+entry is found the user is asked to confirm its addition."
   (interactive "p")
   (let ((func (cond
+               (diary-from-outlook-function)
                ((eq major-mode 'rmail-mode)
                 #'diary-from-outlook-rmail)
                ((memq major-mode '(gnus-summary-mode gnus-article-mode))