Synch with Oort Gnus.

* nnshimbun.el (nnshimbun-kinsoku-eol-list): Simplified.
(nnshimbun-kinsoku-bol-list): Ditto.

diff --git a/ChangeLog b/ChangeLog
index 2deed07..6422b03 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-02  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/nnshimbun.el (nnshimbun-kinsoku-eol-list): Simplified.
+       (nnshimbun-kinsoku-bol-list): Ditto.
+
 2001-03-01  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/gnus-vers.el (gnus-revision-number): Increment to 09.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0940022..ae6f001 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-02 02:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * 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  <zsh@cs.rochester.edu>
 
        * 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 (file)
--- 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 (file)
--- 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) "\
-!)-_~}]:;',.?\e$B!"!#!$!%!&!'!(!)!*!+!,!-!.!/!0!1!2!3!4!5!6!7!8!9!:!;!<!=!>!?!@!A\e(B\
-\e$B!B!C!D!E!G!I!K!M!O!Q!S!U!W!Y![!k!l!m!n$!$#$%$'$)$C$c$e$g$n%!%#%%%'%)%C%c%e%g%n%u%v\e(B"))
+  (append "!)-_~}]:;',.?\e$B!"!#!$!%!&!'!(!)!*!+!,!-!.!/!0!1!2!3!4!5!6!7\e(B\
+\e$B!8!9!:!;!<!=!>!?!@!A!B!C!D!E!G!I!K!M!O!Q!S!U!W!Y![!k!l!m!n$!$#$%$'$)\e(B\
+\e$B$C$c$e$g$n%!%#%%%'%)%C%c%e%g%n%u%v\e(B" nil))
 
 (defconst nnshimbun-kinsoku-eol-list
-  (funcall
-   (if (fboundp 'string-to-char-list)
-       'string-to-char-list
-     'string-to-list)
-   "({[`\e$B!F!H!J!L!N!P!R!T!V!X!Z!k!l!m!x\e(B"))
+  (append "({[`\e$B!F!H!J!L!N!P!R!T!V!X!Z!k!l!m!x\e(B" nil))
 
 (defun nnshimbun-fill-line ()
   (forward-line 0)