From 9a9691963ddcdcbe3aeba52c591b728b73e8796c Mon Sep 17 00:00:00 2001 From: Lute Kamstra Date: Thu, 26 May 2005 16:43:37 +0000 Subject: [PATCH] * progmodes/ada-mode.el (ada-mode): * progmodes/antlr-mode.el (antlr-mode): * progmodes/autoconf.el (autoconf-mode): * progmodes/dcl-mode.el (dcl-mode): * progmodes/delphi.el (delphi-mode): * progmodes/ebrowse.el (ebrowse-tree-mode) (ebrowse-electric-list-mode, ebrowse-member-mode) (ebrowse-electric-position-mode): * progmodes/f90.el (f90-mode): * progmodes/fortran.el (fortran-mode): * progmodes/icon.el (icon-mode): * progmodes/idlw-help.el (idlwave-help-mode): * progmodes/idlw-shell.el (idlwave-shell-mode): * progmodes/idlwave.el (idlwave-mode): * progmodes/inf-lisp.el (inferior-lisp-mode): * progmodes/m4-mode.el (m4-mode): * progmodes/meta-mode.el (metafont-mode, metapost-mode): * progmodes/modula2.el (modula-2-mode): * progmodes/octave-inf.el (inferior-octave-mode): * progmodes/octave-mod.el (octave-mode): * progmodes/pascal.el (pascal-mode): * progmodes/sh-script.el (sh-mode): * progmodes/sql.el (sql-mode, sql-interactive-mode): * progmodes/vhdl-mode.el (vhdl-mode): * progmodes/xscheme.el (scheme-interaction-mode): Use run-mode-hooks. --- lisp/ChangeLog | 25 +++++++++++++++++++++++++ lisp/progmodes/ada-mode.el | 2 +- lisp/progmodes/antlr-mode.el | 2 +- lisp/progmodes/autoconf.el | 2 +- lisp/progmodes/dcl-mode.el | 2 +- lisp/progmodes/delphi.el | 2 +- lisp/progmodes/ebrowse.el | 8 ++++---- lisp/progmodes/f90.el | 2 +- lisp/progmodes/fortran.el | 2 +- lisp/progmodes/icon.el | 2 +- lisp/progmodes/idlw-help.el | 2 +- lisp/progmodes/idlw-shell.el | 2 +- lisp/progmodes/idlwave.el | 2 +- lisp/progmodes/inf-lisp.el | 2 +- lisp/progmodes/m4-mode.el | 2 +- lisp/progmodes/meta-mode.el | 4 ++-- lisp/progmodes/modula2.el | 2 +- lisp/progmodes/octave-inf.el | 2 +- lisp/progmodes/octave-mod.el | 2 +- lisp/progmodes/pascal.el | 2 +- lisp/progmodes/sh-script.el | 2 +- lisp/progmodes/sql.el | 4 ++-- lisp/progmodes/vhdl-mode.el | 2 +- lisp/progmodes/xscheme.el | 2 +- 24 files changed, 53 insertions(+), 28 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 057ed951994..70a22f6123e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -43,6 +43,31 @@ * play/snake.el (snake-mode): * play/solitaire.el (solitaire-mode): * play/tetris.el (tetris-mode): + * progmodes/ada-mode.el (ada-mode): + * progmodes/antlr-mode.el (antlr-mode): + * progmodes/autoconf.el (autoconf-mode): + * progmodes/dcl-mode.el (dcl-mode): + * progmodes/delphi.el (delphi-mode): + * progmodes/ebrowse.el (ebrowse-tree-mode) + (ebrowse-electric-list-mode, ebrowse-member-mode) + (ebrowse-electric-position-mode): + * progmodes/f90.el (f90-mode): + * progmodes/fortran.el (fortran-mode): + * progmodes/icon.el (icon-mode): + * progmodes/idlw-help.el (idlwave-help-mode): + * progmodes/idlw-shell.el (idlwave-shell-mode): + * progmodes/idlwave.el (idlwave-mode): + * progmodes/inf-lisp.el (inferior-lisp-mode): + * progmodes/m4-mode.el (m4-mode): + * progmodes/meta-mode.el (metafont-mode, metapost-mode): + * progmodes/modula2.el (modula-2-mode): + * progmodes/octave-inf.el (inferior-octave-mode): + * progmodes/octave-mod.el (octave-mode): + * progmodes/pascal.el (pascal-mode): + * progmodes/sh-script.el (sh-mode): + * progmodes/sql.el (sql-mode, sql-interactive-mode): + * progmodes/vhdl-mode.el (vhdl-mode): + * progmodes/xscheme.el (scheme-interaction-mode): * replace.el (occur-mode): * ses.el (ses-mode): * simple.el (completion-list-mode): diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index d31978b5ec9..bc0edb1f047 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -1369,7 +1369,7 @@ If you use ada-xref.el: (min ada-indent (current-column)))))) (add-hook 'skeleton-end-hook 'ada-adjust-case-skeleton nil t) - (run-hooks 'ada-mode-hook) + (run-mode-hooks 'ada-mode-hook) ;; To be run after the hook, in case the user modified ;; ada-fill-comment-prefix diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index 03587577f59..bdf376bfab7 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -2624,7 +2624,7 @@ the default language." (imenu-add-to-menubar (if (stringp antlr-imenu-name) antlr-imenu-name "Index"))) (antlr-set-tabs) - (run-hooks 'antlr-mode-hook)) + (run-mode-hooks 'antlr-mode-hook)) ;; A smarter version of `group-buffers-menu-by-mode-then-alphabetically' (in ;; XEmacs) could use the following property. The header of the submenu would diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index ec83e33b10d..908b18b070b 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -103,7 +103,7 @@ searching backwards at another AC_... command." (set (make-local-variable 'indent-line-function) #'indent-relative) (set (make-local-variable 'add-log-current-defun-function) #'autoconf-current-defun-function) - (run-hooks 'autoconf-mode-hook)) + (run-mode-hooks 'autoconf-mode-hook)) (provide 'autoconf-mode) diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index b52e004e5bb..0a89091165c 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -641,7 +641,7 @@ There is some minimal font-lock support (see vars (setq mode-name "DCL") (use-local-map dcl-mode-map) (tempo-use-tag-list 'dcl-tempo-tags) - (run-hooks 'dcl-mode-hook)) + (run-mode-hooks 'dcl-mode-hook)) ;;; *** Movement commands *************************************************** diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el index 8d3ee554026..3d86f15c175 100644 --- a/lisp/progmodes/delphi.el +++ b/lisp/progmodes/delphi.el @@ -2002,7 +2002,7 @@ no args, if that value is non-nil." (delphi-parse-region (point-min) (point-max)) (delphi-progress-done)))) - (run-hooks 'delphi-mode-hook)) + (run-mode-hooks 'delphi-mode-hook)) ;;; arch-tag: 410e192d-e9b5-4397-ad62-12340fc3fa41 ;;; delphi.el ends here diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el index 6dd15897e7b..953ecd79f7f 100644 --- a/lisp/progmodes/ebrowse.el +++ b/lisp/progmodes/ebrowse.el @@ -1162,7 +1162,7 @@ Tree mode key bindings: (when tree (ebrowse-redraw-tree) (set-buffer-modified-p nil)) - (run-hooks 'ebrowse-tree-mode-hook))) + (run-mode-hooks 'ebrowse-tree-mode-hook))) @@ -2026,7 +2026,7 @@ COLLAPSE non-nil means collapse the branch." truncate-lines t buffer-read-only t major-mode 'ebrowse-electric-list-mode) - (run-hooks 'ebrowse-electric-list-mode-hook)) + (run-mode-hooks 'ebrowse-electric-list-mode-hook)) (defun ebrowse-list-tree-buffers () @@ -2277,7 +2277,7 @@ See 'Electric-command-loop' for a description of STATE and CONDITION." ebrowse--const-display-flag nil ebrowse--pure-display-flag nil) (modify-syntax-entry ?_ (char-to-string (char-syntax ?a))) - (run-hooks 'ebrowse-member-mode-hook)) + (run-mode-hooks 'ebrowse-member-mode-hook)) @@ -3987,7 +3987,7 @@ Runs the hook `ebrowse-electric-position-mode-hook'." truncate-lines t buffer-read-only t major-mode 'ebrowse-electric-position-mode) - (run-hooks 'ebrowse-electric-position-mode-hook)) + (run-mode-hooks 'ebrowse-electric-position-mode-hook)) (defun ebrowse-draw-position-buffer () diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index eb6db05c159..6eb39051984 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -830,7 +830,7 @@ with no args, if that value is non-nil." (set (make-local-variable 'end-of-defun-function) 'f90-end-of-subprogram) (set (make-local-variable 'add-log-current-defun-function) #'f90-current-defun) - (run-hooks 'f90-mode-hook)) + (run-mode-hooks 'f90-mode-hook)) ;; Inline-functions. diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index 30e1977d28d..458a4c8de2b 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -799,7 +799,7 @@ with no args, if that value is non-nil." #'fortran-current-defun) (set (make-local-variable 'dabbrev-case-fold-search) 'case-fold-search) (set (make-local-variable 'gud-find-expr-function) 'fortran-gud-find-expr) - (run-hooks 'fortran-mode-hook)) + (run-mode-hooks 'fortran-mode-hook)) (defun fortran-gud-find-expr () diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el index c61c64532a3..0eb1b8bf3df 100644 --- a/lisp/progmodes/icon.el +++ b/lisp/progmodes/icon.el @@ -205,7 +205,7 @@ with no args, if that value is non-nil." (cons '(icon-mode "\\" "\\" nil icon-forward-sexp-function) hs-special-modes-alist))) - (run-hooks 'icon-mode-hook)) + (run-mode-hooks 'icon-mode-hook)) ;; This is used by indent-for-comment to decide how much to ;; indent a comment in Icon code based on its context. diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 8696e1a7d63..6c2cb00bbde 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -278,7 +278,7 @@ Here are all keybindings. (set (make-local-variable 'idlwave-help-def-pos) nil) (set (make-local-variable 'idlwave-help-args) nil) (set (make-local-variable 'idlwave-help-in-header) nil) - (run-hooks 'idlwave-help-mode-hook)) + (run-mode-hooks 'idlwave-help-mode-hook)) (defun idlwave-html-help-location () "Return the help directory where HTML files are, or nil if that is unknown." diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 77244819f1b..e804b9f8d50 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -1055,7 +1055,7 @@ IDL has currently stepped.") (set (make-local-variable 'tool-bar-map) nil) ;; Run the hooks. - (run-hooks 'idlwave-shell-mode-hook) + (run-mode-hooks 'idlwave-shell-mode-hook) (idlwave-shell-send-command idlwave-shell-initial-commands nil 'hide) ;; Turn off IDL's ^d interpreting, and define a system ;; variable which knows the version of IDLWAVE diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index a118b0055a9..6bd7e0eaced 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -1954,7 +1954,7 @@ The main features of this mode are (idlwave-new-buffer-update) ;; Run the mode hook - (run-hooks 'idlwave-mode-hook)) + (run-mode-hooks 'idlwave-mode-hook)) (defvar idlwave-setup-done nil) (defun idlwave-setup () diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 13bc7f08999..b59ac86d417 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -269,7 +269,7 @@ to continue it." (use-local-map inferior-lisp-mode-map) ;c-c c-k for "kompile" file (setq comint-get-old-input (function lisp-get-old-input)) (setq comint-input-filter (function lisp-input-filter)) - (run-hooks 'inferior-lisp-mode-hook)) + (run-mode-hooks 'inferior-lisp-mode-hook)) (defun lisp-get-old-input () "Return a string containing the sexp ending at point." diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el index bd6fac5c639..5becd22f6eb 100644 --- a/lisp/progmodes/m4-mode.el +++ b/lisp/progmodes/m4-mode.el @@ -147,7 +147,7 @@ font-lock-defaults '(m4-font-lock-keywords nil) ) (set-syntax-table m4-mode-syntax-table) - (run-hooks 'm4-mode-hook)) + (run-mode-hooks 'm4-mode-hook)) (provide 'm4-mode) ;;stuff to play with for debugging diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index 7bf9921b2ee..3d77de8f182 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -998,7 +998,7 @@ Turning on Metafont mode calls the value of the variables (setq meta-complete-list (list (list "\\<\\(\\sw+\\)" 1 'meta-symbol-list) (list "" 'ispell-complete-word))) - (run-hooks 'meta-common-mode-hook 'metafont-mode-hook)) + (run-mode-hooks 'meta-common-mode-hook 'metafont-mode-hook)) ;;;###autoload (defun metapost-mode () @@ -1023,7 +1023,7 @@ Turning on MetaPost mode calls the value of the variable (setq meta-complete-list (list (list "\\<\\(\\sw+\\)" 1 'meta-symbol-list) (list "" 'ispell-complete-word))) - (run-hooks 'meta-common-mode-hook 'metapost-mode-hook)) + (run-mode-hooks 'meta-common-mode-hook 'metapost-mode-hook)) ;;; Just in case ... diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el index 0fa46bee0f9..5fd3dbcb11b 100644 --- a/lisp/progmodes/modula2.el +++ b/lisp/progmodes/modula2.el @@ -172,7 +172,7 @@ followed by the first character of the construct. ;; Obsoleted by Emacs 19.35 parse-partial-sexp's COMMENTSTOP. ;(font-lock-comment-start-regexp . "(\\*") )) - (run-hooks 'm2-mode-hook)) + (run-mode-hooks 'm2-mode-hook)) ;; Regexps written with help from Ron Forrester ;; and Spencer Allain . diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el index 265cf6c049b..250d00171f2 100644 --- a/lisp/progmodes/octave-inf.el +++ b/lisp/progmodes/octave-inf.el @@ -158,7 +158,7 @@ Entry to this mode successively runs the hooks `comint-mode-hook' and inferior-octave-dynamic-complete-functions) (comint-read-input-ring t) - (run-hooks 'inferior-octave-mode-hook)) + (run-mode-hooks 'inferior-octave-mode-hook)) ;;;###autoload (defun inferior-octave (&optional arg) diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index 281edfd693e..35d5bd897c9 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el @@ -555,7 +555,7 @@ including a reproducible test case and send the message." (octave-add-octave-menu) (octave-initialize-completions) - (run-hooks 'octave-mode-hook)) + (run-mode-hooks 'octave-mode-hook)) ;;; Miscellaneous useful functions (defun octave-describe-major-mode () diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index 6292fd36a67..e4d36244537 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el @@ -383,7 +383,7 @@ no args, if that value is non-nil." (make-local-variable 'imenu-generic-expression) (setq imenu-generic-expression pascal-imenu-generic-expression) (setq imenu-case-fold-search t) - (run-hooks 'pascal-mode-hook)) + (run-mode-hooks 'pascal-mode-hook)) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index e2d82f7f13b..604ff8c1e78 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1392,7 +1392,7 @@ with your script for an edit-interpret-debug cycle." (string-match "\\.m?spec\\'" buffer-file-name)) "rpm"))))) (sh-set-shell (or interpreter sh-shell-file) nil nil)) - (run-hooks 'sh-mode-hook)) + (run-mode-hooks 'sh-mode-hook)) ;;;###autoload (defalias 'shell-script-mode 'sh-mode) diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 902cd920ead..add4493e5f8 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -2249,7 +2249,7 @@ you must tell Emacs. Here's how to do that in your `~/.emacs' file: (setq local-abbrev-table sql-mode-abbrev-table) (setq abbrev-all-caps 1) ;; Run hook - (run-hooks 'sql-mode-hook) + (run-mode-hooks 'sql-mode-hook) ;; Catch changes to sql-product and highlight accordingly (sql-highlight-product) (add-hook 'hack-local-variables-hook 'sql-highlight-product t t)) @@ -2367,7 +2367,7 @@ you entered, right above the output it created. (make-local-variable 'sql-input-ring-separator) (make-local-variable 'sql-input-ring-file-name) ;; Run hook. - (run-hooks 'sql-interactive-mode-hook) + (run-mode-hooks 'sql-interactive-mode-hook) ;; Set comint based on user overrides. (setq comint-prompt-regexp sql-prompt-regexp) (setq left-margin sql-prompt-length) diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index f840ef356d9..af05de75b34 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4622,7 +4622,7 @@ Key bindings: (if noninteractive "" " See menu for documentation and release notes.")) ;; run hooks - (run-hooks 'vhdl-mode-hook)) + (run-mode-hooks 'vhdl-mode-hook)) (defun vhdl-activate-customizations () "Activate all customizations on local variables." diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el index bf1279da8a0..8ee791affe1 100644 --- a/lisp/progmodes/xscheme.el +++ b/lisp/progmodes/xscheme.el @@ -338,7 +338,7 @@ with no args, if that value is non-nil. (setq xscheme-previous-process-state (cons nil nil))))))) (scheme-interaction-mode-initialize) (scheme-mode-variables) - (run-hooks 'scheme-mode-hook 'scheme-interaction-mode-hook)) + (run-mode-hooks 'scheme-mode-hook 'scheme-interaction-mode-hook)) (defun exit-scheme-interaction-mode () "Take buffer out of scheme interaction mode" -- 2.39.2