[Emacs-diffs] Changes to emacs/lisp/calendar/diary-lib.el

[Glenn Morris]

Index: emacs/lisp/calendar/diary-lib.el
diff -c emacs/lisp/calendar/diary-lib.el:1.83 
emacs/lisp/calendar/diary-lib.el:1.84
*** emacs/lisp/calendar/diary-lib.el:1.83       Tue Nov  9 14:51:06 2004
--- emacs/lisp/calendar/diary-lib.el    Tue Nov  9 17:01:01 2004
***************
*** 1974,1983 ****
          (throw 'finished t))))
      nil))
  
! (defun diary-from-outlook (&optional donotask)
    "Maybe snarf diary entry from current Outlook-generated message.
  Currently knows about Gnus and Rmail modes.  Unless the optional
! argument DONOTASK 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")
--- 1974,1983 ----
          (throw 'finished t))))
      nil))
  
! (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."
    (interactive "p")
***************
*** 1987,1993 ****
               ((memq major-mode '(gnus-summary-mode gnus-article-mode))
                #'diary-from-outlook-gnus)
               (t (error "Don't know how to snarf in `%s'" major-mode)))))
!     (funcall func donotask)))
  
  
  (defvar gnus-article-mime-handles)
--- 1987,1993 ----
               ((memq major-mode '(gnus-summary-mode gnus-article-mode))
                #'diary-from-outlook-gnus)
               (t (error "Don't know how to snarf in `%s'" major-mode)))))
!     (funcall func noconfirm)))
  
  
  (defvar gnus-article-mime-handles)
***************
*** 1997,2005 ****
  (autoload 'gnus-narrow-to-body "gnus")
  (autoload 'mm-get-part "mm-decode")
  
! (defun diary-from-outlook-gnus (&optional donotask)
    "Maybe snarf diary entry from Outlook-generated message in Gnus.
! Unless the optional argument DONOTASK 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.
  Add this function to `gnus-article-prepare-hook' to notice appointments
--- 1997,2005 ----
  (autoload 'gnus-narrow-to-body "gnus")
  (autoload 'mm-get-part "mm-decode")
  
! (defun diary-from-outlook-gnus (&optional noconfirm)
    "Maybe snarf diary entry from Outlook-generated message in 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.
  Add this function to `gnus-article-prepare-hook' to notice appointments
***************
*** 2015,2021 ****
                    (gnus-narrow-to-body)
                    (buffer-string)))))
        (when (diary-from-outlook-internal t)
!       (when (or donotask (y-or-n-p "Snarf diary entry? "))
          (diary-from-outlook-internal)
          (message "Diary entry added"))))))
  
--- 2015,2021 ----
                    (gnus-narrow-to-body)
                    (buffer-string)))))
        (when (diary-from-outlook-internal t)
!       (when (or noconfirm (y-or-n-p "Snarf diary entry? "))
          (diary-from-outlook-internal)
          (message "Diary entry added"))))))
  
***************
*** 2024,2032 ****
  
  (defvar rmail-buffer)
  
! (defun diary-from-outlook-rmail (&optional donotask)
    "Maybe snarf diary entry from Outlook-generated message in Rmail.
! Unless the optional argument DONOTASK 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")
--- 2024,2032 ----
  
  (defvar rmail-buffer)
  
! (defun diary-from-outlook-rmail (&optional noconfirm)
    "Maybe snarf diary entry from Outlook-generated message in Rmail.
! 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")
***************
*** 2037,2043 ****
                                    (point))
                                  (point-max))))
        (when (diary-from-outlook-internal t)
!       (when (or donotask (y-or-n-p "Snarf diary entry? "))
          (diary-from-outlook-internal)
          (message "Diary entry added"))))))
  
--- 2037,2043 ----
                                    (point))
                                  (point-max))))
        (when (diary-from-outlook-internal t)
!       (when (or noconfirm (y-or-n-p "Snarf diary entry? "))
          (diary-from-outlook-internal)
          (message "Diary entry added"))))))