Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-118

Merge from gnus--rel--5.10

Patches applied:

 * emacs--cvs-trunk--0  (patch 254, 256, 268, 277, 291, 314, 317, 324-325)

   - Merge from gnus--rel--5.10
   - Update from CVS

 * gnus--rel--5.10  (patch 71)

   - Merge from emacs--cvs-trunk--0

2005-05-26  Lute Kamstra  <lute@gnu.org>

   * lisp/score-mode.el (gnus-score-mode): Use run-mode-hooks.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 404b496..07feee8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -90,6 +90,10 @@
 
        * dns.el (query-dns-cached): New function.
 
+2005-05-26  Lute Kamstra  <lute@gnu.org>
+
+       * score-mode.el (gnus-score-mode): Use run-mode-hooks.
+
 2005-05-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * dgnushack.el: Autoload mail-extract-address-components for XEmacs.

diff --git a/lisp/score-mode.el b/lisp/score-mode.el
index a54b57f..4d5d293 100644 (file)
--- a/lisp/score-mode.el
+++ b/lisp/score-mode.el
@@ -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-hooks 'emacs-lisp-mode-hook 'gnus-score-mode-hook))
+  (run-mode-hooks 'emacs-lisp-mode-hook 'gnus-score-mode-hook))
 
 (defun gnus-score-make-menu-bar ()
   (unless (boundp 'gnus-score-menu)

diff --git a/lisp/tls.el b/lisp/tls.el
index fd74738..2de9362 100644 (file)
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -1,6 +1,6 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
-;; Copyright (C) 1996-1999, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1996-1999, 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl