From ea69eb49dd4e063b4a054d85d88d7c007790adc1 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 13 Oct 2004 01:36:30 +0000 Subject: [PATCH] Synch to No Gnus 200410130127. --- lisp/ChangeLog | 6 ++++++ lisp/tls.el | 31 ++++++++++++++++++++++++++++++- texi/ChangeLog | 14 ++++++++++++++ texi/gnus-faq.texi | 11 +++++++---- texi/gnus-ja.texi | 14 ++++---------- texi/gnus.texi | 28 +++++++++++----------------- 6 files changed, 72 insertions(+), 32 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5dc60f9..102ee98 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2004-10-12 Simon Josefsson + + * net/tls.el (tls-certtool-program): New variable. + (tls-certificate-information): New function, based on + ssl-certificate-information. + 2004-10-12 Katsumi Yamaoka * compface.el: Move the version of ELisp-based uncompface program diff --git a/lisp/tls.el b/lisp/tls.el index 9c5466f..842e245 100644 --- a/lisp/tls.el +++ b/lisp/tls.el @@ -1,6 +1,6 @@ ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 1996-1999, 2003, 2004 Free Software Foundation, Inc. ;; Author: Simon Josefsson ;; Keywords: comm, tls, gnutls, ssl @@ -78,6 +78,35 @@ The default is what GNUTLS's \"gnutls-cli\" outputs." :type 'regexp :group 'tls) +(defcustom tls-certtool-program (executable-find "certtool") + "Name of GnuTLS certtool. +Used by `tls-certificate-information'." + :type '(repeat string) + :group 'tls) + +(defun tls-certificate-information (der) + "Parse X.509 certificate in DER format into an assoc list." + (let ((certificate (concat "-----BEGIN CERTIFICATE-----\n" + (base64-encode-string der) + "\n-----END CERTIFICATE-----\n")) + (exit-code 0)) + (with-current-buffer (get-buffer-create " *certtool*") + (erase-buffer) + (insert certificate) + (setq exit-code (condition-case () + (call-process-region (point-min) (point-max) + tls-certtool-program + t (list (current-buffer) nil) t + "--certificate-info") + (error -1))) + (if (/= exit-code 0) + nil + (let ((vals nil)) + (goto-char (point-min)) + (while (re-search-forward "^\\([^:]+\\): \\(.*\\)" nil t) + (push (cons (match-string 1) (match-string 2)) vals)) + (nreverse vals)))))) + (defun open-tls-stream (name buffer host service) "Open a TLS connection for a service to a host. Returns a subprocess-object to represent the connection. diff --git a/texi/ChangeLog b/texi/ChangeLog index 760cd2f..5cdac0f 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,17 @@ +2004-10-10 Juri Linkov + + * gnus.texi (Top, Marking Articles): Join two menus in one node + because a node can have only one menu. + +2004-10-09 Juri Linkov + + * gnus.texi (Fancy Mail Splitting): Remove backslash in the + example of nnmail-split-fancy. + +2004-10-12 Reiner Steib + + * gnus-faq.texi ([5.9]): Improve code for reply-in-news. + 2004-10-12 Katsumi Yamaoka * gnus.texi (X-Face): Revert 2004-02-17 change. diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi index f70902f..2b875a9 100644 --- a/texi/gnus-faq.texi +++ b/texi/gnus-faq.texi @@ -1776,11 +1776,14 @@ Answer: @example -(defadvice gnus-summary-reply (around reply-in-news activate) +(eval-after-load "gnus-msg" + '(unless (boundp 'gnus-confirm-mail-reply-to-news) + (defadvice gnus-summary-reply (around reply-in-news activate) + "Request confirmation when replying to news." (interactive) - (when (or (not (gnus-news-group-p gnus-newsgroup-name)) - (y-or-n-p "Really reply? ")) - ad-do-it)) + (when (or (not (gnus-news-group-p gnus-newsgroup-name)) + (y-or-n-p "Really reply by mail to article author? ")) + ad-do-it)))) @end example @ifnottex diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 083083c..db6d834 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -558,9 +558,6 @@ Marking Articles * Unread Articles:: 未読記事への印 * Read Articles:: 既読記事への印 * Other Marks:: 購読度に影響しない印 - -Marking Articles - * Setting Marks:: 印の付け方と消し方 * Generic Mark Commands:: 印をどのようにカスタマイズするか * Setting Process Marks:: 後の実行のための記事の印の付け方 @@ -5542,17 +5539,14 @@ News, , message, Message Manual}) を使って、あなただけがあなたのメッセー 加えて、購読度に影響しない印もあります。 -@menu -* Unread Articles:: 未読記事への印 -* Read Articles:: 既読記事への印 -* Other Marks:: 購読度に影響しない印 -@end menu - @ifinfo これらの印を操作する過剰なくらいの命令があります: @end ifinfo @menu +* Unread Articles:: 未読記事への印 +* Read Articles:: 既読記事への印 +* Other Marks:: 購読度に影響しない印 * Setting Marks:: 印の付け方と消し方 * Generic Mark Commands:: 印をどのようにカスタマイズするか * Setting Process Marks:: 後の実行のための記事の印の付け方 @@ -13242,7 +13236,7 @@ UNDELETED} はおそらくたいていの人には最良の選択でしょうが、ときど ;; @r{うにしています。しかし本当に相互投稿された記事を相互投稿} ;; @r{することは許しています。} (any "bugs-mypackage@@somewhere" "mypkg.bugs") - (any "mypackage@@somewhere\" - "bugs-mypackage" "mypkg.list") + (any "mypackage@@somewhere" - "bugs-mypackage" "mypkg.list") ;; @r{人々@dots{}} (any "larsi@@ifi\\.uio\\.no" "people.Lars_Magne_Ingebrigtsen")) ;; @r{合致しなかったメールは全てを捕まえるグループへ行きます。} diff --git a/texi/gnus.texi b/texi/gnus.texi index 63edfd2..24f3797 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -545,12 +545,9 @@ Marking Articles * Unread Articles:: Marks for unread articles. * Read Articles:: Marks for read articles. * Other Marks:: Marks that do not affect readedness. - -Marking Articles - -* Setting Marks:: How to set and remove marks. -* Generic Marking Commands:: How to customize the marking. -* Setting Process Marks:: How to mark articles for later processing. +* Setting Marks:: How to set and remove marks. +* Generic Marking Commands:: How to customize the marking. +* Setting Process Marks:: How to mark articles for later processing. Threading @@ -5683,20 +5680,17 @@ neologism ohoy!) of the article. Alphabetic marks generally mean In addition, you also have marks that do not affect readedness. -@menu -* Unread Articles:: Marks for unread articles. -* Read Articles:: Marks for read articles. -* Other Marks:: Marks that do not affect readedness. -@end menu - @ifinfo -There's a plethora of commands for manipulating these marks: +There's a plethora of commands for manipulating these marks. @end ifinfo @menu -* Setting Marks:: How to set and remove marks. -* Generic Marking Commands:: How to customize the marking. -* Setting Process Marks:: How to mark articles for later processing. +* Unread Articles:: Marks for unread articles. +* Read Articles:: Marks for read articles. +* Other Marks:: Marks that do not affect readedness. +* Setting Marks:: How to set and remove marks. +* Generic Marking Commands:: How to customize the marking. +* Setting Process Marks:: How to mark articles for later processing. @end menu @@ -14057,7 +14051,7 @@ Let's look at an example value of this variable first: ;; @r{the bugs- list, but allow cross-posting when the} ;; @r{message was really cross-posted.} (any "bugs-mypackage@@somewhere" "mypkg.bugs") - (any "mypackage@@somewhere\" - "bugs-mypackage" "mypkg.list") + (any "mypackage@@somewhere" - "bugs-mypackage" "mypkg.list") ;; @r{People@dots{}} (any "larsi@@ifi\\.uio\\.no" "people.Lars_Magne_Ingebrigtsen")) ;; @r{Unmatched mail goes to the catch all group.} -- 1.7.10.4