3 files changed, 40 insertions, 24 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index dade2b4bbe5..8cb53de85fa 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * nndiary.el (nndiary-request-create-group-functions)
+        (nndiary-request-update-info-functions)
+        (nndiary-request-accept-article-functions):
+        * gnus-start.el (gnus-subscribe-newsgroup-functions): Don't use
+        "-hooks" suffix.
+
 2012-10-17  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 
         * starttls.el (starttls-extra-arguments): Doc fix.
@@ -110,7 +118,7 @@
 
 2012-09-05  Martin Stjernholm  <mast@lysator.liu.se>
 
-        * gnus-demon.el (gnus-demon-init): Fixed regression when IDLE is t and
+        * gnus-demon.el (gnus-demon-init): Fix regression when IDLE is t and
         TIME is set.
 
 2012-09-05  Juri Linkov  <juri@jurta.org>
@@ -571,7 +579,7 @@
         * gnus.el: Register gnus-registry functions.
 
         * gnus-registry.el (gnus-try-warping-via-registry):
-        Moved here and indent.
+        Move here and indent.
 
         * gnus-int.el (gnus-warp-to-article):
         Check whether the registry is enabled before warping.
@@ -703,7 +711,7 @@
         (message-multi-smtp-send-mail): Respect the X-Message-SMTP-Method
         header to implement multi-SMTP functionality.
 
-        * gnus-agent.el (gnus-agent-send-mail-function): Removed.
+        * gnus-agent.el (gnus-agent-send-mail-function): Remove.
         (gnus-agentize): Don't set it.
         (gnus-agent-send-mail): Don't use it.
 
@@ -844,8 +852,8 @@
 
 2012-06-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * gnus-group.el (gnus-group-get-new-news): Respect
-        `gnus-group-use-permanent-levels', as documented (bug#11638).
+        * gnus-group.el (gnus-group-get-new-news):
+        Respect `gnus-group-use-permanent-levels', as documented (bug#11638).
 
 2012-06-10  Dave Abrahams  <dave@boostpro.com>
 
@@ -985,7 +993,7 @@
         (shr-insert): Allow the natural width to be computed for tables again.
         (shr-tag-table-1): Rework how the natural widths are computed by
         rendering the table a third time.
-        (shr-natural-width): Removed.
+        (shr-natural-width): Remove.
         (shr-buffer-width): New function.
         (shr-expand-newlines): Use it.
 
@@ -1396,8 +1404,8 @@
 
 2012-01-04  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
 
-        * gnus-agent.el (gnus-agent-load-local): Recompute
-        gnus-agent-article-local on changing method.
+        * gnus-agent.el (gnus-agent-load-local):
+        Recompute gnus-agent-article-local on changing method.
 
 2012-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
@@ -1689,8 +1697,8 @@
 
 2011-09-27  Daiki Ueno  <ueno@unixuser.org>
 
-        * plstore.el (plstore-select-keys, plstore-encrypt-to): Clarify
-        documentation.
+        * plstore.el (plstore-select-keys, plstore-encrypt-to):
+        Clarify documentation.
 
 2011-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 40ee78bb695..eaf17d9e579 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -291,7 +291,9 @@ claim them."
                 function
                 (repeat function)))
 
-(defcustom gnus-subscribe-newsgroup-hooks nil
+(define-obsolete-variable-alias 'gnus-subscribe-newsgroup-hooks
+  'gnus-subscribe-newsgroup-functions "24.3")
+(defcustom gnus-subscribe-newsgroup-functions nil
   "*Hooks run after you subscribe to a new group.
 The hooks will be called with new group's name as argument."
   :version "22.1"
@@ -639,7 +641,7 @@ the first newsgroup."
      gnus-level-killed (gnus-group-entry (or next "dummy.group")))
     (gnus-request-update-group-status newsgroup 'subscribe)
     (gnus-message 5 "Subscribe newsgroup: %s" newsgroup)
-    (run-hook-with-args 'gnus-subscribe-newsgroup-hooks newsgroup)
+    (run-hook-with-args 'gnus-subscribe-newsgroup-functions newsgroup)
     t))
 
 (defun gnus-read-active-file-p ()
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index 8752972c3c8..73dd2921b68 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -179,22 +179,28 @@ In order to make this clear, here are some examples:
   :group 'nndiary)
 
 
-(defcustom nndiary-request-create-group-hooks nil
-  "*Hooks to run after `nndiary-request-create-group' is executed.
-The hooks will be called with the full group name as argument."
+(define-obsolete-variable-alias 'nndiary-request-create-group-hooks
+  'nndiary-request-create-group-functions "24.3")
+(defcustom nndiary-request-create-group-functions nil
+  "*Hook run after `nndiary-request-create-group' is executed.
+The hook functions will be called with the full group name as argument."
   :group 'nndiary
   :type 'hook)
 
-(defcustom nndiary-request-update-info-hooks nil
-  "*Hooks to run after `nndiary-request-update-info-group' is executed.
-The hooks will be called with the full group name as argument."
+(define-obsolete-variable-alias 'nndiary-request-update-info-hooks
+  'nndiary-request-update-info-functions "24.3")
+(defcustom nndiary-request-update-info-functions nil
+  "*Hook run after `nndiary-request-update-info-group' is executed.
+The hook functions will be called with the full group name as argument."
   :group 'nndiary
   :type 'hook)
 
-(defcustom nndiary-request-accept-article-hooks nil
-  "*Hooks to run before accepting an article.
+(define-obsolete-variable-alias 'nndiary-request-accept-article-hooks
+  'nndiary-request-accept-article-functions "24.3")
+(defcustom nndiary-request-accept-article-functions nil
+  "*Hook run before accepting an article.
 Executed near the beginning of `nndiary-request-accept-article'.
-The hooks will be called with the article in the current buffer."
+The hook functions will be called with the article in the current buffer."
   :group 'nndiary
   :type 'hook)
 
@@ -541,7 +547,7 @@ all.  This may very well take some time.")
           (setcar active (apply 'min articles))
           (setcdr active (apply 'max articles))))
       (nnmail-save-active nndiary-group-alist nndiary-active-file)
-      (run-hook-with-args 'nndiary-request-create-group-hooks
+      (run-hook-with-args 'nndiary-request-create-group-functions
                           (gnus-group-prefixed-name group
                                                     (list "nndiary" server)))
       t))
@@ -633,7 +639,7 @@ all.  This may very well take some time.")
 (deffoo nndiary-request-accept-article (group &optional server last)
   (nndiary-possibly-change-directory group server)
   (nnmail-check-syntax)
-  (run-hooks 'nndiary-request-accept-article-hooks)
+  (run-hooks 'nndiary-request-accept-article-functions)
   (when (nndiary-schedule)
     (let (result)
       (when nnmail-cache-accepted-message-ids
@@ -804,7 +810,7 @@ all.  This may very well take some time.")
              (gnus-info-set-read info (gnus-update-read-articles
                                        (gnus-info-group info) unread t)))
         ))
-    (run-hook-with-args 'nndiary-request-update-info-hooks
+    (run-hook-with-args 'nndiary-request-update-info-functions
                         (gnus-info-group info))
     t))