# HG changeset patch # User Glenn Morris # Date 1100019661 0 # Node ID e47a5c4e43ff8e40bf59d576c5a4c522081150c2 # Parent c0265a6ec955f48d27f4ed396c6d0fd43e0d819b (diary-from-outlook, diary-from-outlook-gnus) (diary-from-outlook-rmail): Use NOCONFIRM rather than DONOTASK for argument name. diff -r c0265a6ec955 -r e47a5c4e43ff lisp/calendar/diary-lib.el --- a/lisp/calendar/diary-lib.el Tue Nov 09 16:59:44 2004 +0000 +++ b/lisp/calendar/diary-lib.el Tue Nov 09 17:01:01 2004 +0000 @@ -1974,10 +1974,10 @@ (throw 'finished t)))) nil)) -(defun diary-from-outlook (&optional donotask) +(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 DONOTASK is non-nil (which is the case when this +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,7 +1987,7 @@ ((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))) + (funcall func noconfirm))) (defvar gnus-article-mime-handles) @@ -1997,9 +1997,9 @@ (autoload 'gnus-narrow-to-body "gnus") (autoload 'mm-get-part "mm-decode") -(defun diary-from-outlook-gnus (&optional donotask) +(defun diary-from-outlook-gnus (&optional noconfirm) "Maybe snarf diary entry from Outlook-generated message in Gnus. -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 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,7 +2015,7 @@ (gnus-narrow-to-body) (buffer-string))))) (when (diary-from-outlook-internal t) - (when (or donotask (y-or-n-p "Snarf diary entry? ")) + (when (or noconfirm (y-or-n-p "Snarf diary entry? ")) (diary-from-outlook-internal) (message "Diary entry added")))))) @@ -2024,9 +2024,9 @@ (defvar rmail-buffer) -(defun diary-from-outlook-rmail (&optional donotask) +(defun diary-from-outlook-rmail (&optional noconfirm) "Maybe snarf diary entry from Outlook-generated message in Rmail. -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 this function is called interactively), then if an entry is found the user is asked to confirm its addition." (interactive "p") @@ -2037,7 +2037,7 @@ (point)) (point-max)))) (when (diary-from-outlook-internal t) - (when (or donotask (y-or-n-p "Snarf diary entry? ")) + (when (or noconfirm (y-or-n-p "Snarf diary entry? ")) (diary-from-outlook-internal) (message "Diary entry added"))))))