From: yamaoka Date: Sun, 4 Mar 2001 22:38:40 +0000 (+0000) Subject: Synch with Oort Gnus. X-Git-Tag: t-gnus-6_15_0-10-quimby~30 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=be689881c412580219fc3b2d50fe557a7f13f1ed;p=elisp%2Fgnus.git- Synch with Oort Gnus. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ae6f001..2917ed8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2001-03-04 11:00:00 ShengHuo ZHU + + * mml.el (mml-preview): Disable local map. + + * gnus-sum.el (gnus-summary-make-menu-bar): Make + gnus-article-post-menu here. + + * gnus-art.el (gnus-article-make-menu-bar): Make summary-menu bar + if it has not been made. + 2001-03-02 02:00:00 ShengHuo ZHU * gnus-art.el (gnus-article-describe-key): Map key to event. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index b91011d..d3a62d8 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -3151,12 +3151,9 @@ If variable `gnus-use-long-file-name' is non-nil, it is (unless (lookup-key gnus-article-mode-map key) (define-key gnus-article-mode-map key 'gnus-article-read-summary-keys)))) -(eval-when-compile - (defvar gnus-article-commands-menu)) - -(defvar gnus-article-post-menu nil) - (defun gnus-article-make-menu-bar () + (unless (boundp 'gnus-article-commands-menu) + (gnus-summary-make-menu-bar)) (gnus-turn-off-edit-menu 'article) (unless (boundp 'gnus-article-article-menu) (easy-menu-define @@ -3183,16 +3180,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is ;; Note "Commands" menu is defined in gnus-sum.el for consistency - (when (boundp 'gnus-summary-post-menu) - (cond - ((not (keymapp gnus-summary-post-menu)) - (setq gnus-article-post-menu gnus-summary-post-menu)) - ((not gnus-article-post-menu) - ;; Don't share post menu. - (setq gnus-article-post-menu - (copy-keymap gnus-summary-post-menu)))) - (define-key gnus-article-mode-map [menu-bar post] - (cons "Post" gnus-article-post-menu))) + ;; Note "Post" menu is defined in gnus-sum.el for consistency (gnus-run-hooks 'gnus-article-menu-hook))) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index f3fcf12..7a9c82e 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1769,6 +1769,8 @@ increase the score of each group you read." "i" gnus-article-inline-part "|" gnus-article-pipe-part)) +(defvar gnus-article-post-menu nil) + (defun gnus-summary-make-menu-bar () (gnus-turn-off-edit-menu 'summary) @@ -1991,6 +1993,16 @@ increase the score of each group you read." ;;["Send bounced" gnus-resend-bounced-mail t]) )) + (cond + ((not (keymapp gnus-summary-post-menu)) + (setq gnus-article-post-menu gnus-summary-post-menu)) + ((not gnus-article-post-menu) + ;; Don't share post menu. + (setq gnus-article-post-menu + (copy-keymap gnus-summary-post-menu)))) + (define-key gnus-article-mode-map [menu-bar post] + (cons "Post" gnus-article-post-menu)) + (easy-menu-define gnus-summary-misc-menu gnus-summary-mode-map "" `("Misc" diff --git a/lisp/mml.el b/lisp/mml.el index c5d85cb..4622a4d 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -889,7 +889,8 @@ If RAW, don't highlight the article." (run-hooks 'gnus-article-decode-hook) (let ((gnus-newsgroup-name "dummy")) (gnus-article-prepare-display)))) - (fundamental-mode) + ;; Disable article-mode-map. + (use-local-map nil) (setq buffer-read-only t) (local-set-key "q" (lambda () (interactive) (kill-buffer nil))) (goto-char (point-min)))) diff --git a/texi/ChangeLog b/texi/ChangeLog index fbb2401..558fad2 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,13 @@ +2001-03-04 09:00:00 ShengHuo ZHU + From "Yair Friedman (Jerusalem)" + + * infohack.el (infohack): Set max-lisp-eval-depth to 600+. + +2001-03-03 Kai Gro,A_(Bjohann + + * gnus.texi (Posting Styles): Posting styles have (NAME VALUE), + not (NAME . VALUE). + 2001-02-25 08:00:00 ShengHuo ZHU From Michael Totschnig . diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 0c7e6a2..c9bed18 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -9473,7 +9473,7 @@ 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$,(B @code{nil}$B$G$J$$CM$r5"$;$P!"MM<0$O(B @code{$B9gCW$7$?(B} $B$H8@$$$^$9!#(B $B$=$l$>$l$NMM<0$OG$0U$NNL$N(B @dfn{$BB0@-(B} $B$r;}$D;v$,$G$-$^$9!#$=$l$>$l$NB0@-(B -$B$O(B @code{(@var{name} . @var{value})} $B$NBP$K$h$j@.$jN)$C$F$$$^$9!#B0@-L>(B +$B$O(B @code{(@var{name} @var{value})} $B$NBP$K$h$j@.$jN)$C$F$$$^$9!#B0@-L>(B $B$O!"(B@code{signature}, @code{signature-file}, @code{organization}, @code{address}, @code{name}, @code{body} $B$N(B $B$I$l$+$G$"$k;v$,$G$-$^$9!#B0@-L>$OJ8;zNs$G$"$k;v$b$G$-$^$9!#$=$N>l9g$O!"(B $B$3$l$O%X%C%@!$H$7$F;H$o$l!"$=$NCM$,5-;v$N%X%C%@!<$KA^F~$5$l$^$9!#$b$7(B diff --git a/texi/gnus.texi b/texi/gnus.texi index 6cfb663..e88ed02 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -9909,7 +9909,7 @@ variable will be referenced. If it's a list, then that list will be then the style is said to @dfn{match}. Each style may contain a arbitrary amount of @dfn{attributes}. Each -attribute consists of a @code{(@var{name} . @var{value})} pair. The +attribute consists of a @code{(@var{name} @var{value})} pair. The attribute name can be one of @code{signature}, @code{signature-file}, @code{organization}, @code{address}, @code{name} or @code{body}. The attribute name can also be a string. In that case, this will be used as diff --git a/texi/infohack.el b/texi/infohack.el index b6a7068..f487f9e 100644 --- a/texi/infohack.el +++ b/texi/infohack.el @@ -33,7 +33,8 @@ (replace-match ""))) (defun infohack (file) - (let ((dest-directory default-directory)) + (let ((dest-directory default-directory) + (max-lisp-eval-depth (max max-lisp-eval-depth 600))) (find-file file) (infohack-remove-unsupported) (texinfo-every-node-update)