[Emacs-diffs] Changes to emacs/lisp/textmodes/remember.el,v

[Michael W. Olson]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael W. Olson <mwolson>      07/10/30 13:47:24

Index: textmodes/remember.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/remember.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- textmodes/remember.el       30 Oct 2007 01:39:14 -0000      1.1
+++ textmodes/remember.el       30 Oct 2007 13:47:24 -0000      1.2
@@ -177,7 +177,7 @@
 (defcustom remember-mode-hook nil
   "Functions run upon entering `remember-mode'."
   :type 'hook
-  :options '(flyspell-mode turn-on-auto-fill)
+  :options '(flyspell-mode turn-on-auto-fill org-remember-apply-template)
   :group 'remember)
 
 (defcustom remember-in-new-frame nil
@@ -203,6 +203,10 @@
 If any function returns non-nil, the data is assumed to have been
 recorded somewhere by that function. "
   :type 'hook
+  :options '(remember-store-in-mailbox
+             remember-append-to-file
+             remember-diary-extract-entries
+             org-remember-handler)
   :group 'remember)
 
 (defcustom remember-all-handler-functions nil
@@ -234,6 +238,7 @@
 If you have planner.el, it's nice to set this to
 `planner-annotation-functions'."
   :type 'hook
+  :options '(org-remember-annotation buffer-file-name)
   :group 'remember)
 
 (defvar remember-annotation nil
@@ -368,8 +373,6 @@
       (append-to-file (point-min) (point-max) remember-mailbox)
       t)))
 
-(custom-add-option 'remember-handler-functions 'remember-store-in-mailbox)
-
 ;; Remembering to plain files
 
 (defcustom remember-data-file "~/.notes"
@@ -400,8 +403,6 @@
               (when remember-save-after-remembering (save-buffer))))
         (append-to-file (point-min) (point-max) remember-data-file)))))
 
-(custom-add-option 'remember-handler-functions 'remember-append-to-file)
-
 ;;;###autoload
 (defun remember-region (&optional beg end)
   "Remember the data from BEG to END.