From d106953274d29b6be4ef7e2c442078c81a52ff2f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 23 Oct 2012 11:06:07 -0400 Subject: [PATCH] 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. --- doc/emacs/ChangeLog | 4 + doc/emacs/custom.texi | 13 +-- doc/lispintro/emacs-lisp-intro.texi | 14 +-- doc/lispref/ChangeLog | 4 + doc/lispref/functions.texi | 2 +- doc/lispref/hooks.texi | 10 +- doc/lispref/loading.texi | 4 +- doc/lispref/modes.texi | 6 +- doc/misc/dbus.texi | 4 +- doc/misc/ede.texi | 2 +- doc/misc/ediff.texi | 2 +- doc/misc/forms.texi | 4 +- doc/misc/gnus.texi | 2 +- doc/misc/mh-e.texi | 6 +- doc/misc/sem-user.texi | 2 +- doc/misc/tramp.texi | 32 +++---- etc/NEWS | 23 +++++ lisp/ChangeLog | 20 +++- lisp/arc-mode.el | 8 +- lisp/cedet/ChangeLog | 143 +++++++++++++++------------- lisp/cedet/semantic/db-file.el | 6 +- lisp/cedet/semantic/edit.el | 24 +++-- lisp/cedet/semantic/lex.el | 6 +- lisp/emacs-lisp/checkdoc.el | 20 ++-- lisp/emacs-lisp/eieio.el | 8 +- lisp/filesets.el | 8 +- lisp/gnus/ChangeLog | 28 ++++-- lisp/gnus/gnus-start.el | 6 +- lisp/gnus/nndiary.el | 30 +++--- lisp/htmlfontify.el | 5 +- lisp/mail/sendmail.el | 5 +- lisp/mh-e/ChangeLog | 4 + lisp/mh-e/mh-e.el | 4 +- lisp/mh-e/mh-letter.el | 5 +- lisp/net/dbus.el | 6 +- lisp/net/rcirc.el | 24 +++-- lisp/progmodes/cc-mode.el | 6 +- lisp/subr.el | 10 +- lisp/term/sun.el | 1 + lisp/vc/ediff-mult.el | 5 +- 40 files changed, 315 insertions(+), 201 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index f1a3cdb623..90beb08233 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-10-23 Stefan Monnier + + * custom.texi (Hooks): Clarify that -hooks is deprecated. + 2012-10-23 Chong Yidong * kmacro.texi (Edit Keyboard Macro): Fix typo. diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 68219d7890..a614126dbc 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -838,7 +838,8 @@ is a normal hook. @cindex abnormal hook A few hooks are @dfn{abnormal hooks}. Their names end in -@samp{-hooks} or @samp{-functions}, instead of @samp{-hook}. What +@samp{-functions}, 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 @@ and @kbd{C-c p} in Texinfo mode: @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 diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 55c3ef4e09..70ddb81c77 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -17909,10 +17909,10 @@ file that set values: @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 @@ not yet seen, @code{mapcar} and @code{lambda}. @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 @@ and the second argument is @code{full-range}, which will be bound to 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 @@ each column." @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 diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index a767bbf1fc..26765e7a38 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2012-10-23 Stefan Monnier + + * hooks.texi (Standard Hooks): Clarify that -hooks is deprecated. + 2012-10-23 Paul Eggert Fix outdated timestamp documentation in Elisp manual (bug#12706). diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index c94e46dad1..623106b6d0 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -978,7 +978,7 @@ anonymous function by quoting it as a list: @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 diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi index 7c91b51b29..a7f0124364 100644 --- a/doc/lispref/hooks.texi +++ b/doc/lispref/hooks.texi @@ -17,11 +17,11 @@ arguments and their values are completely ignored. The recommended way 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 -@samp{-function} 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 diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index aa24318535..77a31cfde7 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -897,8 +897,8 @@ It then restores any autoloads formerly associated with those symbols. 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 diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 8b5e3da493..4e4d700aad 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -70,9 +70,9 @@ called. You can use @code{add-hook} to add a function to an abnormal hook, but you must write the function to follow the hook's calling convention. - By convention, abnormal hook names end in @samp{-functions} or -@samp{-hooks}. 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. diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index 865e99a3aa..1f9a401df9 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -1981,7 +1981,7 @@ usually not desired. D-Bus errors in events can be made visible by setting the variable @code{dbus-debug} to @code{t}. They can also be handled by a hook function. -@defvar dbus-event-error-hooks +@defvar 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 @@ Example: (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 diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 046cdc9941..1299f2ff06 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -1248,7 +1248,7 @@ detection scheme works like this: @table @asis @item Step 1: -@code{find-file-hooks} calls @code{ede-turn-on-hook} on BUFFER. +@code{find-file-hook} 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: diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 01349e3146..0afcdd923d 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -1248,7 +1248,7 @@ This hook is run just before @code{ediff-quit-hook}. This is a good 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 -@code{add-hooks}. +@code{add-hook}. @findex ediff-janitor This function kills buffers A, B, and, possibly, C, if these buffers aren't diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi index bcb8d8974e..11c3782dd7 100644 --- a/doc/misc/forms.texi +++ b/doc/misc/forms.texi @@ -170,8 +170,8 @@ of the buffer are parsed using the specifications in @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. -@vindex forms-mode-hooks -Entering Forms mode runs the normal hook @code{forms-mode-hooks} to +@vindex 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} diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index afc324e3fb..a9cd0d3567 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -3148,7 +3148,7 @@ following is added to a group parameter @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 diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi index f6adc43578..e59b312889 100644 --- a/doc/misc/mh-e.texi +++ b/doc/misc/mh-e.texi @@ -429,7 +429,7 @@ for a description about @dfn{normal hooks} and @dfn{abnormal hooks}. 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 @@ when you press @key{TAB} when prompted for a folder name. @findex mh-search-p @kindex k -@vindex mh-kill-folder-suppress-prompt-hooks +@vindex 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 diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi index 9f4dc72fea..9d6fb11db5 100644 --- a/doc/misc/sem-user.texi +++ b/doc/misc/sem-user.texi @@ -277,7 +277,7 @@ variable. This allows SemanticDB to save tag caches in directories controlled by them. @end defvar -@deffn Option semanticdb-save-database-hooks +@deffn 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. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 530b8fdd6c..46f99acbb8 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3007,10 +3007,10 @@ checksum. @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 @@ into your @file{~/.emacs}: (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 @@ should put it into your @file{~/.emacs}: (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 @@ like this: @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 @@ minibuffer: (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 @@ their readability through a remote access: @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))) diff --git a/etc/NEWS b/etc/NEWS index d79c4ba694..4fd7e13f8c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -621,6 +621,29 @@ enabled. ** 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: +++ diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39c6b96fba..16c4983d38 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,23 @@ +2012-10-23 Stefan Monnier + + * 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 - * 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. diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index c04cd8dcf9..cebd4302d0 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -140,8 +140,10 @@ A local copy of the archive will be used when updating." :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 @@ using `make-temp-file', and the generated name is returned." ;; 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)) diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index e89e8ed258..7656248cac 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,14 +1,23 @@ +2012-10-23 Stefan Monnier + + * 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 - * 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 * 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 @@ -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 * 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 @@ -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 - * 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 (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. diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el index 7b4a47bd26..4f8e93dc39 100644 --- a/lisp/cedet/semantic/db-file.el +++ b/lisp/cedet/semantic/db-file.el @@ -70,7 +70,9 @@ passes a list of predicates in `semanticdb-project-predicate-functions'." :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 @@ If DB is not specified, then use the current database." (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) ) diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index 23b6784fe2..5b39dec262 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -72,7 +72,9 @@ updated in the current buffer. 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 @@ If the hook returns non-nil, then declare that a reparse is needed. 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 @@ Changes move when a new change overlaps an old change. The old change 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 @@ Argument START, END, and LENGTH specify the bounds of the change." (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 @@ Argument START, END, and LENGTH specify the bounds of the change." ;; 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 @@ Argument START, END, and LENGTH specify the bounds of the change." ;; 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 @@ Argument START, END, and LENGTH specify the bounds of the change." (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)) diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index d7ab5911a6..274df35590 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -729,7 +729,9 @@ This is an alist of (ANCHOR . STREAM) elements where ANCHOR is the 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 @@ analyzer which might mistake a number for as a symbol." ;; 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)) diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index ee8cbd2c3b..6250edc879 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -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 @@ made in the style guide relating to order." :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 @@ Replace with \"%s\"? " original replace) ;; 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 @@ Code:, and others referenced in the style guide." 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))) diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index 5f8cbea7c2..608134bd54 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -2066,7 +2066,9 @@ Keys are a number representing :before, :primary, and :after methods.") 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 @@ This should only be called from a generic function." (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 @@ for this common case to improve performance." ;; 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)) diff --git a/lisp/filesets.el b/lisp/filesets.el index a91d8cf0fc..7f695cf33d 100644 --- a/lisp/filesets.el +++ b/lisp/filesets.el @@ -403,8 +403,10 @@ Don't forget to check out `filesets-menu-ensure-use-cached'." (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 @@ fileset thinks this is necessary or not." (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))) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index dade2b4bbe..8cb53de85f 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,11 @@ +2012-10-23 Stefan Monnier + + * 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 (tiny change) * starttls.el (starttls-extra-arguments): Doc fix. @@ -110,7 +118,7 @@ 2012-09-05 Martin Stjernholm - * 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 @@ -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 - * 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 @@ -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 (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 @@ -1689,8 +1697,8 @@ 2011-09-27 Daiki Ueno - * 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 diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 40ee78bb69..eaf17d9e57 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 8752972c3c..73dd2921b6 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)) diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index b0bc5b6b3b..a1853a6e04 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -249,7 +249,8 @@ when not running under a window system." :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 @@ FILE, if set, is the file name." ;;(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)) diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index 331754fb1b..afa13fe4e0 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -243,15 +243,14 @@ Used by `mail-yank-original' via `mail-indent-citation'." :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 diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index 6eedef1980..adc8707f01 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,7 @@ +2012-10-23 Stefan Monnier + + * mh-letter.el (mh-yank-hooks): Use make-obsolete-variable. + 2012-04-25 Stefan Monnier * mh-utils.el (minibuffer-completing-file-name): Don't declare, unused. diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 2723fb5e68..705c92b0b4 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -3189,7 +3189,9 @@ function used to insert the signature with :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-kill-folder]. The hook functions are called with no arguments and should return diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el index 8aed187334..490bfc0756 100644 --- a/lisp/mh-e/mh-letter.el +++ b/lisp/mh-e/mh-letter.el @@ -66,8 +66,9 @@ Each hook function can find the citation between point and mark. 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") diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 772a0a9c62..c95e901c39 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -152,7 +152,9 @@ Otherwise, return result of last form in BODY, or all other errors." (dbus-error (when dbus-debug (signal (car err) (cdr err)))))) (font-lock-add-keywords 'emacs-lisp-mode '("\\")) -(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 @@ If the HANDLER returns a `dbus-error', it is propagated as return message." (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)))))) diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index dd345630b9..e9828c5f81 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -300,7 +300,9 @@ See `rcirc-dim-nick' face." :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 @@ is non-nil." "] " 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 @@ Functions are called with PROCESS and SENTINEL arguments.") 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 @@ Functions are called with PROCESS and SENTINEL arguments.") (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 @@ Function is called with PROCESS, COMMAND, SENDER, ARGS and LINE.") (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 @@ record activity." (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 @@ With prefix ARG, go to the next low priority buffer with activity." (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 @@ activity. Only run if the buffer is not visible and (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." diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 2a00095758..50eaebe4de 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -1703,7 +1703,9 @@ Key bindings: (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 @@ Key bindings: 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))))))) diff --git a/lisp/subr.el b/lisp/subr.el index 0f30976b02..94012fc47d 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1260,12 +1260,10 @@ is converted into a string by expressing it in decimal." (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. diff --git a/lisp/term/sun.el b/lisp/term/sun.el index 4bd22c1d8d..dfe7a63ac1 100644 --- a/lisp/term/sun.el +++ b/lisp/term/sun.el @@ -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") diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index 9e6f5769c8..5c471664fd 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el @@ -217,8 +217,9 @@ This can be toggled with `ediff-toggle-filename-truncation'." :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'." -- 2.20.1