changeset 68785:b3bce12214a9

Revision: [e-mail]/emacs--devo--0--patch-65 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 27-28) - Update from CVS: lisp/gnus.el: Remove bogus comment. - Merge from emacs--devo--0

--- a/lisp/gnus/ChangeLog	Sat Feb 11 00:04:32 2006 +0000
+++ b/lisp/gnus/ChangeLog	Sat Feb 11 00:06:28 2006 +0000
@@ -1,3 +1,7 @@
[phone]  Reiner Steib  <[e-mail]>
+
+	* gnus.el: Remove bogus comment.
+
 2006-02-09  Daiki Ueno  <[e-mail]>
 
 	* pgg-gpg.el (pgg-gpg-encrypt-region): Don't convert line-endings
@@ -84,7 +88,7 @@
 
 	* gnus-util.el (gnus-error): Describe `args'.
 
-2006-02-03  Andreas Seltenreich <[e-mail]>
[phone]  Andreas Seltenreich  <[e-mail]>
 
 	* nnweb.el (nnweb-request-group): Avoid growing overview files.
 
@@ -101,7 +105,7 @@
 	* mml.el (mml-generate-mime-1): Correct the order of inline signed
 	parts.
 
-2006-01-31  Andreas Seltenreich <[e-mail]>
[phone]  Andreas Seltenreich  <[e-mail]>
 
 	* nnweb.el (nnweb-group-alist): Use defvar instead of defvoo,
 	there's only one active file for all servers.
@@ -142,7 +146,7 @@
 
 	* nnweb.el (nnweb-google-parse-1): Clarify some comments.
 
-2006-01-30  Andreas Seltenreich <[e-mail]>
[phone]  Andreas Seltenreich  <[e-mail]>
 
 	* nnweb.el (nnweb-type-definition, nnweb-google-parse-1)
 	(nnweb-google-create-mapping, nnweb-google-search): Adapt to
@@ -500,6 +504,98 @@
 	as a buffer-local variable.  This avoids creating truncated
 	dribble files as a result of a hang up, eg.
 
[phone] Ken Manheimer  <[e-mail]>
+
+	* pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
+	(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
+	(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
+	(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
+	argument to all these routines, so the passphrase can be managed
+	externally and passed in to the system.
+	(pgg-pgp-decrypt-region, pgg-pgp-sign-region): Use new name for
+	pgg-add-passphrase-to-cache function.
+
+	* pgg-pgp5.el (pgg-pgp5-encrypt-region, pgg-pgp5-decrypt-region)
+	(pgg-pgp5-encrypt-symmetric-region, pgg-pgp5-encrypt-symmetric)
+	(pgg-pgp5-encrypt, pgg-pgp5-decrypt-region, pgg-pgp5-decrypt)
+	(pgg-pgp5-sign-region, pgg-pgp5-sign): Add optional 'passphrase'
+	argument to all these routines, so the passphrase can be managed
+	externally and passed in to the system.
+	(pgg-pgp5-sign-region): Use new name of	pgg-add-passphrase-to-cache
+	function.
+
[phone]  Ken Manheimer  <[e-mail]>
+
+	* pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right
+	part of the decoded armor to find the key-identifier.
+	(pgg-gpg-lookup-key-owner): New function to return the
+	human-readable identifier of a key owner.
+	(pgg-gpg-lookup-id-from-key-owner): Make it easy to identify the
+	key itself.
+	(pgg-gpg-decrypt-region): Prompt with the key owner (rather than
+	the key value) if we have a key and can match it against a secret
+	key.  Also, added a note pointing out fact that the prompt only
+	indicates the first matching key.
+
+	* pgg.el (pgg-decrypt): Passing along 'passphrase' in call to
+	pgg-decrypt-region.
+	(pgg-pending-timers): A new hash for tracking the passphrase cache
+	timers, so that new ones supercede old ones.
+	(pgg-add-passphrase-to-cache): Rename from
+	`pgg-add-passphrase-cache' to reduce confusion (all callers
+	changed).  Modified to cancel old timers when new ones are added.
+	(pgg-remove-passphrase-from-cache): Rename from
+	`pgg-remove-passphrase-cache' to reduce confusion (all callers
+	changed).  Modified to cancel old timers when their keys are
+	removed from the cache.
+	(pgg-cancel-timer): In Emacs, an alias for cancel-timer; in
+	XEmacs, an indirection to delete-itimer.
+	(pgg-read-passphrase-from-cache, pgg-read-passphrase):
+	Extract pgg-read-passphrase-from-cache from pgg-read-passphrase so
+	users can only check cache without risk of prompting.  Correct bug in
+	notruncate behavior.
+	(pgg-read-passphrase-from-cache, pgg-read-passphrase)
+	(pgg-add-passphrase-cache, pgg-remove-passphrase-cache):
+	Add informative docstrings.
+	(pgg-decrypt): Convey provided passphrase in subordinate call to
+	pgg-decrypt-region.
+
[phone]  Ken Manheimer  <[e-mail]>
+
+	* pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region)
+	(pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region)
+	(pgg-decrypt, pgg-sign-region, pgg-sign): Add optional
+	'passphrase' argument, so the passphrase can be managed externally
+	and then passed in to the system.
+
+	* pgg.el (pgg-read-passphrase, pgg-add-passphrase-cache)
+	(pgg-remove-passphrase-cache): Add optional 'notruncate' argument,
+	so the passphrase cache can be used reliably with identifiers
+	besides a pgp packet's key id.
+
+	* pgg-gpg.el (pgg-pgp-encrypt-region)
+	(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
+	(pgg-pgp-encrypt, pgg-pgp-decrypt-region, pgg-pgp-decrypt)
+	(pgg-pgp-sign-region, pgg-pgp-sign): Add optional 'passphrase'
+	argument to all these routines, so the passphrase can be managed
+	externally and passed in to the system.
+
+	* pgg-gpg.el (pgg-gpg-possibly-cache-passphrase): Add optional
+	'notruncate' argument, so the passphrase cache can be used
+	reliably with identifiers besides a pgp packet's key id.
+
[phone]  Sascha Wilde  <[e-mail]>
+
+	* pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for
+	symmetric encryption.
+	(pgg-gpg-symmetric-key-p): New function to check for an symmetric
+	encrypted session key.
+	(pgg-gpg-decrypt-region): When decrypting a symmetric encrypted
+	message ask for the passphrase in a proper way.
+
+	* pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region):
+	New user commands for symmetric encryption.
+
 2005-11-30  Stefan Monnier  <[e-mail]>
 
 	* gnus-delay.el (gnus-delay-group): Don't autoload.

--- a/lisp/gnus/gnus.el	Sat Feb 11 00:04:32 2006 +0000
+++ b/lisp/gnus/gnus.el	Sat Feb 11 00:06:28 2006 +0000
@@ -4257,9 +4257,6 @@
 		       (delete-frame gnus-other-frame-object))
 		     (setq gnus-other-frame-object nil)))))))
 
-;;(setq thing ?				; this is a comment
-;;      more 'yes)
-
 ;;;###autoload
 (defun gnus (&optional arg dont-connect slave)
   "Read network news.