From: yamaoka Date: Wed, 7 Feb 2001 09:14:44 +0000 (+0000) Subject: Synch with Oort Gnus. X-Git-Tag: t-gnus-6_15_0-05-quimby-last-~8 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ba4508cf41466e39734d414c3785ebc279124d3;p=elisp%2Fgnus.git- Synch with Oort Gnus. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9965c95..6768edf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2001-02-06 21:00:00 ShengHuo ZHU + + * gnus-group.el (gnus-group-listing-limit): New. + (gnus-group-prepare-flat-list-dead): Use old trick to speed up. + + * gnus-topic.el (gnus-group-prepare-topics): Use gnus-killed-hashtb. + 2001-02-06 18:00:00 ShengHuo ZHU * message.el (message-newline-and-reformat): Special case for diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index e1a3af4..d048d1e 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -430,6 +430,11 @@ in the minibuffer prompt." :type '(choice (string :tag "Prompt string") (const :tag "Empty" nil))) +(defvar gnus-group-listing-limit 1000 + "*A limit of the number of groups when listing. +If the number of groups is larger than the limit, list them in a +simple manner.") + ;;; Internal variables (defvar gnus-group-sort-alist-function 'gnus-group-sort-flat @@ -1195,32 +1200,40 @@ if it is a string, only list groups matching REGEXP." ;; suggested by Jack Vinson . It does ;; this by ignoring the group format specification altogether. (let (group) - (while groups - (setq group (pop groups)) - (when (gnus-group-prepare-logic - group - (or (not regexp) - (and (stringp regexp) (string-match regexp group)) - (and (functionp regexp) (funcall regexp group)))) -;;; (gnus-add-text-properties -;;; (point) (prog1 (1+ (point)) -;;; (insert " " mark " *: " -;;; (gnus-group-name-decode group -;;; (gnus-group-name-charset -;;; nil group)) -;;; "\n")) -;;; (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb) -;;; 'gnus-unread t -;;; 'gnus-level level)) - (gnus-group-insert-group-line - group level nil - (let ((active (gnus-active group))) - (if active - (if (zerop (cdr active)) - 0 - (- (1+ (cdr active)) (car active))) - nil)) - (gnus-method-simplify (gnus-find-method-for-group group))))))) + (if (> (length groups) gnus-group-listing-limit) + (while groups + (setq group (pop groups)) + (when (gnus-group-prepare-logic + group + (or (not regexp) + (and (stringp regexp) (string-match regexp group)) + (and (functionp regexp) (funcall regexp group)))) + (gnus-add-text-properties + (point) (prog1 (1+ (point)) + (insert " " mark " *: " + (gnus-group-name-decode group + (gnus-group-name-charset + nil group)) + "\n")) + (list 'gnus-group (gnus-intern-safe group gnus-active-hashtb) + 'gnus-unread t + 'gnus-level level)))) + (while groups + (setq group (pop groups)) + (when (gnus-group-prepare-logic + group + (or (not regexp) + (and (stringp regexp) (string-match regexp group)) + (and (functionp regexp) (funcall regexp group)))) + (gnus-group-insert-group-line + group level nil + (let ((active (gnus-active group))) + (if active + (if (zerop (cdr active)) + 0 + (- (1+ (cdr active)) (car active))) + nil)) + (gnus-method-simplify (gnus-find-method-for-group group)))))))) (defun gnus-group-update-group-line () "Update the current line in the group buffer." diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index eb5576e..62ed815 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -422,14 +422,17 @@ If LOWEST is non-nil, list all newsgroups of level LOWEST or higher." (and (>= level gnus-level-killed) (<= lowest gnus-level-killed))) (gnus-group-prepare-flat-list-dead - (gnus-union - (and not-in-list - (gnus-delete-if (lambda (group) - (< (gnus-group-level group) gnus-level-killed)) - not-in-list)) - (setq gnus-killed-list (sort gnus-killed-list 'string<))) - gnus-level-killed ?K - regexp)) + (setq gnus-killed-list (sort gnus-killed-list 'string<)) + gnus-level-killed ?K regexp) + (when not-in-list + (unless gnus-killed-hashtb + (gnus-make-hashtable-from-killed)) + (gnus-group-prepare-flat-list-dead + (gnus-delete-if (lambda (group) + (or (gnus-gethash group gnus-newsrc-hashtb) + (gnus-gethash group gnus-killed-hashtb))) + not-in-list) + gnus-level-killed ?K regexp))) ;; Use topics. (prog1 diff --git a/texi/ChangeLog b/texi/ChangeLog index b7442e0..729e643 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,9 @@ +2001-02-06 19:00:00 ShengHuo ZHU + + * gnus.texi (Using GPG): Key binding. + + * message.texi (Security): Ditto. + 2001-02-06 18:00:00 ShengHuo ZHU * gnus.texi (Top): Add Using GPG. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 6880a43..020d77d 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -9619,10 +9619,11 @@ your @file{~/.emacs} or @file{~/.gnus}: (setq gpg-command-default-alist (quote ((gpg . "gpg") (gpg-2comp . "gpg")))) @end lisp -To sign or encrypt your message you may choose to use the MML Security menu or -@kbd{M-m s p} to sign your message using PGP/MIME, @kbd{M-m s s} to sign your -message using S/MIME. There's also @kbd{M-m c p} to encrypt your message with -PGP/MIME and @kbd{M-m c s} to encrypt using S/MIME. +To sign or encrypt your message you may choose to use the MML Security +menu or @kbd{C-c C-m s p} to sign your message using PGP/MIME, @kbd{C-c +C-m s s} to sign your message using S/MIME. There's also @kbd{C-c C-m c +p} to encrypt your message with PGP/MIME and @kbd{C-c C-m c s} to +encrypt using S/MIME. Gnus will ask for your passphrase and then it will send your message, if you've typed it correctly. @@ -11005,12 +11006,12 @@ UNDELETED} $B$O$*$=$i$/$?$$$F$$$N?M$K$O:GNI$NA*Br$G$7$g$&$,!"$H$-$I(B $B$-(B @sc{imap} $B%/%i%$%"%s%H$G%a!<%k%\%C%/%9$r=|$-!"$$$/$D$+$N5-;v$K4{(B $BFI(B ($B$b$7$/$O!"(BSEEN) $B$N0u$rIU$1$k$J$i!"(B@samp{nil} $B$K@_Dj$7$?$$$+$b$7$l$^(B $B$;$s!#$=$&$9$l$P!"%a!<%k%\%C%/%9$NA4$F$N5-;v$O0u$NG!2?$K4X$o$i$:C5n$N0u$rIU$1$^$9$,!"B>$K(B @samp{\Seen} $B$G$OC1$K4{FI$N0u$rIU$1$^$9!#(B -$B$3$l$i$O:G$b$"$j$=$&$JFs$D$NA*Br$G$9$,!"B>$N0u$b(B RFC2060 .AN'2.3.2 $B$GDj5A$5(B +$B$3$l$i$O:G$b$"$j$=$&$JFs$D$NA*Br$G$9$,!"B>$N0u$b(B RFC2060 N'2.3.2 $B$GDj5A$5(B $B$l$F$$$^$9!#(B @item :dontexpunge @@ -16316,7 +16317,7 @@ bbbd $B%5!<%P!<$,A0$r;W$$IU$-$^$7$?!#$G$9$+$i!"H`$r@U$a$F(B $B2<$5$$!#(B @item -Fran.ANgois Pinard---$BB?$/$N!"B?$/$N6=L#?<$/40A4$J%P%0%l%]!<%H$H(B autoconf $B$N(B +FranNgois Pinard---$BB?$/$N!"B?$/$N6=L#?<$/40A4$J%P%0%l%]!<%H$H(B autoconf $B$N(B $B%5%]!<%H!#(B @end itemize @@ -18710,7 +18711,7 @@ Borges $B$K$h$C$F9;@5$5$l!"(BJost Krieger $B$K$h$C$F0lItJ,$r9;@5$5$l$^$7$?!# Christopher Davis, Andrew Eskilsson, Kai Grossjohann, -David K.ANegedal, +David KNegedal, Richard Pieri, Fabrice Popineau, Daniel Quinlan, @@ -18796,7 +18797,7 @@ Gunnar Horrigmo, Richard Hoskins, Brad Howes, Miguel de Icaza, -Fran.ANgois Felix Ingrand, +FranNgois Felix Ingrand, Tatsuya Ichikawa, @c ? Ishikawa Ichiro, @c Ishikawa Lee Iverson, @@ -20206,8 +20207,8 @@ From: Jason L Tibbitts III @end example @item - tanken var at n.ANer du bruker `gnus-startup-file' som prefix (FOO) til Ne lete -opp en fil FOO-SERVER, FOO-SERVER.el, FOO-SERVER.eld, kan du la den v.ANfre en + tanken var at nNer du bruker `gnus-startup-file' som prefix (FOO) til Ne lete +opp en fil FOO-SERVER, FOO-SERVER.el, FOO-SERVER.eld, kan du la den vNfre en liste hvor du bruker hvert element i listen som FOO, istedet. da kunne man hatt forskjellige serveres startup-filer forskjellige steder. @@ -20277,8 +20278,8 @@ there was a sci.somethingelse group or section, then it should prompt for sci? first the sci.something? then sci.somethingelse?... @item -Ja, det burde v.ANfre en mNete Ne si slikt. Kanskje en ny variabel? -`gnus-use-few-score-files'? S.ANe kunne score-regler legges til den +Ja, det burde vNfre en mNete Ne si slikt. Kanskje en ny variabel? +`gnus-use-few-score-files'? SNe kunne score-regler legges til den "mest" lokale score-fila. F. eks. ville no-gruppene betjenes av "no.all.SCORE", osv. @@ -20603,7 +20604,7 @@ the current process mark set onto the stack. @item gnus-article-hide-pgp -Selv ville jeg nok ha valgt .ANe slette den dersom teksten matcher +Selv ville jeg nok ha valgt Ne slette den dersom teksten matcher @example "\\(This\s+\\)?[^ ]+ has been automatically signed by" @end example diff --git a/texi/gnus.texi b/texi/gnus.texi index 1f011a2..9934ad8 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -10064,10 +10064,11 @@ your @file{~/.emacs} or @file{~/.gnus}: (setq gpg-command-default-alist (quote ((gpg . "gpg") (gpg-2comp . "gpg")))) @end lisp -To sign or encrypt your message you may choose to use the MML Security menu or -@kbd{M-m s p} to sign your message using PGP/MIME, @kbd{M-m s s} to sign your -message using S/MIME. There's also @kbd{M-m c p} to encrypt your message with -PGP/MIME and @kbd{M-m c s} to encrypt using S/MIME. +To sign or encrypt your message you may choose to use the MML Security +menu or @kbd{C-c C-m s p} to sign your message using PGP/MIME, @kbd{C-c +C-m s s} to sign your message using S/MIME. There's also @kbd{C-c C-m c +p} to encrypt your message with PGP/MIME and @kbd{C-c C-m c s} to +encrypt using S/MIME. Gnus will ask for your passphrase and then it will send your message, if you've typed it correctly. diff --git a/texi/message-ja.texi b/texi/message-ja.texi index 9d76f4b..dffaaa5 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -591,31 +591,31 @@ RFC1036bis $B$O!"=pL>$O$=$NA0$K(B @samp{-- } $B$N(B3$BJ8;z$@$1$N9T$,$"$k$Y$ @c Using the MML language, Message is able to create digitally signed and @c digitally encrypted messages. Message (or rather MML) currently support @c PGP/MIME and S/MIME. Instructing MML to perform security operations on -@c a MIME part is done using the @code{M-m s} key map for signing and the -@c @code{M-m c} key map for encryption, as follows. +@c a MIME part is done using the @code{C-c C-m s} key map for signing and the +@c @code{C-c C-m c} key map for encryption, as follows. @c @table @kbd -@c @item M-m s s -@c @kindex M-m s s +@c @item C-c C-m s s +@c @kindex C-c C-m s s @c @findex mml-secure-sign-smime @c Digitally sign current MIME part using S/MIME. -@c @item M-m s p -@c @kindex M-m s p +@item C-c C-m s p +@kindex C-c C-m s p @c @findex mml-secure-sign-pgp @c Digitally sign current MIME part using PGP/MIME. -@c @item M-m c s -@c @kindex M-m c s +@item C-c C-m c s +@kindex C-c C-m c s @c @findex mml-secure-encrypt-smime @c Digitally encrypt current MIME part using S/MIME. -@c @item M-m c p -@c @kindex M-m c p +@item C-c C-m c p +@kindex C-c C-m c p @c @findex mml-secure-encrypt-pgpmime @c Digitally encrypt current MIME part using PGP/MIME. @@ -632,7 +632,7 @@ RFC1036bis $B$O!"=pL>$O$=$NA0$K(B @samp{-- } $B$N(B3$BJ8;z$@$1$N9T$,$"$k$Y$ @c information is sent, you may want to have some way to ensure that your @c mail is actually signed or encrypted. After invoking the above @c sign/encrypt commands, it is possible to preview the raw article by -@c using @code{C-u M-m P} (@code{mml-preview}). Then you can verify that +@c using @code{C-u C-m P} (@code{mml-preview}). Then you can verify that @c your long rant about what your ex-significant other or whomever actually @c did with that funny looking person at that strange party the other @c night, actually will be sent encrypted. @@ -663,7 +663,7 @@ RFC1036bis $B$O!"=pL>$O$=$NA0$K(B @samp{-- } $B$N(B3$BJ8;z$@$1$N9T$,$"$k$Y$ @c To be able to send encrypted mail, a personal certificate is not @c required. Message (MML) need a certificate for the person to whom you @c wish to communicate with though. You're asked for this when you type -@c @code{M-m c s}. Currently there are two ways to retrieve this +@c @code{C-c C-m c s}. Currently there are two ways to retrieve this @c certificate, from a local file or from DNS. If you chose a local file, @c it need to contain a X.509 certificate in PEM format. If you chose DNS, @c you're asked for the domain name where the certificate is stored, the diff --git a/texi/message.texi b/texi/message.texi index 69757f5..fbffb16 100644 --- a/texi/message.texi +++ b/texi/message.texi @@ -609,31 +609,31 @@ Manual}). Using the MML language, Message is able to create digitally signed and digitally encrypted messages. Message (or rather MML) currently support PGP/MIME and S/MIME. Instructing MML to perform security operations on -a MIME part is done using the @code{M-m s} key map for signing and the -@code{M-m c} key map for encryption, as follows. +a MIME part is done using the @code{C-c C-m s} key map for signing and the +@code{C-c C-m c} key map for encryption, as follows. @table @kbd -@item M-m s s -@kindex M-m s s +@item C-c C-m s s +@kindex C-c C-m s s @findex mml-secure-sign-smime Digitally sign current MIME part using S/MIME. -@item M-m s p -@kindex M-m s p +@item C-c C-m s p +@kindex C-c C-m s p @findex mml-secure-sign-pgp Digitally sign current MIME part using PGP/MIME. -@item M-m c s -@kindex M-m c s +@item C-c C-m c s +@kindex C-c C-m c s @findex mml-secure-encrypt-smime Digitally encrypt current MIME part using S/MIME. -@item M-m c p -@kindex M-m c p +@item C-c C-m c p +@kindex C-c C-m c p @findex mml-secure-encrypt-pgpmime Digitally encrypt current MIME part using PGP/MIME. @@ -650,7 +650,7 @@ Since signing and especially encryption often is used when sensitive information is sent, you may want to have some way to ensure that your mail is actually signed or encrypted. After invoking the above sign/encrypt commands, it is possible to preview the raw article by -using @code{C-u M-m P} (@code{mml-preview}). Then you can verify that +using @code{C-u C-m P} (@code{mml-preview}). Then you can verify that your long rant about what your ex-significant other or whomever actually did with that funny looking person at that strange party the other night, actually will be sent encrypted. @@ -681,7 +681,7 @@ already lost that contest.) To be able to send encrypted mail, a personal certificate is not required. Message (MML) need a certificate for the person to whom you wish to communicate with though. You're asked for this when you type -@code{M-m c s}. Currently there are two ways to retrieve this +@code{C-c C-m c s}. Currently there are two ways to retrieve this certificate, from a local file or from DNS. If you chose a local file, it need to contain a X.509 certificate in PEM format. If you chose DNS, you're asked for the domain name where the certificate is stored, the