emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r110630: Cleanup uses of "-hooks".


From: Stefan Monnier
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r110630: Cleanup uses of "-hooks".
Date: Tue, 23 Oct 2012 11:06:07 -0400
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 110630
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-23 11:06:07 -0400
message:
  Cleanup uses of "-hooks".
  * doc/emacs/custom.texi (Hooks):
  * doc/lispref/hooks.texi (Standard Hooks): Clarify that -hooks is deprecated.
  
  * lisp/gnus/nndiary.el (nndiary-request-create-group-functions)
  (nndiary-request-update-info-functions)
  (nndiary-request-accept-article-functions):
  * lisp/gnus/gnus-start.el (gnus-subscribe-newsgroup-functions):
  * lisp/cedet/semantic/db-file.el (semanticdb-save-database-functions):
  * lisp/cedet/semantic/lex.el (semantic-lex-reset-functions):
  * lisp/cedet/semantic/edit.el (semantic-change-functions)
  (semantic-edits-new-change-functions)
  (semantic-edits-delete-change-functions)
  (semantic-edits-reparse-change-functions):
  * lisp/htmlfontify.el (hfy-post-html-hook):
  * lisp/filesets.el (filesets-cache-fill-content-hook):
  * lisp/arc-mode.el (archive-extract-hook):
  * lisp/progmodes/cc-mode.el (c-prepare-bug-report-hook):
  * lisp/net/rcirc.el (rcirc-sentinel-functions)
  (rcirc-receive-message-functions, rcirc-activity-functions)
  (rcirc-print-functions):
  * lisp/net/dbus.el (dbus-event-error-functions):
  * lisp/emacs-lisp/eieio.el (eieio-pre-method-execution-functions):
  * lisp/emacs-lisp/checkdoc.el (checkdoc-style-functions)
  (checkdoc-comment-style-functions): Don't use "-hooks" suffix.
  
  * lisp/term/sun.el (sun-raw-prefix-hooks):
  * lisp/mail/sendmail.el (mail-yank-hooks):
  * lisp/mh-e/mh-letter.el (mh-yank-hooks): Use make-obsolete-variable.
modified:
  doc/emacs/ChangeLog
  doc/emacs/custom.texi
  doc/lispintro/emacs-lisp-intro.texi
  doc/lispref/ChangeLog
  doc/lispref/functions.texi
  doc/lispref/hooks.texi
  doc/lispref/loading.texi
  doc/lispref/modes.texi
  doc/misc/dbus.texi
  doc/misc/ede.texi
  doc/misc/ediff.texi
  doc/misc/forms.texi
  doc/misc/gnus.texi
  doc/misc/mh-e.texi
  doc/misc/sem-user.texi
  doc/misc/tramp.texi
  etc/NEWS
  lisp/ChangeLog
  lisp/arc-mode.el
  lisp/cedet/ChangeLog
  lisp/cedet/semantic/db-file.el
  lisp/cedet/semantic/edit.el
  lisp/cedet/semantic/lex.el
  lisp/emacs-lisp/checkdoc.el
  lisp/emacs-lisp/eieio.el
  lisp/filesets.el
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-start.el
  lisp/gnus/nndiary.el
  lisp/htmlfontify.el
  lisp/mail/sendmail.el
  lisp/mh-e/ChangeLog
  lisp/mh-e/mh-e.el
  lisp/mh-e/mh-letter.el
  lisp/net/dbus.el
  lisp/net/rcirc.el
  lisp/progmodes/cc-mode.el
  lisp/subr.el
  lisp/term/sun.el
  lisp/vc/ediff-mult.el
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-10-23 02:23:39 +0000
+++ b/doc/emacs/ChangeLog       2012-10-23 15:06:07 +0000
@@ -1,3 +1,7 @@
+2012-10-23  Stefan Monnier  <address@hidden>
+
+       * custom.texi (Hooks): Clarify that -hooks is deprecated.
+
 2012-10-23  Chong Yidong  <address@hidden>
 
        * kmacro.texi (Edit Keyboard Macro): Fix typo.

=== modified file 'doc/emacs/custom.texi'
--- a/doc/emacs/custom.texi     2012-08-05 09:24:55 +0000
+++ b/doc/emacs/custom.texi     2012-10-23 15:06:07 +0000
@@ -838,7 +838,8 @@
 
 @cindex abnormal hook
   A few hooks are @dfn{abnormal hooks}.  Their names end in
address@hidden or @samp{-functions}, instead of @samp{-hook}.  What
address@hidden, instead of @samp{-hook} (some old code may also use
+the deprecated suffix @samp{-hooks}).  What
 makes these hooks abnormal is the way its functions are
 called---perhaps they are given arguments, or perhaps the values they
 return are used in some way.  For example,
