/[emacs]/emacs/lisp/calendar/diary-lib.el
ViewVC logotype

Diff of /emacs/lisp/calendar/diary-lib.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.83 by gm, Tue Nov 9 14:51:06 2004 UTC revision 1.84 by gm, Tue Nov 9 17:01:01 2004 UTC
# Line 1974  message contains an appointment, don't m Line 1974  message contains an appointment, don't m
1974            (throw 'finished t))))            (throw 'finished t))))
1975      nil))      nil))
1976    
1977  (defun diary-from-outlook (&optional donotask)  (defun diary-from-outlook (&optional noconfirm)
1978    "Maybe snarf diary entry from current Outlook-generated message.    "Maybe snarf diary entry from current Outlook-generated message.
1979  Currently knows about Gnus and Rmail modes.  Unless the optional  Currently knows about Gnus and Rmail modes.  Unless the optional
1980  argument DONOTASK is non-nil (which is the case when this  argument NOCONFIRM is non-nil (which is the case when this
1981  function is called interactively), then if an entry is found the  function is called interactively), then if an entry is found the
1982  user is asked to confirm its addition."  user is asked to confirm its addition."
1983    (interactive "p")    (interactive "p")
# Line 1987  user is asked to confirm its addition." Line 1987  user is asked to confirm its addition."
1987                 ((memq major-mode '(gnus-summary-mode gnus-article-mode))                 ((memq major-mode '(gnus-summary-mode gnus-article-mode))
1988                  #'diary-from-outlook-gnus)                  #'diary-from-outlook-gnus)
1989                 (t (error "Don't know how to snarf in `%s'" major-mode)))))                 (t (error "Don't know how to snarf in `%s'" major-mode)))))
1990      (funcall func donotask)))      (funcall func noconfirm)))
1991    
1992    
1993  (defvar gnus-article-mime-handles)  (defvar gnus-article-mime-handles)
# Line 1997  user is asked to confirm its addition." Line 1997  user is asked to confirm its addition."
1997  (autoload 'gnus-narrow-to-body "gnus")  (autoload 'gnus-narrow-to-body "gnus")
1998  (autoload 'mm-get-part "mm-decode")  (autoload 'mm-get-part "mm-decode")
1999    
2000  (defun diary-from-outlook-gnus (&optional donotask)  (defun diary-from-outlook-gnus (&optional noconfirm)
2001    "Maybe snarf diary entry from Outlook-generated message in Gnus.    "Maybe snarf diary entry from Outlook-generated message in Gnus.
2002  Unless the optional argument DONOTASK is non-nil (which is the case when  Unless the optional argument NOCONFIRM is non-nil (which is the case when
2003  this function is called interactively), then if an entry is found the  this function is called interactively), then if an entry is found the
2004  user is asked to confirm its addition.  user is asked to confirm its addition.
2005  Add this function to `gnus-article-prepare-hook' to notice appointments  Add this function to `gnus-article-prepare-hook' to notice appointments
# Line 2015  automatically." Line 2015  automatically."
2015                      (gnus-narrow-to-body)                      (gnus-narrow-to-body)
2016                      (buffer-string)))))                      (buffer-string)))))
2017        (when (diary-from-outlook-internal t)        (when (diary-from-outlook-internal t)
2018          (when (or donotask (y-or-n-p "Snarf diary entry? "))          (when (or noconfirm (y-or-n-p "Snarf diary entry? "))
2019            (diary-from-outlook-internal)            (diary-from-outlook-internal)
2020            (message "Diary entry added"))))))            (message "Diary entry added"))))))
2021    
# Line 2024  automatically." Line 2024  automatically."
2024    
2025  (defvar rmail-buffer)  (defvar rmail-buffer)
2026    
2027  (defun diary-from-outlook-rmail (&optional donotask)  (defun diary-from-outlook-rmail (&optional noconfirm)
2028    "Maybe snarf diary entry from Outlook-generated message in Rmail.    "Maybe snarf diary entry from Outlook-generated message in Rmail.
2029  Unless the optional argument DONOTASK is non-nil (which is the case when  Unless the optional argument NOCONFIRM is non-nil (which is the case when
2030  this function is called interactively), then if an entry is found the  this function is called interactively), then if an entry is found the
2031  user is asked to confirm its addition."  user is asked to confirm its addition."
2032    (interactive "p")    (interactive "p")
# Line 2037  user is asked to confirm its addition." Line 2037  user is asked to confirm its addition."
2037                                      (point))                                      (point))
2038                                    (point-max))))                                    (point-max))))
2039        (when (diary-from-outlook-internal t)        (when (diary-from-outlook-internal t)
2040          (when (or donotask (y-or-n-p "Snarf diary entry? "))          (when (or noconfirm (y-or-n-p "Snarf diary entry? "))
2041            (diary-from-outlook-internal)            (diary-from-outlook-internal)
2042            (message "Diary entry added"))))))            (message "Diary entry added"))))))
2043    

Legend:
Removed from v.1.83  
changed lines
  Added in v.1.84

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26