From d853019047c31fc77ebcac68826ab591cc1feebb Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 2 Mar 2001 10:13:34 +0000 Subject: [PATCH] Synch with Oort Gnus. * nnshimbun.el (nnshimbun-kinsoku-eol-list): Simplified. (nnshimbun-kinsoku-bol-list): Ditto. --- ChangeLog | 5 +++++ lisp/ChangeLog | 5 +++++ lisp/gnus-art.el | 28 ++++++++++++++++++++-------- lisp/nnshimbun.el | 15 ++++----------- 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2deed07..6422b03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-03-02 Katsumi Yamaoka + + * lisp/nnshimbun.el (nnshimbun-kinsoku-eol-list): Simplified. + (nnshimbun-kinsoku-bol-list): Ditto. + 2001-03-01 Katsumi Yamaoka * lisp/gnus-vers.el (gnus-revision-number): Increment to 09. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0940022..ae6f001 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2001-03-02 02:00:00 ShengHuo ZHU + + * gnus-art.el (gnus-article-describe-key): Map key to event. + (gnus-article-describe-key-briefly): Ditto + 2001-03-01 23:00:00 ShengHuo ZHU * gnus-sum.el (gnus-summary-limit-include-expunged): Fix. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index ce1d773..b91011d 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -4692,10 +4692,16 @@ Argument LINES specifies lines to be scrolled down." (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: ")))) + (if (featurep 'xemacs) + (progn + (push (elt key 0) unread-command-events) + (setq key (events-to-keys + (read-key-sequence "Describe key: ")))) + (setq unread-command-events + (mapcar + (lambda (x) (if (>= x 128) (list 'meta (- x 128)) x)) + key)) + (setq key (read-key-sequence "Describe key: ")))) (describe-key key)) (describe-key key))) @@ -4707,10 +4713,16 @@ Argument LINES specifies lines to be scrolled down." (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: ")))) + (if (featurep 'xemacs) + (progn + (push (elt key 0) unread-command-events) + (setq key (events-to-keys + (read-key-sequence "Describe key: ")))) + (setq unread-command-events + (mapcar + (lambda (x) (if (>= x 128) (list 'meta (- x 128)) x)) + key)) + (setq key (read-key-sequence "Describe key: ")))) (describe-key-briefly key insert)) (describe-key-briefly key insert))) diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el index dfb6939..893bdfa 100644 --- a/lisp/nnshimbun.el +++ b/lisp/nnshimbun.el @@ -767,19 +767,12 @@ is enclosed by at least one regexp grouping construct." (defvar nnshimbun-fill-column (min 80 (- (frame-width) 4))) (defconst nnshimbun-kinsoku-bol-list - (funcall - (if (fboundp 'string-to-char-list) - 'string-to-char-list - 'string-to-list) "\ -!)-_~}]:;',.?、。,.・:;?!゛゜´`¨^ ̄_ヽヾゝゞ〃仝々〆〇ー―‐/\〜\ -‖|…‥’”)〕]}〉》」』】°′″℃ぁぃぅぇぉっゃゅょゎァィゥェォッャュョヮヵヶ")) + (append "!)-_~}]:;',.?、。,.・:;?!゛゜´`¨^ ̄_ヽヾゝゞ〃\ +仝々〆〇ー―‐/\〜‖|…‥’”)〕]}〉》」』】°′″℃ぁぃぅぇぉ\ +っゃゅょゎァィゥェォッャュョヮヵヶ" nil)) (defconst nnshimbun-kinsoku-eol-list - (funcall - (if (fboundp 'string-to-char-list) - 'string-to-char-list - 'string-to-list) - "({[`‘“(〔[{〈《「『【°′″§")) + (append "({[`‘“(〔[{〈《「『【°′″§" nil)) (defun nnshimbun-fill-line () (forward-line 0) -- 1.7.10.4