@@ -1735,11 +1736,11 @@
 
 @example
 (add-hook 'texinfo-mode-hook
-          '(lambda ()
-             (define-key texinfo-mode-map "\C-cp"
-                         'backward-paragraph)
-             (define-key texinfo-mode-map "\C-cn"
-                         'forward-paragraph)))
+          (lambda ()
+            (define-key texinfo-mode-map "\C-cp"
+                        'backward-paragraph)
+            (define-key texinfo-mode-map "\C-cn"
+                        'forward-paragraph)))
 @end example
 
 @node Modifier Keys

=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- a/doc/lispintro/emacs-lisp-intro.texi       2012-10-17 03:44:00 +0000
+++ b/doc/lispintro/emacs-lisp-intro.texi       2012-10-23 15:06:07 +0000
@@ -17909,10 +17909,10 @@
 @group
 ;; Set calendar highlighting colors
 (setq calendar-load-hook
-      '(lambda ()
-         (set-face-foreground 'diary-face   "skyblue")
-         (set-face-background 'holiday-face "slate blue")
-         (set-face-foreground 'holiday-face "white")))
+      (lambda ()
+        (set-face-foreground 'diary-face   "skyblue")
+        (set-face-background 'holiday-face "slate blue")
+        (set-face-foreground 'holiday-face "white")))
 @end group
 @end smallexample
 
@@ -20947,7 +20947,7 @@
 @group
 (defun one-fiftieth (full-range)
   "Return list, each number one-fiftieth of previous."
- (mapcar '(lambda (arg) (/ arg 50)) full-range))
+ (mapcar (lambda (arg) (/ arg 50)) full-range))
 @end group
 @end smallexample
 
@@ -21168,7 +21168,7 @@
 The whole expression looks like this:
 
 @smallexample
-(mapcar '(lambda (arg) (/ arg 50)) full-range))
+(mapcar (lambda (arg) (/ arg 50)) full-range))
 @end smallexample
 
 @xref{Mapping Functions, , Mapping Functions, elisp, The GNU Emacs
@@ -21840,7 +21840,7 @@
 @group
 (defun one-fiftieth (full-range)
   "Return list, each number of which is 1/50th previous."
- (mapcar '(lambda (arg) (/ arg 50)) full-range))
+ (mapcar (lambda (arg) (/ arg 50)) full-range))
 @end group
 @end smallexample
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-10-23 07:57:42 +0000
+++ b/doc/lispref/ChangeLog     2012-10-23 15:06:07 +0000
@@ -1,3 +1,7 @@
+2012-10-23  Stefan Monnier  <address@hidden>
+
+       * hooks.texi (Standard Hooks): Clarify that -hooks is deprecated.
+
 2012-10-23  Paul Eggert  <address@hidden>
 
        Fix outdated timestamp documentation in Elisp manual (bug#12706).

=== modified file 'doc/lispref/functions.texi'
--- a/doc/lispref/functions.texi        2012-10-15 04:03:04 +0000
+++ b/doc/lispref/functions.texi        2012-10-23 15:06:07 +0000
@@ -978,7 +978,7 @@
 @example
 @group
 (defun double-property (symbol prop)
-  (change-property symbol prop '(lambda (x) (* 2 x))))
+  (change-property symbol prop (lambda (x) (* 2 x))))
 @end group
 @end example
 

=== modified file 'doc/lispref/hooks.texi'
--- a/doc/lispref/hooks.texi    2012-07-29 07:16:45 +0000
+++ b/doc/lispref/hooks.texi    2012-10-23 15:06:07 +0000
@@ -17,11 +17,11 @@
 to put a new function on such a hook is to call @code{add-hook}.
 @xref{Hooks}, for more information about using hooks.
 
-The variables whose names end in @samp{-hooks} or @samp{-functions} are
-usually @dfn{abnormal hooks}; their values are lists of functions, but
-these functions are called in a special way (they are passed arguments,
-or their values are used). The variables whose names end in
address@hidden have single functions as their values.
+The variables whose names end in @samp{-functions} are usually @dfn{abnormal
+hooks} (some old code may also use the deprecated @samp{-hooks} suffix); their
+values are lists of functions, but these functions are called in a special way
+(they are passed arguments, or their return values are used).  The variables
+whose names end in @samp{-function} have single functions as their values.
 
 This is not an exhaustive list, it only covers the more general hooks.
 For example, every major mode defines a hook named

=== modified file 'doc/lispref/loading.texi'
--- a/doc/lispref/loading.texi  2012-09-30 09:18:38 +0000
+++ b/doc/lispref/loading.texi  2012-10-23 15:06:07 +0000
@@ -897,8 +897,8 @@
 
 Before restoring the previous definitions, @code{unload-feature} runs
 @code{remove-hook} to remove functions in the library from certain
-hooks.  These hooks include variables whose names end in @samp{hook}
-or @samp{-hooks}, plus those listed in
+hooks.  These hooks include variables whose names end in @samp{-hook}
+(or the deprecated suffix @samp{-hooks}), plus those listed in
 @code{unload-feature-special-hooks}, as well as
 @code{auto-mode-alist}.  This is to prevent Emacs from ceasing to
 function because important hooks refer to functions that are no longer

=== modified file 'doc/lispref/modes.texi'
--- a/doc/lispref/modes.texi    2012-06-17 05:13:40 +0000
+++ b/doc/lispref/modes.texi    2012-10-23 15:06:07 +0000
@@ -70,9 +70,9 @@
 hook, but you must write the function to follow the hook's calling
 convention.
 
-  By convention, abnormal hook names end in @samp{-functions} or
address@hidden  If the variable's name ends in @samp{-function}, then
-its value is just a single function, not a list of functions.
+  By convention, abnormal hook names end in @samp{-functions}.  If the
+variable's name ends in @samp{-function}, then its value is just a single
+function, not a list of functions.
 
 @menu
 * Running Hooks::    How to run a hook.

=== modified file 'doc/misc/dbus.texi'
--- a/doc/misc/dbus.texi        2012-04-23 05:44:49 +0000
+++ b/doc/misc/dbus.texi        2012-10-23 15:06:07 +0000
@@ -1981,7 +1981,7 @@
 setting the variable @code{dbus-debug} to @code{t}.  They can also be
 handled by a hook function.
 
address@hidden dbus-event-error-hooks
address@hidden dbus-event-error-functions
 This hook variable keeps a list of functions, which are called when a
 D-Bus error happens in the event handler.  Every function must accept
 two arguments, the event and the error variable caught in
@@ -1997,7 +1997,7 @@
     (message "my-dbus-event-error-handler: %S %S" event error)
     (signal 'file-error (cdr error))))
 
-(add-hook 'dbus-event-error-hooks 'my-dbus-event-error-handler)
+(add-hook 'dbus-event-error-functions 'my-dbus-event-error-handler)
 @end lisp
 @end defvar
 

=== modified file 'doc/misc/ede.texi'
--- a/doc/misc/ede.texi 2012-10-05 05:57:24 +0000
+++ b/doc/misc/ede.texi 2012-10-23 15:06:07 +0000
@@ -1248,7 +1248,7 @@
 
 @table @asis
 @item Step 1:
address@hidden calls @code{ede-turn-on-hook} on BUFFER.
address@hidden calls @code{ede-turn-on-hook} on BUFFER.
 @item Step 2:
 @code{ede-turn-on-hook} turns on @code{ede-minor-mode}
 @item Step 3:

=== modified file 'doc/misc/ediff.texi'
--- a/doc/misc/ediff.texi       2012-02-28 08:17:21 +0000
+++ b/doc/misc/ediff.texi       2012-10-23 15:06:07 +0000
@@ -1248,7 +1248,7 @@
 place to do various cleanups, such as deleting the variant buffers.
 Ediff provides a function, @code{ediff-janitor}, as one such possible
 hook, which you can add to @code{ediff-cleanup-hook} with
address@hidden
address@hidden
 
 @findex ediff-janitor
 This function kills buffers A, B, and, possibly, C, if these buffers aren't

=== modified file 'doc/misc/forms.texi'
--- a/doc/misc/forms.texi       2012-05-07 23:02:28 +0000
+++ b/doc/misc/forms.texi       2012-10-23 15:06:07 +0000
@@ -170,8 +170,8 @@
 @code{forms-format-list}, and the data file is updated.  If the record
 has fields that aren't included in the display, they are not changed.
 
address@hidden forms-mode-hooks
-Entering Forms mode runs the normal hook @code{forms-mode-hooks} to
address@hidden forms-mode-hook
+Entering Forms mode runs the normal hook @code{forms-mode-hook} to
 perform user-defined customization.
 
 To save any modified data, you can use @kbd{C-x C-s}

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2012-07-29 08:18:29 +0000
+++ b/doc/misc/gnus.texi        2012-10-23 15:06:07 +0000
@@ -3148,7 +3148,7 @@
 
 @lisp
 (gnus-summary-prepared-hook
-  '(lambda nil (local-set-key "d" (local-key-binding "n"))))
+  (lambda nil (local-set-key "d" (local-key-binding "n"))))
 @end lisp
 
 when the group is entered, the 'd' key will not mark the article as

=== modified file 'doc/misc/mh-e.texi'
--- a/doc/misc/mh-e.texi        2012-07-29 08:18:29 +0000
+++ b/doc/misc/mh-e.texi        2012-10-23 15:06:07 +0000
@@ -429,7 +429,7 @@
 MH-E uses normal hooks in nearly all cases, so you can assume that we
 are talking about normal hooks unless we explicitly mention that a
 hook is abnormal. We also follow the conventions described in that
-section: the name of the abnormal hooks end in @code{-hooks} and all
+section: the name of the abnormal hooks end in @code{-functions} and all
 the rest of the MH-E hooks end in @code{-hook}. You can add hooks with
 either @code{customize-option} or @code{add-hook}.
 
@@ -3749,9 +3749,9 @@
 
 @findex mh-search-p
 @kindex k
address@hidden mh-kill-folder-suppress-prompt-hooks
address@hidden mh-kill-folder-suppress-prompt-functions
 
-The hook @code{mh-kill-folder-suppress-prompt-hooks} is an abnormal
+The hook @code{mh-kill-folder-suppress-prompt-functions} is an abnormal
 hook run at the beginning of the command @kbd{k}. The hook functions
 are called with no arguments and should return a non-nil value to
 suppress the normal prompt when you remove a folder. This is useful

=== modified file 'doc/misc/sem-user.texi'
--- a/doc/misc/sem-user.texi    2012-02-29 08:11:23 +0000
+++ b/doc/misc/sem-user.texi    2012-10-23 15:06:07 +0000
@@ -277,7 +277,7 @@
 controlled by them.
 @end defvar
 
address@hidden Option semanticdb-save-database-hooks
address@hidden Option semanticdb-save-database-functions
 Abnormal hook run after a database is saved.  Each function is called
 with one argument, the object representing the database recently
 written.

=== modified file 'doc/misc/tramp.texi'
--- a/doc/misc/tramp.texi       2012-09-12 16:39:10 +0000
+++ b/doc/misc/tramp.texi       2012-10-23 15:06:07 +0000
@@ -3007,10 +3007,10 @@
 
 @lisp
 (add-hook
- 'find-file-hooks
- '(lambda ()
-    (when (file-remote-p default-directory)
-      (set (make-local-variable 'file-precious-flag) t))))
+ 'find-file-hook
+ (lambda ()
+   (when (file-remote-p default-directory)
+     (set (make-local-variable 'file-precious-flag) t))))
 @end lisp
 @end itemize
 
@@ -3126,7 +3126,7 @@
     (setq mode-line-format
           (format-mode-line mode-line-format 'font-lock-warning-face))))
 
-(add-hook 'find-file-hooks 'my-mode-line-function)
+(add-hook 'find-file-hook 'my-mode-line-function)
 (add-hook 'dired-mode-hook 'my-mode-line-function)
 @end lisp
 @end ifset
@@ -3159,10 +3159,10 @@
 
 (add-hook
  'dired-mode-hook
- '(lambda ()
-    (setq
-     mode-line-buffer-identification
-     my-mode-line-buffer-identification)))
+ (lambda ()
+   (setq
+    mode-line-buffer-identification
+    my-mode-line-buffer-identification)))
 @end lisp
 
 Since @value{emacsname} 23.1, the mode line contains an indication if
@@ -3195,9 +3195,9 @@
 @lisp
 (add-hook
  'dired-before-readin-hook
- '(lambda ()
-    (when (file-remote-p default-directory)
-      (setq dired-actual-switches "-al"))))
+ (lambda ()
+   (when (file-remote-p default-directory)
+     (setq dired-actual-switches "-al"))))
 @end lisp
 @end ifset
 
@@ -3329,9 +3329,9 @@
 
 (add-hook
  'minibuffer-setup-hook
- '(lambda ()
-    (abbrev-mode 1)
-    (setq local-abbrev-table my-tramp-abbrev-table)))
+ (lambda ()
+   (abbrev-mode 1)
+   (setq local-abbrev-table my-tramp-abbrev-table)))
 
 (defadvice minibuffer-complete
   (before my-minibuffer-complete activate)
@@ -3398,7 +3398,7 @@
 @ifset xemacs
 (recent-files-initialize)
 (add-hook
- 'find-file-hooks
+ 'find-file-hook
  (lambda ()
    (when (file-remote-p (buffer-file-name))
      (recent-files-make-permanent)))

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-10-23 07:57:42 +0000
+++ b/etc/NEWS  2012-10-23 15:06:07 +0000
@@ -621,6 +621,29 @@
 
 ** FIXME something happened to ses.el, 2012-04-17.
 
+** Hooks renamed to avoid obsolete "-hooks" suffix:
+*** semantic-lex-reset-hooks -> semantic-lex-reset-functions
+*** semantic-change-hooks -> semantic-change-functions
+*** semantic-edits-new-change-hooks -> semantic-edits-new-change-functions
+*** semantic-edits-delete-change-hooks -> 
semantic-edits-delete-change-functions
+*** semantic-edits-reparse-change-hooks -> 
semantic-edits-reparse-change-functions
+*** semanticdb-save-database-hooks -> semanticdb-save-database-functions
+*** c-prepare-bug-report-hooks -> c-prepare-bug-report-hook
+*** rcirc-sentinel-hooks -> rcirc-sentinel-functions
+*** rcirc-receive-message-hooks -> rcirc-receive-message-functions
+*** rcirc-activity-hooks -> rcirc-activity-functions
+*** rcirc-print-hooks -> rcirc-print-functions
+*** dbus-event-error-hooks -> dbus-event-error-functions
+*** eieio-pre-method-execution-hooks -> eieio-pre-method-execution-functions
+*** checkdoc-style-hooks -> checkdoc-style-functions
+*** checkdoc-comment-style-hooks -> checkdoc-comment-style-functions
+*** archive-extract-hooks -> archive-extract-hook
+*** filesets-cache-fill-content-hooks -> filesets-cache-fill-content-hook
+*** hfy-post-html-hooks -> hfy-post-html-hook
+*** nndiary-request-create-group-hooks -> 
nndiary-request-create-group-functions
+*** nndiary-request-update-info-hooks -> nndiary-request-update-info-functions
+*** nndiary-request-accept-article-hooks -> 
nndiary-request-accept-article-functions
+*** gnus-subscribe-newsgroup-hooks -> gnus-subscribe-newsgroup-functions
 
 ** Obsolete packages:
 +++

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-23 14:26:30 +0000
+++ b/lisp/ChangeLog    2012-10-23 15:06:07 +0000
@@ -1,7 +1,23 @@
+2012-10-23  Stefan Monnier  <address@hidden>
+
+       * htmlfontify.el (hfy-post-html-hook):
+       * filesets.el (filesets-cache-fill-content-hook):
+       * arc-mode.el (archive-extract-hook):
+       * progmodes/cc-mode.el (c-prepare-bug-report-hook):
+       * net/rcirc.el (rcirc-sentinel-functions)
+       (rcirc-receive-message-functions, rcirc-activity-functions)
+       (rcirc-print-functions):
+       * net/dbus.el (dbus-event-error-functions):
+       * emacs-lisp/eieio.el (eieio-pre-method-execution-functions):
+       * emacs-lisp/checkdoc.el (checkdoc-style-functions)
+       (checkdoc-comment-style-functions): Don't use "-hooks" suffix.
+       * term/sun.el (sun-raw-prefix-hooks):
+       * mail/sendmail.el (mail-yank-hooks): Use make-obsolete-variable.
+
 2012-10-23  Michael Albinus  <address@hidden>
 
-       * net/tramp-smb.el (tramp-smb-maybe-open-connection): Set
-       `tramp-chunksize' to 1.  This improves the performance.
+       * net/tramp-smb.el (tramp-smb-maybe-open-connection):
+       Set `tramp-chunksize' to 1.  This improves the performance.
        (tramp-smb-wait-for-output): Add timeout to
        `tramp-accept-process-output' calls.
 

=== modified file 'lisp/arc-mode.el'
--- a/lisp/arc-mode.el  2012-09-30 16:54:43 +0000
+++ b/lisp/arc-mode.el  2012-10-23 15:06:07 +0000
@@ -140,8 +140,10 @@
   :type 'regexp
   :group 'archive)
 
-(defcustom archive-extract-hooks nil
-  "Hooks to run when an archive member has been extracted."
+(define-obsolete-variable-alias 'archive-extract-hooks
+  'archive-extract-hook "24.3")
+(defcustom archive-extract-hook nil
+  "Hook run when an archive member has been extracted."
   :type 'hook
   :group 'archive)
 ;; ------------------------------
@@ -1078,7 +1080,7 @@
               ;; We will write out the archive ourselves if it is
               ;; part of another archive.
               (remove-hook 'write-contents-functions 'archive-write-file t))
-            (run-hooks 'archive-extract-hooks)
+            (run-hooks 'archive-extract-hook)
            (if archive-read-only
                (message "Note: altering this archive is not implemented."))))
        (archive-maybe-update t))

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2012-10-16 15:17:21 +0000
+++ b/lisp/cedet/ChangeLog      2012-10-23 15:06:07 +0000
@@ -1,14 +1,23 @@
+2012-10-23  Stefan Monnier  <address@hidden>
+
+       * semantic/db-file.el (semanticdb-save-database-functions):
+       * semantic/lex.el (semantic-lex-reset-functions):
+       * semantic/edit.el (semantic-change-functions)
+       (semantic-edits-new-change-functions)
+       (semantic-edits-delete-change-functions)
+       (semantic-edits-reparse-change-functions): Don't use "-hooks" suffix.
+
 2012-10-14  David Engster  <address@hidden>
 
-       * semantic.el (semantic-error-if-unparsed): New function.  Raise
-       error if buffer was not parsed by Semantic (bug #12045).
+       * semantic.el (semantic-error-if-unparsed): New function.
+       Raise error if buffer was not parsed by Semantic (bug #12045).
        (navigate-menu, edit-menu, cedet-menu-map): Enable Semantic items
        only if buffer was parsed.  Also, replace ':active' with ':enable'
        where necessary.
 
        * semantic/wisent/python.el
-       (semantic-python-get-system-include-path): Use
-       `python-shell-internal-send-string' if available to query Python
+       (semantic-python-get-system-include-path):
+       Use `python-shell-internal-send-string' if available to query Python
        for system paths.
 
        * semantic/senator.el (senator-next-tag, senator-previous-tag)
@@ -57,8 +66,8 @@
 2012-10-06  Chong Yidong  <address@hidden>
 
        * semantic/bovine/grammar.el:
-       * semantic/wisent/grammar.el: Move from admin/grammars.  Add
-       autoloads for bovine-grammar-mode and wisent-grammar-mode.
+       * semantic/wisent/grammar.el: Move from admin/grammars.
+       Add autoloads for bovine-grammar-mode and wisent-grammar-mode.
 
 2012-10-02  Chong Yidong  <address@hidden>
 
@@ -163,8 +172,8 @@
        (-scheme, -makefile-misc, ede-proj-target-makefile-program)
        (-makefile-archive, -makefile-shared-object)
        (ede-proj-target-makefile-info, -grammar): New autoloads.
-        (ede-proj-project): Inherit from eieio-persistent-read.  Specify
-       extension and header line.
+        (ede-proj-project): Inherit from eieio-persistent-read.
+       Specify extension and header line.
         (ede-proj-load, ede-proj-save): Replace with impl using
        eieio-persistent-read.
 
@@ -176,27 +185,27 @@
        (navigate-menu): Add menu item for Stickyfunc mode.
 
        * semantic/analyze/debug.el
-       (semantic-analyzer-debug-insert-include-summary): Before
-       dereferencing tableinner, make sure it has a value.
+       (semantic-analyzer-debug-insert-include-summary):
+       Before dereferencing tableinner, make sure it has a value.
 
        * semantic/analyze/refs.el
        (semantic-analyze-tag-references-default): When doing a lookup,
        specify noerror.
        (semantic--analyze-refs-full-lookup): Add optional noerror input
        argument.  Pass to to full-lookup-simple.
-       (semantic-analyze-refs-impl, semantic-analyze-refs-proto): Ignore
-       :typemodifiers during compare.
+       (semantic-analyze-refs-impl, semantic-analyze-refs-proto):
+       Ignore :typemodifiers during compare.
 
        * semantic/bovine/c.el (semantic-lex-cpp-define): Specify limits
        to looking back for comment chars.
        (semantic--tag-similar-names-p, semantic--tag-similar-names-p-default)
        (semantic--tag-attribute-similar-p): New.
        (semantic-c-describe-environment): Handle list value of ede-object.
-       (semantic-lex-c-preprocessor-symbol-map-builtin): Add
-       __attribute_pure__.
+       (semantic-lex-c-preprocessor-symbol-map-builtin):
+       Add __attribute_pure__.
 
-       * semantic/bovine/scm.el (semantic-format-tag-prototype): Add
-       parent and color argument.  Pass them through.
+       * semantic/bovine/scm.el (semantic-format-tag-prototype):
+       Add parent and color argument.  Pass them through.
 
        * semantic/complete.el (semantic-collector-calculate-completions):
        Search for more matches if new prefix is a substring of old one.
@@ -217,15 +226,15 @@
        the (%d tags) extra string.
        (semanticdb-project-database): Specify :type for table.
        (semanticdb-create-table-for-file): Specify file-truename.
-       (semanticdb-synchronize, semanticdb-partial-synchronize): Restore
-       code that refreshes references to include files.
+       (semanticdb-synchronize, semanticdb-partial-synchronize):
+       Restore code that refreshes references to include files.
 
        * semantic/decorate/include.el
        (semantic-decoration-on-fileless-includes): New face.
        (semantic-decoration-on-fileless-include-map)
        (semantic-decoration-on-fileless-include-menu): New variables.
-       (semantic-decoration-on-includes-highlight-default): Support
-       includes that have a table, but are not associated with a file.
+       (semantic-decoration-on-includes-highlight-default):
+       Support includes that have a table, but are not associated with a file.
        (semantic-decoration-fileless-include-describe)
        (semantic-decoration-fileless-include-menu): New functions.
        (semantic-decoration-all-include-summary): Add arrows to indicate
@@ -262,15 +271,15 @@
        * semantic/tag.el (semantic-create-tag-proxy)
        (semantic-tag-set-proxy, semantic-tag-resolve-proxy): New.
 
-       * semantic/util.el (semantic-describe-buffer): Add
-       semantic-new-buffer-fcn-was-run.
+       * semantic/util.el (semantic-describe-buffer):
+       Add semantic-new-buffer-fcn-was-run.
 
-       * semantic/wisent/java-tags.el (semantic-get-local-variables): Add
-       `this' to the local variable context.
+       * semantic/wisent/java-tags.el (semantic-get-local-variables):
+       Add `this' to the local variable context.
        (semantic-analyze-split-name, semantic-analyze-unsplit-name): New.
 
-       * semantic/wisent/python.el (semantic-python-expand-tag): New
-       function.
+       * semantic/wisent/python.el (semantic-python-expand-tag):
+       New function.
 
        * srecode/compile.el (srecode-compile-templates): Add "framework"
        special variable support.
@@ -280,7 +289,7 @@
        (srecode-semantic-handle-:cpp): New functions.
        (srecode-semantic-apply-tag-to-dict): Move from cpp-mode function
        to c-mode function.
-       (srecode-c-apply-templates): Renamed from srecode-cpp-apply-templates.
+       (srecode-c-apply-templates): Rename from srecode-cpp-apply-templates.
 
        * srecode/dictionary.el (initialize-instance): Remove bogus error
        condition.
@@ -293,8 +302,8 @@
 
        * srecode/mode.el (srecode-minor-mode): Support the m3 menu.
 
-       * srecode/semantic.el (srecode-semantic-insert-tag): Support
-       system includes.
+       * srecode/semantic.el (srecode-semantic-insert-tag):
+       Support system includes.
 
        * srecode/srt-mode.el (srecode-font-lock-keywords): Update.
 
@@ -325,8 +334,8 @@
        * ede/proj-comp.el (ede-proj-makefile-insert-rules): Fix insertion
        of phony rule.
 
-       * ede/proj-elisp.el (ede-proj-target-elisp): Remove
-       ede-emacs-preload-compiler.
+       * ede/proj-elisp.el (ede-proj-target-elisp):
+       Remove ede-emacs-preload-compiler.
        (ede-proj-makefile-insert-rules, ede-proj-makefile-dependencies):
        New methods.
        (ede-emacs-compiler): Add 'require' macro to variables and pattern
@@ -362,8 +371,8 @@
         (semantic-cpp-lexer): Add semantic-lex-c-ifdef.
        (semantic-expand-c-tag): Check if tag is non-nil before adding it
        to return list
-       (semantic-expand-c-extern-C, semantic-expand-c-complex-type): New
-       functions, copied from semantic-expand-c-tag.
+       (semantic-expand-c-extern-C, semantic-expand-c-complex-type):
+       New functions, copied from semantic-expand-c-tag.
        (semantic-find-tags-included): New override which also searches
        for include tags inside of namespaces.
        (semantic-c-dereference-typedef): Use semantic-tag-prototype-p.
@@ -371,16 +380,16 @@
 
        * semantic/bovine/el.el: Remove emacs-lisp-mode-hook.
 
-       * semantic/complete.el (semantic-complete-post-command-hook): Exit
-       completion when user has deleted all characters from the prefix.
+       * semantic/complete.el (semantic-complete-post-command-hook):
+       Exit completion when user has deleted all characters from the prefix.
        (semantic-displayor-focus-request): Return to previous window when
        focussing tags.
 
        * semantic/db-el.el (semanticdb-normalize-one-tag): Make obsolete.
        (semanticdb-elisp-sym->tag): Use help-function-arglist instead.
 
-       * semantic/db-file.el (semanticdb-create-database): Use
-       semantic-tag-version instead of just semantic-version as the
+       * semantic/db-file.el (semanticdb-create-database):
+       Use semantic-tag-version instead of just semantic-version as the
        initializer for the :semantic-tag-version slot.
 
        * semantic/db-find.el (semanticdb-find-tags-by-class-method):
@@ -394,11 +403,11 @@
        (semanticdb-save-current-db, semanticdb-save-all-db): Only emit
        message when running interactively.
 
-       * semantic/decorate/mode.el (semantic-decoration-mode): Activate
-       decoration of includes by default.
+       * semantic/decorate/mode.el (semantic-decoration-mode):
+       Activate decoration of includes by default.
 
-       * semantic/doc.el (semantic-doc-snarf-comment-for-tag): Remove
-       comment delimiter at the end of the text.
+       * semantic/doc.el (semantic-doc-snarf-comment-for-tag):
+       Remove comment delimiter at the end of the text.
 
        * semantic/ede-grammar.el (semantic-ede-proj-target-grammar):
        Change aux- and pre-load-packages.
@@ -412,16 +421,16 @@
        (ede-proj-makefile-insert-rules): Add target specific EMACSFLAGS
        to raise max-specpdl-size and max-lisp-eval-depth.
 
-       * semantic/find.el (semantic-find-tags-included): Make
-       overridable.
+       * semantic/find.el (semantic-find-tags-included):
+       Make overridable.
 
        * semantic/fw.el (semantic-alias-obsolete)
        (semantic-varalias-obsolete): Use byte-compile-warn.
        (semantic-find-file-noselect): Disable font lock by calling
        global-font-lock-mode.
 
-       * semantic/grammar.el (semantic-grammar-create-package): Fix
-       message.
+       * semantic/grammar.el (semantic-grammar-create-package):
+       Fix message.
        (semantic-grammar-batch-build-one-package): When generating
        parsers in batch-mode, ignore version control and make sure we do
        not use cached versions.
@@ -433,16 +442,16 @@
        (semantic-lex-spp-lex-text-string): Instead of only setting the
        lexer, call the major mode's setup function.
 
-       * semantic/scope.el (semantic-analyze-scoped-types-default): Use
-       semantic-tag-prototype-p.
+       * semantic/scope.el (semantic-analyze-scoped-types-default):
+       Use semantic-tag-prototype-p.
        (semantic-analyze-scope-nested-tags-default): Make sure we don't
        return tags we already have in scopetypes.
 
        * semantic/symref/filter.el
        (semantic-symref-test-count-hits-in-tag): Restore.
 
-       * semantic/wisent/comp.el (wisent-BITS-PER-WORD): Use
-       most-positive-fixnum if available.
+       * semantic/wisent/comp.el (wisent-BITS-PER-WORD):
+       Use most-positive-fixnum if available.
 
        * semantic/wisent/javascript.el (semantic-tag-protection)
        (semantic-analyze-scope-calculate-access)
@@ -477,8 +486,8 @@
 2012-10-01 Jan Moringen  <address@hidden>
 
        * semantic/idle.el
-       (semantic-idle-breadcrumbs--display-in-header-line): Escape
-       %-characters to avoid erroneous expansion in header line.
+       (semantic-idle-breadcrumbs--display-in-header-line):
+       Escape %-characters to avoid erroneous expansion in header line.
        (semantic-idle-breadcrumbs--display-in-mode-line): Likewise.
 
        * semantic/wisent/python.el (wisent-python-reconstitute-function-tag)
@@ -514,8 +523,8 @@
 
        * semantic/wisent/python.el (wisent-python-string-start-re)
        (wisent-python-string-re, wisent-python-forward-string)
-       (wisent-python-forward-line,wisent-python-lex-string): New
-       variables.
+       (wisent-python-forward-line,wisent-python-lex-string):
+       New variables.
        (wisent-python-forward-balanced-expression): New function.
 
 2012-10-01  Pete Beardmore  <address@hidden>
@@ -528,16 +537,16 @@
        (semantic-displayor-tooltip-mode)
        (semantic-displayor-tooltip-initial-max-tags)
        (semantic-displayor-tooltip-max-tags): New defcustoms.
-       (semantic-displayor-tooltip): Use new variables as initforms.  Use
-       new slot `mode' instead of `force-show'.  Rename `max-tags' to
+       (semantic-displayor-tooltip): Use new variables as initforms.
+       Use new slot `mode' instead of `force-show'.  Rename `max-tags' to
        `max-tags-initial'.
        (semantic-displayor-show-request): Display completions according
        to new modes, and make variable names clearer.
        (semantic-displayor-tooltip::semantic-displayor-scroll-request):
        Use new max-tags-initial slot.
 
-       * semantic/idle.el (semantic-idle-local-symbol-highlight): Make
-       sure there actually is a tag at point.
+       * semantic/idle.el (semantic-idle-local-symbol-highlight):
+       Make sure there actually is a tag at point.
        (semantic-idle-completion-list-default): Report errors as messages
        if semantic-idle-scheduler-verbose-flag is non-nil.
 
@@ -548,13 +557,13 @@
 
 2012-10-01  Alex Ott  <address@hidden>
 
-       * semantic/idle.el (semantic-idle-scheduler-enabled-p): Fix
-       file-checking.
+       * semantic/idle.el (semantic-idle-scheduler-enabled-p):
+       Fix file-checking.
 
 2012-10-01  Darren Hoo  <address@hidden>  (tiny change)
 
-       * semantic/db-find.el (semanticdb-find-default-throttle): Make
-       buffer-local.
+       * semantic/db-find.el (semanticdb-find-default-throttle):
+       Make buffer-local.
        (semanticdb-strip-find-results): Check for existing :filename
        attribute, so that file information from GNU Global is not lost.
 
@@ -1001,7 +1010,7 @@
        (ede-customize-forms-menu): Prevent error if there is no project.
        (ede-load-project-file): Set ede-constructing to the thing being
        constructed, instead of t.
-       (ede-project-force-load): Deleted.
+       (ede-project-force-load): Delete.
 
        * ede/base.el:
        * ede/auto.el:
@@ -1011,7 +1020,7 @@
        (autoconf-parameters-for-macro): Parse multiline parameters of
        macros.  Optionally ignore case and at bol for macro.
        (autoconf-parameter-strip): Use greedy match for newlines.
-       (autoconf-new-automake-string): Deleted.
+       (autoconf-new-automake-string): Delete.
        (autoconf-new-program): Use SRecode to fill an empty file.
 
        * ede/cpp-root.el (ede-create-lots-of-projects-under-dir):
@@ -1046,7 +1055,7 @@
        (project-am-scan-for-targets): Scan also over
        project-am-meta-type-alist.
        (ede-system-include-path): Simple implementation.
-       (ede-find-target): Deleted.  EDE core takes care of this.
+       (ede-find-target): Delete.  EDE core takes care of this.
        (ede-buffer-mine): Create the searched filename as relative.
        (project-am-load): Simplify, using autoconf-edit.
        (project-am-extract-package-info): Fix separators.
@@ -1063,7 +1072,7 @@
        (ede-proj-target-makefile-objectcode): Quote initforms.
        Support lex and yacc.
 
-       * ede/proj-prog.el (ede-proj-makefile-insert-rules): Removed.
+       * ede/proj-prog.el (ede-proj-makefile-insert-rules): Remove.
        (ede-proj-makefile-insert-variables): New, add LDDEPS.
        (ede-proj-makefile-insert-automake-post-variables): Add LDADD
        variable.  Use ldlibs-local slot.  Add a -l to ldlibs strings.
@@ -1158,7 +1167,7 @@
 
        * semantic/util.el (semantic-hack-search)
        (semantic-recursive-find-nonterminal-by-name)
-       (semantic-current-tag-interactive): Deleted.
+       (semantic-current-tag-interactive): Delete.
        (semantic-describe-buffer): Fix expand-nonterminal.
        Add lex-syntax-mods, type relation separator char, and command
        separation char.
@@ -1191,7 +1200,7 @@
        (semantic-idle-truncate-long-summaries): New option.
 
        * semantic/ia.el (semantic-ia-cache)
-       (semantic-ia-get-completions): Deleted.  Callers changed.
+       (semantic-ia-get-completions): Delete.  Callers changed.
        (semantic-ia-show-variants): New command.
        (semantic-ia-show-doc): If doc is empty, don't make a temp buffer.
        (semantic-ia-show-summary): If there isn't anything to show, say so.

=== modified file 'lisp/cedet/semantic/db-file.el'
--- a/lisp/cedet/semantic/db-file.el    2012-10-01 18:10:29 +0000
+++ b/lisp/cedet/semantic/db-file.el    2012-10-23 15:06:07 +0000
@@ -70,7 +70,9 @@
   :group 'semanticdb
   :type nil)
 
-(defcustom semanticdb-save-database-hooks nil
+(define-obsolete-variable-alias 'semanticdb-save-database-hooks
+  'semanticdb-save-database-functions "24.3")
+(defcustom semanticdb-save-database-functions nil
   "Abnormal hook run after a database is saved.
 Each function is called with one argument, the object representing
 the database recently written."
@@ -251,7 +253,7 @@
               (message "Save Error: %S: %s" (car (cdr foo))
                        objname)
             (error "%S" (car (cdr foo))))))))
-      (run-hook-with-args 'semanticdb-save-database-hooks
+      (run-hook-with-args 'semanticdb-save-database-functions
                          (or DB semanticdb-current-database))
       ;;(message "Saving tag summary for %s...done" objname)
       )

=== modified file 'lisp/cedet/semantic/edit.el'
--- a/lisp/cedet/semantic/edit.el       2012-01-19 07:21:25 +0000
+++ b/lisp/cedet/semantic/edit.el       2012-10-23 15:06:07 +0000
@@ -72,7 +72,9 @@
 
 For language specific hooks, make sure you define this as a local hook.")
 
-(defvar semantic-change-hooks
+(define-obsolete-variable-alias 'semantic-change-hooks
+  'semantic-change-functions "24.3")
+(defvar semantic-change-functions
   '(semantic-edits-change-function-handle-changes)
   "Abnormal hook run when semantic detects a change in a buffer.
 Each hook function must take three arguments, identical to the
@@ -89,11 +91,15 @@
 For language specific hooks, make sure you define this as a local hook.
 Not used yet; part of the next generation reparse mechanism.")
 
-(defvar semantic-edits-new-change-hooks nil
+(define-obsolete-variable-alias 'semantic-edits-new-change-hooks
+  'semantic-edits-new-change-functions "24.3")
+(defvar semantic-edits-new-change-functions nil
   "Abnormal hook run when a new change is found.
 Functions must take one argument representing an overlay on that change.")
 
-(defvar semantic-edits-delete-change-hooks nil
+(define-obsolete-variable-alias 'semantic-edits-delete-change-hooks
+  'semantic-edits-delete-change-functions "24.3")
+(defvar semantic-edits-delete-change-functions nil
   "Abnormal hook run before a change overlay is deleted.
 Deleted changes occur when multiple changes are merged.
 Functions must take one argument representing an overlay being deleted.")
@@ -104,7 +110,9 @@
 will be moved.
 Functions must take one argument representing an overlay being moved.")
 
-(defvar semantic-edits-reparse-change-hooks nil
+(define-obsolete-variable-alias 'semantic-edits-reparse-change-hooks
+  'semantic-edits-reparse-change-functions "24.3")
+(defvar semantic-edits-reparse-change-functions nil
   "Abnormal hook run after a change results in a reparse.
 Functions are called before the overlay is deleted, and after the
 incremental reparse.")
@@ -133,7 +141,7 @@
    (setq semantic-unmatched-syntax-cache-check t)
    (let ((inhibit-point-motion-hooks t)
         )
-     (run-hook-with-args 'semantic-change-hooks start end length)
+     (run-hook-with-args 'semantic-change-functions start end length)
      ))
 
 (defun semantic-changes-in-region (start end &optional buffer)
@@ -168,7 +176,7 @@
          ;; function will be removed from the list of active change
          ;; functions.
          (condition-case nil
-             (run-hook-with-args 'semantic-edits-new-change-hooks o)
+             (run-hook-with-args 'semantic-edits-new-change-functions o)
            (error nil)))
       (let ((tmp changes-in-change))
        ;; Find greatest bounds of all changes
@@ -188,7 +196,7 @@
        ;; Delete other changes.  They are now all bound here.
        (while changes-in-change
          (condition-case nil
-             (run-hook-with-args 'semantic-edits-delete-change-hooks
+             (run-hook-with-args 'semantic-edits-delete-change-functions
                                  (car changes-in-change))
            (error nil))
          (semantic-overlay-delete (car changes-in-change))
@@ -198,7 +206,7 @@
 (defsubst semantic-edits-flush-change (change)
   "Flush the CHANGE overlay."
   (condition-case nil
-      (run-hook-with-args 'semantic-edits-delete-change-hooks
+      (run-hook-with-args 'semantic-edits-delete-change-functions
                          change)
     (error nil))
   (semantic-overlay-delete change))

=== modified file 'lisp/cedet/semantic/lex.el'
--- a/lisp/cedet/semantic/lex.el        2012-10-01 18:10:29 +0000
+++ b/lisp/cedet/semantic/lex.el        2012-10-23 15:06:07 +0000
@@ -729,7 +729,9 @@
 start position of the block, and STREAM is the list of tokens in that
 block.")
 
-(defvar semantic-lex-reset-hooks nil
+(define-obsolete-variable-alias 'semantic-lex-reset-hooks
+  'semantic-lex-reset-functions "24.3")
+(defvar semantic-lex-reset-functions nil
   "Abnormal hook used by major-modes to reset lexical analyzers.
 Hook functions are called with START and END values for the
 current lexical pass.  Should be set with `add-hook', specifying
@@ -771,7 +773,7 @@
      ;; Make sure the state of block parsing starts over.
      (setq semantic-lex-block-streams nil)
      ;; Allow specialty reset items.
-     (run-hook-with-args 'semantic-lex-reset-hooks start end)
+     (run-hook-with-args 'semantic-lex-reset-functions start end)
      ;; Lexing state.
      (let* (;(starttime (current-time))
            (starting-position (point))

=== modified file 'lisp/emacs-lisp/checkdoc.el'
--- a/lisp/emacs-lisp/checkdoc.el       2012-05-04 23:16:47 +0000
+++ b/lisp/emacs-lisp/checkdoc.el       2012-10-23 15:06:07 +0000
@@ -124,7 +124,7 @@
 ;; Adding your own checks:
 ;;
 ;;   You can experiment with adding your own checks by setting the
-;; hooks `checkdoc-style-hooks' and `checkdoc-comment-style-hooks'.
+;; hooks `checkdoc-style-functions' and `checkdoc-comment-style-hooks'.
 ;; Return a string which is the error you wish to report.  The cursor
 ;; position should be preserved.
 ;;
@@ -274,17 +274,21 @@
   :type 'boolean)
 ;;;###autoload(put 'checkdoc-arguments-in-order-flag 'safe-local-variable 
'booleanp)
 
-(defvar checkdoc-style-hooks nil
-  "Hooks called after the standard style check is completed.
-All hooks must return nil or a string representing the error found.
+(define-obsolete-variable-alias 'checkdoc-style-hooks
+  'checkdoc-style-functions "24.3")
+(defvar checkdoc-style-functions nil
+  "Hook run after the standard style check is completed.
+All functions must return nil or a string representing the error found.
 Useful for adding new user implemented commands.
 
 Each hook is called with two parameters, (DEFUNINFO ENDPOINT).
 DEFUNINFO is the return value of `checkdoc-defun-info'.  ENDPOINT is the
 location of end of the documentation string.")
 
-(defvar checkdoc-comment-style-hooks nil
-  "Hooks called after the standard comment style check is completed.
+(define-obsolete-variable-alias 'checkdoc-comment-style-hooks
+  checkdoc-comment-style-functions "24.3")
+(defvar checkdoc-comment-style-functions nil
+  "Hook run after the standard comment style check is completed.
 Must return nil if no errors are found, or a string describing the
 problem discovered.  This is useful for adding additional checks.")
 
@@ -1843,7 +1847,7 @@
      ;; and reliance on the Ispell program.
      (checkdoc-ispell-docstring-engine e)
      ;; User supplied checks
-     (save-excursion (checkdoc-run-hooks 'checkdoc-style-hooks fp e))
+     (save-excursion (checkdoc-run-hooks 'checkdoc-style-functions fp e))
      ;; Done!
      )))
 
@@ -2353,7 +2357,7 @@
        err
        (or
        ;; Generic Full-file checks (should be comment related)
-       (checkdoc-run-hooks 'checkdoc-comment-style-hooks)
+       (checkdoc-run-hooks 'checkdoc-comment-style-functions)
        err))
       ;; Done with full file comment checks
       err)))

=== modified file 'lisp/emacs-lisp/eieio.el'
--- a/lisp/emacs-lisp/eieio.el  2012-10-14 01:42:48 +0000
+++ b/lisp/emacs-lisp/eieio.el  2012-10-23 15:06:07 +0000
@@ -2066,7 +2066,9 @@
 During executions, the list is first generated, then as each next method
 is called, the next method is popped off the stack.")
 
-(defvar eieio-pre-method-execution-hooks nil
+(define-obsolete-variable-alias 'eieio-pre-method-execution-hooks
+  'eieio-pre-method-execution-functions "24.3")
+(defvar eieio-pre-method-execution-functions nil
   "Abnormal hook run just before an EIEIO method is executed.
 The hook function must accept one argument, the list of forms
 about to be executed.")
@@ -2172,7 +2174,7 @@
              (eieiomt-method-list method method-primary nil)))
       )
 
-    (run-hook-with-args 'eieio-pre-method-execution-hooks
+    (run-hook-with-args 'eieio-pre-method-execution-functions
                        primarymethodlist)
 
     ;; Now loop through all occurrences forms which we must execute
@@ -2277,7 +2279,7 @@
 
        ;; Do the regular implementation here.
 
-       (run-hook-with-args 'eieio-pre-method-execution-hooks
+       (run-hook-with-args 'eieio-pre-method-execution-functions
                            lambdas)
 
        (setq lastval (apply (car lambdas) newargs))

=== modified file 'lisp/filesets.el'
--- a/lisp/filesets.el  2012-09-17 05:41:04 +0000
+++ b/lisp/filesets.el  2012-10-23 15:06:07 +0000
@@ -403,8 +403,10 @@
                  (sexp :tag "Other" :value nil)))
   :group 'filesets)
 
-(defcustom filesets-cache-fill-content-hooks nil
-  "Hooks to run when writing the contents of filesets' cache file.
+(define-obsolete-variable-alias 'filesets-cache-fill-content-hooks
+  'filesets-cache-fill-content-hook "24.3")
+(defcustom filesets-cache-fill-content-hook nil
+  "Hook run when writing the contents of filesets' cache file.
 
 The hook is called with the cache file as current buffer and the cursor
 at the last position.  I.e. each hook has to make sure that the cursor is
@@ -2414,7 +2416,7 @@
       (when filesets-cache-hostname-flag
        (insert (format "(setq filesets-cache-hostname %S)" (system-name)))
        (newline 2))
-      (run-hooks 'filesets-cache-fill-content-hooks)
+      (run-hooks 'filesets-cache-fill-content-hook)
       (write-file filesets-menu-cache-file))
     (setq filesets-has-changed-flag nil)
     (setq filesets-update-cache-file-flag nil)))

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-10-17 03:44:00 +0000
+++ b/lisp/gnus/ChangeLog       2012-10-23 15:06:07 +0000
@@ -1,3 +1,11 @@
+2012-10-23  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * starttls.el (starttls-extra-arguments): Doc fix.
@@ -110,7 +118,7 @@
 
 2012-09-05  Martin Stjernholm  <address@hidden>
 
-       * 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  <address@hidden>
@@ -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  <address@hidden>
 
-       * 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  <address@hidden>
 
@@ -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  <address@hidden>  (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  <address@hidden>
 
@@ -1689,8 +1697,8 @@
 
 2011-09-27  Daiki Ueno  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/gnus/gnus-start.el'
--- a/lisp/gnus/gnus-start.el   2012-07-24 22:17:17 +0000
+++ b/lisp/gnus/gnus-start.el   2012-10-23 15:06:07 +0000
@@ -291,7 +291,9 @@
                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 @@
      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 ()

=== modified file 'lisp/gnus/nndiary.el'
--- a/lisp/gnus/nndiary.el      2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/nndiary.el      2012-10-23 15:06:07 +0000
@@ -179,22 +179,28 @@
   :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."
-  :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."
-  :group 'nndiary
-  :type 'hook)
-
-(defcustom nndiary-request-accept-article-hooks nil
-  "*Hooks to run before accepting an article.
+(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)
+
+(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)
+
+(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 @@
          (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 @@
 (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 @@
             (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))
 

=== modified file 'lisp/htmlfontify.el'
--- a/lisp/htmlfontify.el       2012-09-25 04:13:02 +0000
+++ b/lisp/htmlfontify.el       2012-10-23 15:06:07 +0000
@@ -249,7 +249,8 @@
   :tag   "init-kludge-hooks"
   :type  '(hook))
 
-(defcustom hfy-post-html-hooks nil
+(define-obsolete-variable-alias 'hfy-post-html-hooks 'hfy-post-html-hook 
"24.3")
+(defcustom hfy-post-html-hook nil
   "List of functions to call after creating and filling the HTML buffer.
 These functions will be called with the HTML buffer as the current buffer."
   :group   'htmlfontify
@@ -1786,7 +1787,7 @@
       ;;(message "inserting footer")
       (insert (funcall hfy-page-footer file)))
     ;; call any post html-generation hooks:
-    (run-hooks 'hfy-post-html-hooks)
+    (run-hooks 'hfy-post-html-hook)
     ;; return the html buffer
     (set-buffer-modified-p nil)
     html-buffer))

=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el     2012-09-25 04:13:02 +0000
+++ b/lisp/mail/sendmail.el     2012-10-23 15:06:07 +0000
@@ -243,15 +243,14 @@
   :type 'integer
   :group 'sendmail)
 
-;; FIXME make it really obsolete.
 (defvar mail-yank-hooks nil
   "Obsolete hook for modifying a citation just inserted in the mail buffer.
 Each hook function can find the citation between (point) and (mark t).
 And each hook function should leave point and mark around the citation
 text as modified.
-
 This is a normal hook, misnamed for historical reasons.
-It is semi-obsolete and mail agents should no longer use it.")
+It is obsolete and mail agents should no longer use it.")
+(make-obsolete-variable 'mail-yank-hooks 'mail-citation-hook "19.34")
 
 ;;;###autoload
 (defcustom mail-citation-hook nil

=== modified file 'lisp/mh-e/ChangeLog'
--- a/lisp/mh-e/ChangeLog       2012-08-28 16:01:59 +0000
+++ b/lisp/mh-e/ChangeLog       2012-10-23 15:06:07 +0000
@@ -1,3 +1,7 @@
+2012-10-23  Stefan Monnier  <address@hidden>
+
+       * mh-letter.el (mh-yank-hooks): Use make-obsolete-variable.
+
 2012-04-25  Stefan Monnier  <address@hidden>
 
        * mh-utils.el (minibuffer-completing-file-name): Don't declare, unused.

=== modified file 'lisp/mh-e/mh-e.el'
--- a/lisp/mh-e/mh-e.el 2012-01-19 07:21:25 +0000
+++ b/lisp/mh-e/mh-e.el 2012-10-23 15:06:07 +0000
@@ -3189,7 +3189,9 @@
   :group 'mh-letter
   :package-version '(MH-E . "8.0"))
 
-(defcustom-mh mh-kill-folder-suppress-prompt-hooks '(mh-search-p)
+(define-obsolete-variable-alias 'mh-kill-folder-suppress-prompt-hooks
+  'mh-kill-folder-suppress-prompt-functions "24.3")
+(defcustom-mh mh-kill-folder-suppress-prompt-functions '(mh-search-p)
   "Abnormal hook run at the beginning of 
\\<mh-folder-mode-map>\\[mh-kill-folder].
 
 The hook functions are called with no arguments and should return

=== modified file 'lisp/mh-e/mh-letter.el'
--- a/lisp/mh-e/mh-letter.el    2012-01-19 07:21:25 +0000
+++ b/lisp/mh-e/mh-letter.el    2012-10-23 15:06:07 +0000
@@ -66,8 +66,9 @@
 And each hook function should leave point and mark around the
 citation text as modified.
 
-This is a normal hook, misnamed for historical reasons. It is
-semi-obsolete and is only used if `mail-citation-hook' is nil.")
+This is a normal hook, misnamed for historical reasons.
+It is obsolete and is only used if `mail-citation-hook' is nil.")
+(make-obsolete-variable 'mh-yank-hooks 'mail-citation-hook "19.34")
 
 
 

=== modified file 'lisp/net/dbus.el'
--- a/lisp/net/dbus.el  2012-08-15 16:29:11 +0000
+++ b/lisp/net/dbus.el  2012-10-23 15:06:07 +0000
@@ -152,7 +152,9 @@
      (dbus-error (when dbus-debug (signal (car err) (cdr err))))))
 (font-lock-add-keywords 'emacs-lisp-mode '("\\<dbus-ignore-errors\\>"))
 
-(defvar dbus-event-error-hooks nil
+(define-obsolete-variable-alias 'dbus-event-error-hooks
+  'dbus-event-error-functions "24.3")
+(defvar dbus-event-error-functions nil
   "Functions to be called when a D-Bus error happens in the event handler.
 Every function must accept two arguments, the event and the error variable
 caught in `condition-case' by `dbus-error'.")
@@ -947,7 +949,7 @@
         (dbus-method-error-internal
          (nth 1 event) (nth 4 event) (nth 3 event) (cadr err))))
      ;; Propagate D-Bus error messages.
-     (run-hook-with-args 'dbus-event-error-hooks event err)
+     (run-hook-with-args 'dbus-event-error-functions event err)
      (when (or dbus-debug (= dbus-message-type-error (nth 2 event)))
        (signal (car err) (cdr err))))))
 

=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2012-08-28 16:01:59 +0000
+++ b/lisp/net/rcirc.el 2012-10-23 15:06:07 +0000
@@ -300,7 +300,9 @@
   :type '(repeat string)
   :group 'rcirc)
 
-(defcustom rcirc-print-hooks nil
+(define-obsolete-variable-alias 'rcirc-print-hooks
+  'rcirc-print-functions "24.3")
+(defcustom rcirc-print-functions nil
   "Hook run after text is printed.
 Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT."
   :type 'hook
@@ -647,7 +649,9 @@
               "] "
               text)))))
 
-(defvar rcirc-sentinel-hooks nil
+(define-obsolete-variable-alias 'rcirc-sentinel-hooks
+  'rcirc-sentinel-functions "24.3")
+(defvar rcirc-sentinel-functions nil
   "Hook functions called when the process sentinel is called.
 Functions are called with PROCESS and SENTINEL arguments.")
 
@@ -664,7 +668,7 @@
                               sentinel
                               (process-status process)) (not rcirc-target))
          (rcirc-disconnect-buffer)))
-      (run-hook-with-args 'rcirc-sentinel-hooks process sentinel))))
+      (run-hook-with-args 'rcirc-sentinel-functions process sentinel))))
 
 (defun rcirc-disconnect-buffer (&optional buffer)
   (with-current-buffer (or buffer (current-buffer))
@@ -684,7 +688,9 @@
           (process-list))
     ps))
 
-(defvar rcirc-receive-message-hooks nil
+(define-obsolete-variable-alias 'rcirc-receive-message-hooks
+  'rcirc-receive-message-functions "24.3")
+(defvar rcirc-receive-message-functions nil
   "Hook functions run when a message is received from server.
 Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.")
 (defun rcirc-filter (process output)
@@ -738,7 +744,7 @@
         (if (not (fboundp handler))
             (rcirc-handler-generic process cmd sender args text)
           (funcall handler process sender args text))
-        (run-hook-with-args 'rcirc-receive-message-hooks
+        (run-hook-with-args 'rcirc-receive-message-functions
                             process cmd sender args text)))
     (message "UNHANDLED: %s" text)))
 
@@ -1625,7 +1631,7 @@
          (rcirc-log process sender response target text))
 
        (sit-for 0)                     ; displayed text before hook
-       (run-hook-with-args 'rcirc-print-hooks
+       (run-hook-with-args 'rcirc-print-functions
                            process sender response target text)))))
 
 (defun rcirc-generate-log-filename (process target)
@@ -1927,7 +1933,9 @@
                          (key-description (this-command-keys))
                          " for low priority activity."))))))))
 
-(defvar rcirc-activity-hooks nil
+(define-obsolete-variable-alias 'rcirc-activity-hooks
+  'rcirc-activity-functions "24.3")
+(defvar rcirc-activity-functions nil
   "Hook to be run when there is channel activity.
 
 Functions are called with a single argument, the buffer with the
@@ -1950,7 +1958,7 @@
        (unless (and (equal rcirc-activity old-activity)
                     (member type old-types))
          (rcirc-update-activity-string)))))
-  (run-hook-with-args 'rcirc-activity-hooks buffer))
+  (run-hook-with-args 'rcirc-activity-functions buffer))
 
 (defun rcirc-clear-activity (buffer)
   "Clear the BUFFER activity."

=== modified file 'lisp/progmodes/cc-mode.el'
--- a/lisp/progmodes/cc-mode.el 2012-05-26 02:34:16 +0000
+++ b/lisp/progmodes/cc-mode.el 2012-10-23 15:06:07 +0000
@@ -1703,7 +1703,9 @@
   (message "Using CC Mode version %s" c-version)
   (c-keep-region-active))
 
-(defvar c-prepare-bug-report-hooks nil)
+(define-obsolete-variable-alias 'c-prepare-bug-report-hooks
+  'c-prepare-bug-report-hook "24.3")
+(defvar c-prepare-bug-report-hook nil)
 
 ;; Dynamic variables used by reporter.
 (defvar reporter-prompt-for-summary-p)
@@ -1770,7 +1772,7 @@
                lookup-syntax-properties))
        vars)
       (lambda ()
-       (run-hooks 'c-prepare-bug-report-hooks)
+       (run-hooks 'c-prepare-bug-report-hook)
        (insert (format "Buffer Style: %s\nc-emacs-features: %s\n"
                        style c-features)))))))
 

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2012-10-23 01:18:47 +0000
+++ b/lisp/subr.el      2012-10-23 15:06:07 +0000
@@ -1260,12 +1260,10 @@
 (define-obsolete-variable-alias 'executing-macro 'executing-kbd-macro
   "before 19.34")
 
-(defvaralias 'x-lost-selection-hooks 'x-lost-selection-functions)
-(make-obsolete-variable 'x-lost-selection-hooks
-                       'x-lost-selection-functions "22.1")
-(defvaralias 'x-sent-selection-hooks 'x-sent-selection-functions)
-(make-obsolete-variable 'x-sent-selection-hooks
-                       'x-sent-selection-functions "22.1")
+(define-obsolete-variable-alias 'x-lost-selection-hooks
+  'x-lost-selection-functions "22.1")
+(define-obsolete-variable-alias 'x-sent-selection-hooks
+  'x-sent-selection-functions "22.1")
 
 ;; This was introduced in 21.4 for pre-unicode unification.  That
 ;; usage was rendered obsolete in 23.1 which uses Unicode internally.

=== modified file 'lisp/term/sun.el'
--- a/lisp/term/sun.el  2012-01-19 07:21:25 +0000
+++ b/lisp/term/sun.el  2012-10-23 15:06:07 +0000
@@ -123,6 +123,7 @@
 
 (defvar sun-raw-prefix-hooks nil
   "List of forms to evaluate after setting sun-raw-prefix.")
+(make-obsolete-variable 'sun-raw-prefix-hooks 'term-setup-hook "21.1")
 
 
 

=== modified file 'lisp/vc/ediff-mult.el'
--- a/lisp/vc/ediff-mult.el     2012-01-19 07:21:25 +0000
+++ b/lisp/vc/ediff-mult.el     2012-10-23 15:06:07 +0000
@@ -217,8 +217,9 @@
   :type 'hook
   :group 'ediff-mult)
 
-(defcustom ediff-before-session-group-setup-hooks nil
-  "Hooks to run before Ediff arranges the window for group-level operations.
+(defcustom ediff-before-session-group-setup-hooks
+  nil ;FIXME: Bad name (should be -hook or -functions) and never run??
+  "Hook run before Ediff arranges the window for group-level operations.
 It is used by commands such as `ediff-directories'.
 This hook can be used to save the previous window config, which can be restored
 on `ediff-quit', `ediff-suspend', or `ediff-quit-session-group-hook'."


reply via email to

[Prev in Thread] Current Thread [Next in Thread]