From 557e0ced867e6a99fe0bcf1e5fe3cffbed82c5e7 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 27 Nov 2001 22:30:35 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 15 +++++++++++++++ lisp/gnus-msg.el | 11 +++++++---- lisp/gnus-topic.el | 3 ++- lisp/message.el | 6 +++++- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d799138..82c6bd4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2001-11-27 14:00:00 ShengHuo ZHU + + * gnus-topic.el (gnus-topic-mode): Add LOCAL for add-hook. + + * message.el (message-mode): make-local-hook is harmless in Emacs 21. + + * gnus-msg.el (gnus-configure-posting-styles): use + make-local-hook. Add LOCAL for add-hook. + +2001-11-27 Per Abrahamsen + + * message.el (message-mode): Use `make-local-hook' unless + obsolete. + Patch by Katsumi Yamaoka . + 2001-11-26 Katsumi Yamaoka * canlock.el: Remove sha1.el and base64.el stuff. diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index fd61a4a..c6c0cd5 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -727,7 +727,7 @@ If SILENT, don't prompt the user." (or (and (listp gnus-post-method) ;If not current/native/nil (not (listp (car gnus-post-method))) ; and not a list of methods gnus-post-method) ;then use it. - gnus-select-method + gnus-select-method message-post-method)) ;; We want the inverse of the default ((and arg (not (eq arg 0))) @@ -1611,7 +1611,8 @@ this is a reply." (setq name (assq 'name results) address (assq 'address results)) (setq results (delq name (delq address results))) - (make-local-variable 'message-setup-hook) + ;; make-local-hook is not obsolete in Emacs 20 or XEmacs. + (make-local-hook 'message-setup-hook) (dolist (result results) (add-hook 'message-setup-hook (cond @@ -1643,7 +1644,8 @@ this is a reply." (let ((value ,(cdr result))) (when value (message-goto-eoh) - (insert ,header ": " value "\n")))))))))) + (insert ,header ": " value "\n")))))))) + nil 'local)) (when (or name address) (add-hook 'message-setup-hook `(lambda () @@ -1655,7 +1657,8 @@ this is a reply." (save-excursion (message-remove-header "From") (message-goto-eoh) - (insert "From: " (message-make-from) "\n"))))))))) + (insert "From: " (message-make-from) "\n")))) + nil 'local))))) ;;; @ for MIME Edit mode diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index 0d5e04a..ccd9b42 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -1105,7 +1105,8 @@ articles in the topic and its subtopics." (setq gnus-group-change-level-function 'gnus-topic-change-level) (setq gnus-goto-missing-group-function 'gnus-topic-goto-missing-group) (make-local-hook 'gnus-check-bogus-groups-hook) - (add-hook 'gnus-check-bogus-groups-hook 'gnus-topic-clean-alist) + (add-hook 'gnus-check-bogus-groups-hook 'gnus-topic-clean-alist + nil 'local) (setq gnus-topology-checked-p nil) ;; We check the topology. (when gnus-newsrc-alist diff --git a/lisp/message.el b/lisp/message.el index b32e135..9fc66a8 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1967,8 +1967,12 @@ M-RET `message-newline-and-reformat' (break the line and reformat)." (set (make-local-variable 'tool-bar-map) (message-tool-bar-map)))) (easy-menu-add message-mode-menu message-mode-map) (easy-menu-add message-mode-field-menu message-mode-map) + ;; make-local-hook is harmless though obsolete in Emacs 21. + ;; Emacs 20 and XEmacs need make-local-hook. + (make-local-hook 'after-change-functions) ;; Mmmm... Forbidden properties... - (add-hook 'after-change-functions 'message-strip-forbidden-properties nil t) + (add-hook 'after-change-functions 'message-strip-forbidden-properties + nil 'local) ;; Allow mail alias things. (when (eq message-mail-alias-type 'abbrev) (if (fboundp 'mail-abbrevs-setup) -- 1.7.10.4