From 3553f64e0ada74be11a5ab487b5977b281ba06f4 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 1 Aug 2001 01:53:36 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 17 +++++++++++++++++ lisp/gnus-agent.el | 15 +++++++++++++-- lisp/gnus-msg.el | 4 +++- lisp/gnus-start.el | 12 ++++++++---- lisp/lpath.el | 10 ++++------ 5 files changed, 45 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b2cc8e0..d741784 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2001-07-31 Katsumi Yamaoka + + * gnus-msg.el (gnus-post-method): Refer to `gnus-parameters'. + +2001-07-31 17:00:00 ShengHuo ZHU + Originally from Pavel Jan,Bm(Bk + + * gnus-agent.el (gnus-agent-make-mode-line-string): New. + (gnus-agent-toggle-plugged): Use it. + +2001-07-31 ShengHuo ZHU + + * gnus-start.el (gnus-startup-file-coding-system): Revert to binary. + (gnus-ding-file-coding-system): New variable. + (gnus-read-newsrc-el-file, gnus-save-newsrc-file) + (gnus-slave-save-newsrc): Use it. + 2001-07-31 Kai Gro,A_(Bjohann * gnus-delay.el (gnus-delay-initialize): Use standard define-key diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 9c75819..de8e5ab 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -322,6 +322,13 @@ If this is `ask' the hook will query the user." ["Add" gnus-agent-add-server t] ["Remove" gnus-agent-remove-server t])))) +(defun gnus-agent-make-mode-line-string (string mouse2-func) + (if (and (fboundp 'propertize) + (fboundp 'make-mode-line-mouse2-map)) + (propertize string 'local-map + (make-mode-line-mouse2-map mouse2-func)) + string)) + (defun gnus-agent-toggle-plugged (plugged) "Toggle whether Gnus is unplugged or not." (interactive (list (not gnus-plugged))) @@ -330,11 +337,15 @@ If this is `ask' the hook will query the user." (setq gnus-plugged plugged) (gnus-agent-possibly-synchronize-flags) (gnus-run-hooks 'gnus-agent-plugged-hook) - (setcar (cdr gnus-agent-mode-status) " Plugged")) + (setcar (cdr gnus-agent-mode-status) + (gnus-agent-make-mode-line-string " Plugged" + 'gnus-agent-toggle-plugged))) (gnus-agent-close-connections) (setq gnus-plugged plugged) (gnus-run-hooks 'gnus-agent-unplugged-hook) - (setcar (cdr gnus-agent-mode-status) " Unplugged")) + (setcar (cdr gnus-agent-mode-status) + (gnus-agent-make-mode-line-string " Unplugged" + 'gnus-agent-toggle-plugged))) (force-mode-line-update)) (defun gnus-agent-close-connections () diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index aff9afa..235f051 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -701,7 +701,9 @@ header line with the old Message-ID." (defun gnus-post-method (arg group &optional silent) "Return the posting method based on GROUP and ARG. If SILENT, don't prompt the user." - (let ((group-method (gnus-find-method-for-group group))) + (let ((group-method + (or (car (gnus-group-find-parameter group 'gnus-post-method t)) + (gnus-find-method-for-group group)))) (cond ;; If the group-method is nil (which shouldn't happen) we use ;; the default method. diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index 6df184e..b1bad26 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -414,6 +414,10 @@ Can be used to turn version control on or off." 'ctext) "*Coding system for startup file.") +(defvar gnus-ding-file-coding-system gnus-startup-file-coding-system + "*Coding system for ding file.") +;; Note that the ding file for T-gnus ought not to have byte-codes. + ;;; Internal variables (defvar gnus-newsrc-file-version nil) @@ -2065,7 +2069,7 @@ If FORCE is non-nil, the .newsrc file is read." (condition-case nil (progn (insert-file-contents-as-coding-system - gnus-startup-file-coding-system ding-file) + gnus-ding-file-coding-system ding-file) (eval-region (point-min) (point-max))) (error (ding) @@ -2494,7 +2498,7 @@ The backup file \".newsrc.eld_\" will be created before re-reading." (gnus-message 5 "Saving %s.eld..." gnus-current-startup-file) (gnus-gnus-to-quick-newsrc-format) (gnus-run-hooks 'gnus-save-quick-newsrc-hook) - (save-buffer-as-coding-system gnus-startup-file-coding-system) + (save-buffer-as-coding-system gnus-ding-file-coding-system) (kill-buffer (current-buffer)) (gnus-message 5 "Saving %s.eld...done" gnus-current-startup-file)) @@ -2700,8 +2704,8 @@ The backup file \".newsrc.eld_\" will be created before re-reading." (make-temp-name (concat gnus-current-startup-file "-slave-"))) (modes (ignore-errors (file-modes (concat gnus-current-startup-file ".eld"))))) - (gnus-write-buffer-as-coding-system - gnus-startup-file-coding-system slave-name) + (gnus-write-buffer-as-coding-system gnus-ding-file-coding-system + slave-name) (when modes (set-file-modes slave-name modes))))) diff --git a/lisp/lpath.el b/lisp/lpath.el index eed863a..7f337e5 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -22,6 +22,7 @@ mail-aliases-setup mm-copy-tree mule-write-region-no-coding-system put-image ring-elements + propertize make-mode-line-mouse2-map rmail-select-summary rmail-summary-exists rmail-update-summary sc-cite-regexp set-font-family set-font-size temp-directory string-as-multibyte @@ -102,19 +103,16 @@ (let ((functions-variables (cond ((featurep 'xemacs) - '((propertize xml-parse-region))) + '((xml-parse-region))) ((>= emacs-major-version 21) '((function-max-args smiley-encode-buffer))) ((boundp 'MULE) '((charsetp coding-system-get compose-mail file-name-extension find-coding-systems-region function-max-args get-charset-property - propertize shell-command-to-string smiley-encode-buffer - xml-parse-region))) + shell-command-to-string smiley-encode-buffer xml-parse-region))) (t - '((function-max-args - propertize smiley-encode-buffer - xml-parse-region)))))) + '((function-max-args smiley-encode-buffer xml-parse-region)))))) (maybe-fbind (car functions-variables)) (maybe-bind (car (cdr functions-variables)))) -- 1.7.10.4