From 023d5e17ad569e00552c8d33f864edf47472d837 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Wed, 25 Jan 2006 06:24:38 +0000 Subject: [PATCH] Revision: emacs@sv.gnu.org/gnus--devo--0--patch-5 Merge from gnus--rel--5.10 Patches applied: * emacs--devo--0 (base, patch 1-3) - tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704 - Update from CVS * gnus--rel--5.10 (base, patch 1-7) - tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187 - Update from CVS - Merge from emacs--devo--0 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0 (patch 630-631, 646-647, 655, 657, 663, 668, 670-671, 676-678, 686, 690-691, 696, 698, 702) - Merge from gnus--rel--5.10 - Update from CVS - lisp/gnus/ChangeLog: Remove duplicate entry * miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 157-187) - Merge from emacs--cvs-trunk--0 - Update from CVS - Update from CVS: texi/message.texi: Fix default values. - Update from CVS: texi/gnus.texi (RSS): Addition. 2006-01-08 Reiner Steib * lisp/gnus-cus.el (gnus-group-parameters): Sync posting-style with custom definition of `gnus-posting-styles'. * lisp/gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bind print-circle. Suggested by Kalle Olavi Niemitalo . 2006-01-05 Reiner Steib * lisp/gnus-group.el (gnus-useful-groups): Use Gmane for ding. Use nntp for bug archive. 2006-01-08 Chong Yidong * lisp/spam.el (spam-group-ham-mark-p, spam-group-spam-mark-p) (spam-group-spam-marks): Delete functions. (spam-list-articles): Just call spam-group-ham-marks directly. (spam-group-ham-marks): Simplify. 2006-01-08 Alex Schroeder * texi/pgg.texi (Caching passphrase): Rewording. 2005-11-04 Ken Manheimer * texi/pgg.texi (User Commands): Document additional passphrase argument for pgg-encrypt-*, pgg-decrypt-*, and pgg-sign-* functions. (Backend methods): Likewise for corresponding pgg-scheme-* functions. 2005-10-29 Sascha Wilde * texi/pgg.texi (How to use): Update the example to add autoload of pgg-encrypt-symmetric-region. (User Commands): Document pgg-encrypt-symmetric-region. (Backend methods): Document pgg-scheme-encrypt-symmetric-region. --- lisp/ChangeLog | 102 +++++++++++++++++++++++++++++++++++++++++++++ lisp/gnus-agent.el | 27 +++++++----- lisp/gnus-art.el | 3 +- lisp/gnus-cache.el | 25 +++++++---- lisp/gnus-cus.el | 7 +++- lisp/gnus-delay.el | 2 +- lisp/gnus-group.el | 19 +++++---- lisp/gnus-start.el | 19 +++++---- lisp/gnus.el | 6 ++- lisp/mm-uu.el | 3 +- lisp/parse-time.el | 3 +- lisp/pgg-pgp.el | 2 +- lisp/time-date.el | 5 ++- texi/ChangeLog | 17 ++++++++ texi/pgg.texi | 49 +++++++++++++++++----- 15 files changed, 232 insertions(+), 57 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bddeb4e1e..f9e3681b6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -272,6 +272,19 @@ * gnus-art.el (gnus-article-wash-html-with-w3m): No need to narrow the buffer. +2006-01-08 Reiner Steib + + * gnus-cus.el (gnus-group-parameters): Sync posting-style with + custom definition of `gnus-posting-styles'. + + * gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bind + print-circle. Suggested by Kalle Olavi Niemitalo . + +2006-01-05 Reiner Steib + + * gnus-group.el (gnus-useful-groups): Use Gmane for ding. Use + nntp for bug archive. + 2006-01-05 Katsumi Yamaoka * nnrss.el (nnrss-request-article): Fix the way to fill text/plain @@ -321,6 +334,13 @@ * dns.el (query-dns): Make sure we check the buffer size before removing tcp headers. +2006-01-08 Chong Yidong + + * spam.el (spam-group-ham-mark-p, spam-group-spam-mark-p) + (spam-group-spam-marks): Delete functions. + (spam-list-articles): Just call spam-group-ham-marks directly. + (spam-group-ham-marks): Simplify. + 2005-12-16 Katsumi Yamaoka * gnus-art.el (gnus-article-delete-text-of-type): Enable it to @@ -414,6 +434,9 @@ * gnus-fun.el (gnus-face-from-file): Decrease quant in smaller steps when < 10. + * gnus-start.el (gnus-no-server-1): Mention + `gnus-level-default-subscribed' in doc string. + 2005-12-02 ARISAWA Akihiro (tiny change) * mm-view.el (mm-inline-text-html-render-with-w3m): Fix misplaced @@ -550,6 +573,44 @@ as a buffer-local variable. This avoids creating truncated dribble files as a result of a hang up, eg. +2006-01-03 Rodrigo Ventura (tiny change) + + * gnus-xmas.el (gnus-xmas-group-startup-message): Typo + gnus-splash-face -> gnus-splash. Fixes starting from a TTY in + XEmacs. + +2005-12-09 Reiner Steib + + * gnus-start.el (gnus-start-draft-setup): Enforce + `gnus-draft-mode' for nndraft:drafts at startup. + + * gnus.el (gnus-splash): Change custom group. + (gnus-group-get-parameter, gnus-group-parameter-value): Describe + allow-list argument. + + * gnus-agent.el (gnus-agent-article-alist-save-format): Format doc + string. + +2005-12-06 Reiner Steib + + * gnus-art.el (gnus-default-article-saver): Add user-defined + `function' to custom type. + +2005-10-30 Chong Yidong + + * imap.el (imap-open): Handle case where buffer is a buffer + object. + +2005-11-29 Reiner Steib + + * gnus-cache.el (gnus-cache-rename-group): Wrap doc strings and + long lines. + (gnus-cache-delete-group): Wrap doc strings. + + * gnus-agent.el (gnus-agent-rename-group) + (gnus-agent-delete-group): Wrap doc strings. + + 2005-11-10 Katsumi Yamaoka * messagexmas.el (message-use-toolbar): Change the valid values @@ -581,6 +642,47 @@ * gnus-sum.el (gnus-article-sort-by-date-reverse): Remove, use (not sort-by-date) instead. +2005-11-30 Stefan Monnier + + * gnus-delay.el (gnus-delay-group): Don't autoload. + It's useless and could trigger a bug in cus-dep.el causing ldefs-boot + to be re-loaded when customizing the `gnus-delay' group. + +2005-11-19 Chong Yidong + + * message.el: Revert last changes. + (message-insert-citation-line): Use newlines. + +2005-11-17 Chong Yidong + + * message.el (message-courtesy-message) + (message-mark-insert-begin, message-mark-insert-end) + (message-elide-ellipsis, message-cancel-message) + (message-add-header, message-change-subject) + (message-cross-post-followup-to-header) + (message-cross-post-insert-note, message-reduce-to-to-cc) + (message-widen-reply, message-delete-not-region) + (message-kill-to-signature, message-insert-signature) + (message-insert-importance-high, message-insert-importance-low) + (message-insert-or-toggle-importance) + (message-insert-disposition-notification-to) + (message-indent-citation, message-yank-original) + (message-cite-original-without-signature, message-cite-original) + (message-insert-citation-line, message-position-on-field) + (message-fix-before-sending, message-send-mail-partially) + (message-send-mail, message-send-mail-with-sendmail) + (message-send-mail-with-qmail, message-send-news) + (message-check-news-header-syntax, message-generate-headers) + (message-insert-courtesy-copy, message-fill-address) + (message-fill-header, message-shorten-references) + (message-setup-1, message-cancel-news) + (message-forward-make-body-plain) (message-forward-make-body-mime) + (message-forward-make-body-mml) (message-encode-message-body) + (message-forward-make-body-digest-plain) + (message-forward-make-body-digest-mime) + (message-use-alternative-email-as-from): Insert `hard-newline' + instead of ordinary newlines. + 2005-11-09 Katsumi Yamaoka * message.el (message-generate-headers): Downcase the argument diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 634b2b7a7..9e80ba8ac 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -214,11 +214,12 @@ unplugged." :type 'boolean) (defcustom gnus-agent-article-alist-save-format 1 - "Indicates whether to use compression(2), verses no - compression(1), when writing agentview files. The compressed - files do save space but load times are 6-7 times higher. A - group must be opened then closed for the agentview to be - updated using the new format." + "Indicates whether to use compression(2), versus no +compression(1), when writing agentview files. The compressed +files do save space but load times are 6-7 times higher. A group +must be opened then closed for the agentview to be updated using +the new format." + ;; Wouldn't symbols instead numbers be nicer? --rsteib :version "22.1" :group 'gnus-agent :type '(radio (const :format "Compressed" 2) @@ -883,9 +884,11 @@ be a select method." ;;;###autoload (defun gnus-agent-rename-group (old-group new-group) - "Rename fully-qualified OLD-GROUP as NEW-GROUP. Always updates the agent, even when -disabled, as the old agent files would corrupt gnus when the agent was -next enabled. Depends upon the caller to determine whether group renaming is supported." + "Rename fully-qualified OLD-GROUP as NEW-GROUP. +Always updates the agent, even when disabled, as the old agent +files would corrupt gnus when the agent was next enabled. +Depends upon the caller to determine whether group renaming is +supported." (let* ((old-command-method (gnus-find-method-for-group old-group)) (old-path (directory-file-name (let (gnus-command-method old-command-method) @@ -913,9 +916,11 @@ next enabled. Depends upon the caller to determine whether group renaming is sup ;;;###autoload (defun gnus-agent-delete-group (group) - "Delete fully-qualified GROUP. Always updates the agent, even when -disabled, as the old agent files would corrupt gnus when the agent was -next enabled. Depends upon the caller to determine whether group deletion is supported." + "Delete fully-qualified GROUP. +Always updates the agent, even when disabled, as the old agent +files would corrupt gnus when the agent was next enabled. +Depends upon the caller to determine whether group deletion is +supported." (let* ((command-method (gnus-find-method-for-group group)) (path (directory-file-name (let (gnus-command-method command-method) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index eea2ab0ce..8c725608a 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -543,7 +543,8 @@ Gnus provides the following functions: (function-item gnus-summary-save-in-file) (function-item gnus-summary-save-body-in-file) (function-item gnus-summary-save-in-vm) - (function-item gnus-summary-write-to-file))) + (function-item gnus-summary-write-to-file) + (function))) (defcustom gnus-rmail-save-name 'gnus-plain-save-name "A function generating a file name to save articles in Rmail format. diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el index 67a6100a2..35aaae8fa 100644 --- a/lisp/gnus-cache.el +++ b/lisp/gnus-cache.el @@ -733,9 +733,11 @@ If GROUP is non-nil, also cater to `gnus-cacheable-groups' and ;;;###autoload (defun gnus-cache-rename-group (old-group new-group) - "Rename OLD-GROUP as NEW-GROUP. Always updates the cache, even when -disabled, as the old cache files would corrupt gnus when the cache was -next enabled. Depends upon the caller to determine whether group renaming is supported." + "Rename OLD-GROUP as NEW-GROUP. +Always updates the cache, even when disabled, as the old cache +files would corrupt Gnus when the cache was next enabled. It +depends on the caller to determine whether group renaming is +supported." (let ((old-dir (gnus-cache-file-name old-group "")) (new-dir (gnus-cache-file-name new-group ""))) (gnus-rename-file old-dir new-dir t)) @@ -745,9 +747,12 @@ next enabled. Depends upon the caller to determine whether group renaming is sup (let ((no-save gnus-cache-active-hashtb)) (unless gnus-cache-active-hashtb (gnus-cache-read-active)) - (let* ((old-group-hash-value (gnus-gethash old-group gnus-cache-active-hashtb)) - (new-group-hash-value (gnus-gethash new-group gnus-cache-active-hashtb)) - (delta (or old-group-hash-value new-group-hash-value))) + (let* ((old-group-hash-value + (gnus-gethash old-group gnus-cache-active-hashtb)) + (new-group-hash-value + (gnus-gethash new-group gnus-cache-active-hashtb)) + (delta + (or old-group-hash-value new-group-hash-value))) (gnus-sethash new-group old-group-hash-value gnus-cache-active-hashtb) (gnus-sethash old-group nil gnus-cache-active-hashtb) @@ -757,9 +762,11 @@ next enabled. Depends upon the caller to determine whether group renaming is sup ;;;###autoload (defun gnus-cache-delete-group (group) - "Delete GROUP. Always updates the cache, even when -disabled, as the old cache files would corrupt gnus when the cache was -next enabled. Depends upon the caller to determine whether group deletion is supported." + "Delete GROUP from the cache. +Always updates the cache, even when disabled, as the old cache +files would corrupt gnus when the cache was next enabled. +Depends upon the caller to determine whether group deletion is +supported." (let ((dir (gnus-cache-file-name group ""))) (gnus-delete-directory dir)) diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el index a2db8c7a8..8aac9d151 100644 --- a/lisp/gnus-cus.el +++ b/lisp/gnus-cus.el @@ -1,7 +1,7 @@ ;;; gnus-cus.el --- customization commands for Gnus ;; Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Abrahamsen ;; Keywords: news @@ -235,8 +235,11 @@ See `gnus-emphasis-alist'.") (const signature-file) (const organization) (const address) + (const x-face-file) (const name) - (const body)) + (const body) + (symbol) + (string :tag "Header")) (string :format "%v")))) "post style. See `gnus-posting-styles'.")) diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el index 33ad3071e..db7c2dcc7 100644 --- a/lisp/gnus-delay.el +++ b/lisp/gnus-delay.el @@ -195,5 +195,5 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil." ;; coding: iso-8859-1 ;; End: -;;; arch-tag: fb2ad634-a897-4142-a503-f5991ec2349d +;; arch-tag: fb2ad634-a897-4142-a503-f5991ec2349d ;;; gnus-delay.el ends here diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 36094fcdf..3e9b4edd0 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1,7 +1,7 @@ ;;; gnus-group.el --- group mode commands for Gnus ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -288,14 +288,15 @@ variable." :type 'hook) (defcustom gnus-useful-groups - '(("(ding) mailing list mirrored at sunsite.auc.dk" - "emacs.ding" - (nntp "sunsite.auc.dk" - (nntp-address "sunsite.auc.dk"))) - ("gnus-bug archive" - "gnus-bug" - (nndir "/ftp@ftp.ifi.uio.no:/pub/emacs/gnus/gnus-bug/")) - ("Gnus help group" + '(("(ding) mailing list mirrored at gmane.org" + "gmane.emacs.gnus.general" + (nntp "Gmane" + (nntp-address "news.gmane.org"))) + ("Gnus bug archive" + "gnus.gnus-bug" + (nntp "news.gnus.org" + (nntp-address "news.gnus.org"))) + ("Local Gnus help group" "gnus-help" (nndoc "gnus-help" (nndoc-article-type mbox) diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index c51d15441..fce8cc0d4 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -1,7 +1,7 @@ ;;; gnus-start.el --- startup functions for Gnus ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -722,11 +722,12 @@ the first newsgroup." (defun gnus-no-server-1 (&optional arg slave) "Read network news. -If ARG is a positive number, Gnus will use that as the -startup level. If ARG is nil, Gnus will be started at level 2. -If ARG is non-nil and not a positive number, Gnus will -prompt the user for the name of an NNTP server to use. -As opposed to `gnus', this command will not connect to the local server." +If ARG is a positive number, Gnus will use that as the startup +level. If ARG is nil, Gnus will be started at level 2 +\(`gnus-level-default-subscribed' minus one). If ARG is non-nil +and not a positive number, Gnus will prompt the user for the name +of an NNTP server to use. As opposed to \\[gnus], this command +will not connect to the local server." (interactive "P") (let ((val (or arg (1- gnus-level-default-subscribed)))) (gnus val t slave) @@ -813,7 +814,10 @@ prompt the user for the name of an NNTP server to use." (gnus-request-create-group "drafts" '(nndraft "")) (unless (gnus-group-entry "nndraft:drafts") (let ((gnus-level-default-subscribed 1)) - (gnus-subscribe-group "nndraft:drafts" nil '(nndraft ""))) + (gnus-subscribe-group "nndraft:drafts" nil '(nndraft "")))) + (unless (equal (gnus-group-get-parameter "nndraft:drafts" 'gnus-dummy t) + '((gnus-draft-mode))) + (gnus-message 3 "Setting up drafts group") (gnus-group-set-parameter "nndraft:drafts" 'gnus-dummy '((gnus-draft-mode))))) @@ -2836,6 +2840,7 @@ If FORCE is non-nil, the .newsrc file is read." (print-escape-nonascii t) (print-length nil) (print-level nil) + (print-circle nil) (print-escape-newlines t) (gnus-killed-list (if (and gnus-save-killed-list diff --git a/lisp/gnus.el b/lisp/gnus.el index 0c0771860..3d169f8a3 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -930,7 +930,7 @@ be set in `.emacs' instead." (t ())) "Face for the splash screen." - :group 'gnus) + :group 'gnus-start) ;; backward-compatibility alias (put 'gnus-splash-face 'face-alias 'gnus-splash) @@ -3864,6 +3864,7 @@ If you call this function inside a loop, consider using the faster (defun gnus-group-get-parameter (group &optional symbol allow-list) "Return the group parameters for GROUP. If SYMBOL, return the value of that symbol in the group parameters. +If ALLOW-LIST, also allow list as a result. Most functions should use `gnus-group-find-parameter', which also examines the topic parameters." (let ((params (gnus-info-params (gnus-get-info group)))) @@ -3873,7 +3874,8 @@ also examines the topic parameters." (defun gnus-group-parameter-value (params symbol &optional allow-list present-p) - "Return the value of SYMBOL in group PARAMS." + "Return the value of SYMBOL in group PARAMS. +If ALLOW-LIST, also allow list as a result." ;; We only wish to return group parameters (dotted lists) and ;; not local variables, which may have the same names. ;; But first we handle single elements... diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el index c959d6400..d855b515c 100644 --- a/lisp/mm-uu.el +++ b/lisp/mm-uu.el @@ -651,7 +651,8 @@ value of `mm-uu-text-plain-type'." (kill-buffer buffer) (setcdr handle (cdr children)) (setcar handle (car children)) ;; "multipart/mixed" - (mapc 'mm-uu-dissect-text-parts (cdr children)))))) + (dolist (elem (cdr children)) + (mm-uu-dissect-text-parts elem)))))) (t (mapc 'mm-uu-dissect-text-parts handle))))) diff --git a/lisp/parse-time.el b/lisp/parse-time.el index cde38670d..e145d27f6 100644 --- a/lisp/parse-time.el +++ b/lisp/parse-time.el @@ -1,6 +1,7 @@ ;;; parse-time.el --- Parsing time strings -;; Copyright (C) 1996, 2000, 2002 by Free Software Foundation, Inc. +;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Erik Naggum ;; Keywords: util diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el index d786df6fd..2edba63d7 100644 --- a/lisp/pgg-pgp.el +++ b/lisp/pgg-pgp.el @@ -166,7 +166,7 @@ passphrase cache or user." (pgg-read-passphrase (format "PGP passphrase for %s: " pgg-pgp-user-id) key))) (args - '("+verbose=1" "+batchmode" "+language=us" "-f"))) + '("+verbose=1" "+batchmode" "+language=us" "-f"))) (pgg-pgp-process-region start end passphrase pgg-pgp-program args) (pgg-process-when-success (if pgg-cache-passphrase diff --git a/lisp/time-date.el b/lisp/time-date.el index cfed10aa3..0cb53a27b 100644 --- a/lisp/time-date.el +++ b/lisp/time-date.el @@ -1,6 +1,7 @@ ;;; time-date.el --- Date and time handling functions -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Masanobu Umeda diff --git a/texi/ChangeLog b/texi/ChangeLog index 41ebccf64..e3896f095 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -6,6 +6,10 @@ * gnus.texi (Article Washing): Additions. +2006-01-08 Alex Schroeder + + * pgg.texi (Caching passphrase): Rewording. + 2006-01-10 Katsumi Yamaoka * gnus.texi (RSS): Document nnrss-wash-html-in-text-plain-parts. @@ -152,6 +156,12 @@ (XVarious): Remove gnus-xmas-logo-color-alist and gnus-xmas-logo-color-style; fix description of gnus-use-toolbar. +2005-11-04 Ken Manheimer + + * pgg.texi (User Commands): Document additional passphrase + argument for pgg-encrypt-*, pgg-decrypt-*, and pgg-sign-* functions. + (Backend methods): Likewise for corresponding pgg-scheme-* functions. + 2005-11-02 Reiner Steib * gnus.texi (Conformity): Fix typo. @@ -163,6 +173,13 @@ gnus-parameters-case-fold-search. (Home Score File): Addition. +2005-10-29 Sascha Wilde + + * pgg.texi (How to use): Update the example to add autoload of + pgg-encrypt-symmetric-region. + (User Commands): Document pgg-encrypt-symmetric-region. + (Backend methods): Document pgg-scheme-encrypt-symmetric-region. + 2005-10-29 Jari Aalto * gnus.texi (Sorting the Summary Buffer): diff --git a/texi/pgg.texi b/texi/pgg.texi index f06502961..5d271dff5 100644 --- a/texi/pgg.texi +++ b/texi/pgg.texi @@ -98,6 +98,8 @@ list autoload setting for desired functions as follows. @lisp (autoload 'pgg-encrypt-region "pgg" "Encrypt the current region." t) +(autoload 'pgg-encrypt-symmetric-region "pgg" + "Encrypt the current region with symmetric algorithm." t) (autoload 'pgg-decrypt-region "pgg" "Decrypt the current region." t) (autoload 'pgg-sign-region "pgg" @@ -127,7 +129,7 @@ signer's public key, for example, the function @code{pgg-verify-region} fails immediately, but if the function had been called interactively, it would ask you to retrieve the signer's public key from the server. -@deffn Command pgg-encrypt-region start end recipients &optional sign +@deffn Command pgg-encrypt-region start end recipients &optional sign passphrase Encrypt the current region between @var{start} and @var{end} for @var{recipients}. When the function were called interactively, you would be asked about the recipients. @@ -136,22 +138,41 @@ If encryption is successful, it replaces the current region contents (in the accessible portion) with the resulting data. If optional argument @var{sign} is non-@code{nil}, the function is -request to do a combined sign and encrypt. This currently only work -with GnuPG. +request to do a combined sign and encrypt. This currently is +confirmed to work with GnuPG, but might not work with PGP or PGP5. + +If optional @var{passphrase} is @code{nil}, the passphrase will be +obtained from the passphrase cache or user. +@end deffn + +@deffn Command pgg-encrypt-symmetric-region &optional start end passphrase +Encrypt the current region between @var{start} and @var{end} using a +symmetric cipher. After invocation you are asked for a passphrase. + +If optional @var{passphrase} is @code{nil}, the passphrase will be +obtained from the passphrase cache or user. + +symmetric-cipher encryption is currently only implemented for GnuPG. @end deffn -@deffn Command pgg-decrypt-region start end +@deffn Command pgg-decrypt-region start end &optional passphrase Decrypt the current region between @var{start} and @var{end}. If decryption is successful, it replaces the current region contents (in the accessible portion) with the resulting data. + +If optional @var{passphrase} is @code{nil}, the passphrase will be +obtained from the passphrase cache or user. @end deffn -@deffn Command pgg-sign-region start end &optional cleartext +@deffn Command pgg-sign-region start end &optional cleartext passphrase Make the signature from text between @var{start} and @var{end}. If the optional third argument @var{cleartext} is non-@code{nil}, or the function is called interactively, it does not create a detached signature. In such a case, it replaces the current region contents (in the accessible portion) with the resulting data. + +If optional @var{passphrase} is @code{nil}, the passphrase will be +obtained from the passphrase cache or user. @end deffn @deffn Command pgg-verify-region start end &optional signature fetch @@ -204,8 +225,9 @@ default. @defvar pgg-cache-passphrase If non-@code{nil}, store passphrases. The default value of this -variable is @code{t}. If you were worry about security issue, however, -you could stop caching with setting it @code{nil}. +variable is @code{t}. If you are worried about security issues, +however, you could stop the caching of passphrases by setting this +variable to @code{nil}. @end defvar @defvar pgg-passphrase-cache-expiry @@ -295,19 +317,26 @@ argument @var{type} is non-@code{nil}, it searches from the secret keyrings. @end deffn -@deffn Method pgg-scheme-encrypt-region scheme start end recipients &optional sign +@deffn Method pgg-scheme-encrypt-region scheme start end recipients &optional sign passphrase Encrypt the current region between @var{start} and @var{end} for @var{recipients}. If @var{sign} is non-@code{nil}, do a combined sign and encrypt. If encryption is successful, it returns @code{t}, otherwise @code{nil}. @end deffn -@deffn Method pgg-scheme-decrypt-region scheme start end +@deffn Method pgg-scheme-encrypt-symmetric-region scheme start end &optional passphrase +Encrypt the current region between @var{start} and @var{end} using a +symmetric cipher and a passphrases. If encryption is successful, it +returns @code{t}, otherwise @code{nil}. This function is currently only +implemented for GnuPG. +@end deffn + +@deffn Method pgg-scheme-decrypt-region scheme start end &optional passphrase Decrypt the current region between @var{start} and @var{end}. If decryption is successful, it returns @code{t}, otherwise @code{nil}. @end deffn -@deffn Method pgg-scheme-sign-region scheme start end &optional cleartext +@deffn Method pgg-scheme-sign-region scheme start end &optional cleartext passphrase Make the signature from text between @var{start} and @var{end}. If the optional third argument @var{cleartext} is non-@code{nil}, it does not create a detached signature. If signing is successful, it returns -- 2.25.1