From 2304b0c81542c60d36ffaa513f541d740d8d4539 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 20 Nov 2000 22:59:53 +0000 Subject: [PATCH] Synch with Gnus. --- lisp/ChangeLog | 18 ++++++++++++++++++ lisp/gnus-agent.el | 12 +++++++++++- lisp/gnus-art.el | 42 +++++++++++++++++++++++++++++++++++++++++- texi/ChangeLog | 8 ++++++++ texi/gnus-ja.texi | 9 +++++++-- texi/gnus.texi | 9 +++++++-- 6 files changed, 92 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 395a0a1..69e6d8f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,21 @@ +2000-11-20 17:00:00 ShengHuo ZHU + + * gnus-art.el (gnus-article-make-menu-bar): Use easy-menu-add. + +2000-11-20 16:00:00 ShengHuo ZHU + + * gnus-art.el (gnus-article-describe-key): Use prompt. + (gnus-article-describe-key-briefly): Ditto. + +2000-11-20 15:00:00 ShengHuo ZHU + + * gnus-agent.el (gnus-agent-expire): Ignore corrupted history. + +2000-11-20 10:00:00 ShengHuo ZHU + + * gnus-art.el (gnus-article-describe-key): New function. + (gnus-article-describe-key-briefly): New function. + 2000-11-19 23:00:00 ShengHuo ZHU * mm-decode.el (mm-decrypt-option): Doc typo. diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 2fefb48..852a525 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1541,7 +1541,17 @@ The following commands are available: (goto-char (point-min)) (while (not (eobp)) (skip-chars-forward "^\t") - (if (> (read (current-buffer)) day) + (if (let ((fetch-date (read (current-buffer)))) + (if (numberp fetch-date) + (> fetch-date day) + ;; History file is corrupted. + (gnus-message + 5 + (format "File %s is corrupted!" + (gnus-agent-lib-file "history"))) + (sit-for 1) + ;; Ignore it + t)) ;; New article; we don't expire it. (forward-line 1) ;; Old article. Schedule it for possible nuking. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 0dc292b..8981de6 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2912,6 +2912,8 @@ If variable `gnus-use-long-file-name' is non-nil, it is ">" end-of-buffer "\C-c\C-i" gnus-info-find-node "\C-c\C-b" gnus-bug + "\C-hk" gnus-article-describe-key + "\C-hc" gnus-article-describe-key-briefly "\C-d" gnus-article-read-summary-keys "\M-*" gnus-article-read-summary-keys @@ -2942,6 +2944,9 @@ If variable `gnus-use-long-file-name' is non-nil, it is (decf c)) keys)))) +(eval-when-compile + (defvar gnus-article-commands-menu)) + (defun gnus-article-make-menu-bar () (gnus-turn-off-edit-menu 'article) (unless (boundp 'gnus-article-article-menu) @@ -2971,7 +2976,12 @@ If variable `gnus-use-long-file-name' is non-nil, it is (define-key gnus-article-mode-map [menu-bar post] (cons "Post" gnus-summary-post-menu))) - (gnus-run-hooks 'gnus-article-menu-hook))) + (gnus-run-hooks 'gnus-article-menu-hook)) + ;; Add the menu. + (when (boundp 'gnus-article-commands-menu) + (easy-menu-add gnus-article-commands-menu gnus-article-mode-map)) + (when (boundp 'gnus-summary-post-menu) + (easy-menu-add gnus-summary-post-menu gnus-article-mode-map))) (defun gnus-article-mode () "Major mode for displaying an article. @@ -4421,6 +4431,36 @@ Argument LINES specifies lines to be scrolled down." (switch-to-buffer gnus-article-buffer) (ding)))))) +(defun gnus-article-describe-key (key) + "Display documentation of the function invoked by KEY. KEY is a string." + (interactive "kDescribe key: ") + (gnus-article-check-buffer) + (if (eq (key-binding key) 'gnus-article-read-summary-keys) + (save-excursion + (set-buffer gnus-article-current-summary) + (let (gnus-pick-mode) + (push (elt key 0) unread-command-events) + (setq key (if (featurep 'xemacs) + (events-to-keys (read-key-sequence "Describe key: ")) + (read-key-sequence "Describe key: ")))) + (describe-key key)) + (describe-key key))) + +(defun gnus-article-describe-key-briefly (key &optional insert) + "Display documentation of the function invoked by KEY. KEY is a string." + (interactive "kDescribe key: \nP") + (gnus-article-check-buffer) + (if (eq (key-binding key) 'gnus-article-read-summary-keys) + (save-excursion + (set-buffer gnus-article-current-summary) + (let (gnus-pick-mode) + (push (elt key 0) unread-command-events) + (setq key (if (featurep 'xemacs) + (events-to-keys (read-key-sequence "Describe key: ")) + (read-key-sequence "Describe key: ")))) + (describe-key-briefly key insert)) + (describe-key-briefly key insert))) + (defun gnus-article-hide (&optional arg force) "Hide all the gruft in the current article. This means that PGP stuff, signatures, cited text and (some) diff --git a/texi/ChangeLog b/texi/ChangeLog index 66a51ae..a6581fb 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,11 @@ +2000-11-20 08:00:00 ShengHuo ZHU + + * gnus.texi (Archived Messages): Add. + +2000-11-20 Jochen K,A|(Bpper + + * gnus.texi (Security): Fix typo. + 2000-11-20 00:00:00 ShengHuo ZHU * gnus.texi: Add. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 55e105b..a13779c 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -8645,8 +8645,8 @@ protocols. Otherwise, ask user. @item mm-decrypt-option @vindex mm-decrypt-option -Option of decrypting encrypted parts. @code{never}, not verify; -@code{always}, always verify; @code{known}, only verify known +Option of decrypting encrypted parts. @code{never}, no decryption; +@code{always}, always decrypt @code{known}, only decrypt known protocols. Otherwise, ask user. @end table @@ -9365,6 +9365,11 @@ Gnus $B$O30$X=P$F9T$/A4$F$N%a%C%;!<%8$K!"0l$D$+$=$l0J>e$N$=$N%5!<%P!<$N%0(B $B$3$NJQ?t$O(B @code{gnus-message-archive-group} $B$NBe$o$j$K;H$&;v$,$G$-$^$9(B $B$,!"8e