summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2005-05-27 04:08:12 +0000
committerMiles Bader <miles@gnu.org>2005-05-27 04:08:12 +0000
commitb4e8a25b8afdaed88fc62a0e222bc9b2ff686a6e (patch)
tree2915db1aa3f0a996b4f7418f014d24064b1114f0
parent6b6f91b357f6fe2f1e0d72f046a1b8d8a2d6d8c3 (diff)
downloademacs-b4e8a25b8afdaed88fc62a0e222bc9b2ff686a6e.tar.gz
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-330
Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 71-73) - Merge from emacs--cvs-trunk--0 - Update from CVS 2005-05-27 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-util.el (gnus-run-mode-hooks): New function. * lisp/gnus/score-mode.el (gnus-score-mode): Use gnus-run-mode-hooks.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/gnus-util.el6
-rw-r--r--lisp/gnus/score-mode.el6
3 files changed, 15 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 84d38f3ff33..a5e1ccb3f7f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-27 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * gnus-util.el (gnus-run-mode-hooks): New function.
+
+ * score-mode.el (gnus-score-mode): Use gnus-run-mode-hooks.
+
2005-05-26 Luc Teirlinck <teirllm@auburn.edu>
* gnus-agent.el (gnus-agent-make-mode-line-string):
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 237e0507775..9e409001cf0 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1015,6 +1015,12 @@ ARG is passed to the first function."
(save-current-buffer
(apply 'run-hooks funcs)))
+(defun gnus-run-mode-hooks (&rest funcs)
+ "Run `run-mode-hooks' if it is available. Otherwise run `run-hooks'."
+ (if (fboundp 'run-mode-hooks)
+ (apply 'run-mode-hooks funcs)
+ (apply 'run-hooks funcs)))
+
;;; Various
(defvar gnus-group-buffer) ; Compiler directive
diff --git a/lisp/gnus/score-mode.el b/lisp/gnus/score-mode.el
index 4d5d293d398..c537012a422 100644
--- a/lisp/gnus/score-mode.el
+++ b/lisp/gnus/score-mode.el
@@ -1,6 +1,6 @@
;;; score-mode.el --- mode for editing Gnus score files
-;; Copyright (C) 1996, 2001, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001, 2004, 2005 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news, mail
@@ -28,7 +28,7 @@
(eval-when-compile (require 'cl))
(require 'mm-util) ; for mm-universal-coding-system
-(require 'gnus-util) ; for gnus-pp
+(require 'gnus-util) ; for gnus-pp, gnus-run-mode-hooks
(defvar gnus-score-mode-hook nil
"*Hook run in score mode buffers.")
@@ -71,7 +71,7 @@ This mode is an extended emacs-lisp mode.
(setq mode-name "Score")
(lisp-mode-variables nil)
(make-local-variable 'gnus-score-edit-exit-function)
- (run-mode-hooks 'emacs-lisp-mode-hook 'gnus-score-mode-hook))
+ (gnus-run-mode-hooks 'emacs-lisp-mode-hook 'gnus-score-mode-hook))
(defun gnus-score-make-menu-bar ()
(unless (boundp 'gnus-score-menu)