Mercurial > emacs
annotate lisp/pgg.el @ 107390:bb307bf2e752
Fix keywords.
* finder.el (finder-compile-keywords): Replace `princ' with
`prin1' on a list of symbols interned from keyword strings.
* emacs-lisp/lisp-mnt.el (lm-keywords-list): If `keywords' contains
a comma, then split keywords using a comma and optional whitespace.
Otherwise, split by whitespace.
* complete.el:
* face-remap.el:
* log-view.el:
* net/hmac-def.el:
* net/hmac-md5.el:
* net/netrc.el:
* progmodes/mixal-mode.el: Fix keywords.
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Sun, 14 Mar 2010 23:15:02 +0200 |
parents | 1d1d5d9bd884 |
children | c0d13767677a 376148b31b5e |
rev | line source |
---|---|
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
1 ;;; pgg.el --- glue for the various PGP implementations. |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
2 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
3 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004, |
106815 | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
5 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
6 ;; Author: Daiki Ueno <ueno@unixuser.org> |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
7 ;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de> |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
8 ;; Created: 1999/10/28 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
9 ;; Keywords: PGP |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
10 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
11 ;; This file is part of GNU Emacs. |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
12 |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; GNU Emacs is free software: you can redistribute it and/or modify |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
14 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
15 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
16 ;; (at your option) any later version. |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
17 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
18 ;; GNU Emacs is distributed in the hope that it will be useful, |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
21 ;; GNU General Public License for more details. |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
22 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
23 ;; You should have received a copy of the GNU General Public License |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
25 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
26 ;;; Commentary: |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
27 |
100652 | 28 ;; This file is on its way to obsolescence, waiting for allout.el to |
29 ;; switch to EPG. | |
30 | |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
31 ;;; Code: |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
32 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
33 (require 'pgg-def) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
34 (require 'pgg-parse) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
35 (autoload 'run-at-time "timer") |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
36 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
37 ;; Don't merge these two `eval-when-compile's. |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
38 (eval-when-compile |
87209 | 39 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
40 (require 'cl)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
41 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
42 ;;; @ utility functions |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
43 ;;; |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
44 |
86496
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
45 (eval-when-compile |
87300 | 46 ;; Define it as a null macro for Emacs in order to suppress a byte |
47 ;; compile warning that Emacs 21 issues. | |
48 (defmacro pgg-run-at-time-1 (time repeat function args) | |
49 (when (featurep 'xemacs) | |
86496
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
50 (if (condition-case nil |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
51 (let ((delete-itimer 'delete-itimer) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
52 (itimer-driver-start 'itimer-driver-start) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
53 (itimer-value 'itimer-value) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
54 (start-itimer 'start-itimer)) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
55 (unless (or (symbol-value 'itimer-process) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
56 (symbol-value 'itimer-timer)) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
57 (funcall itimer-driver-start)) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
58 ;; Check whether there is a bug to which the difference of |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
59 ;; the present time and the time when the itimer driver was |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
60 ;; woken up is subtracted from the initial itimer value. |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
61 (let* ((inhibit-quit t) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
62 (ctime (current-time)) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
63 (itimer-timer-last-wakeup |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
64 (prog1 |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
65 ctime |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
66 (setcar ctime (1- (car ctime))))) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
67 (itimer-list nil) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
68 (itimer (funcall start-itimer "pgg-run-at-time" |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
69 'ignore 5))) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
70 (sleep-for 0.1) ;; Accept the timeout interrupt. |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
71 (prog1 |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
72 (> (funcall itimer-value itimer) 0) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
73 (funcall delete-itimer itimer)))) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
74 (error nil)) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
75 `(let ((time ,time)) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
76 (apply #'start-itimer "pgg-run-at-time" |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
77 ,function (if time (max time 1e-9) 1e-9) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
78 ,repeat nil t ,args))) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
79 `(let ((time ,time) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
80 (itimers (list nil))) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
81 (setcar |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
82 itimers |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
83 (apply #'start-itimer "pgg-run-at-time" |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
84 (lambda (itimers repeat function &rest args) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
85 (let ((itimer (car itimers))) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
86 (if repeat |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
87 (progn |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
88 (set-itimer-function |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
89 itimer |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
90 (lambda (itimer repeat function &rest args) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
91 (set-itimer-restart itimer repeat) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
92 (set-itimer-function itimer function) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
93 (set-itimer-function-arguments itimer args) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
94 (apply function args))) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
95 (set-itimer-function-arguments |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
96 itimer |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
97 (append (list itimer repeat function) args))) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
98 (set-itimer-function |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
99 itimer |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
100 (lambda (itimer function &rest args) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
101 (delete-itimer itimer) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
102 (apply function args))) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
103 (set-itimer-function-arguments |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
104 itimer |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
105 (append (list itimer function) args))))) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
106 1e-9 (if time (max time 1e-9) 1e-9) |
87300 | 107 nil t itimers ,repeat ,function ,args)))))) |
86496
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
108 |
87300 | 109 (eval-and-compile |
110 (if (featurep 'xemacs) | |
111 (progn | |
112 (defun pgg-run-at-time (time repeat function &rest args) | |
113 "Emulating function run as `run-at-time'. | |
86496
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
114 TIME should be nil meaning now, or a number of seconds from now. |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
115 Return an itimer object which can be used in either `delete-itimer' |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
116 or `cancel-timer'." |
87300 | 117 (pgg-run-at-time-1 time repeat function args)) |
118 (defun pgg-cancel-timer (timer) | |
119 "Emulate cancel-timer for xemacs." | |
120 (let ((delete-itimer 'delete-itimer)) | |
121 (funcall delete-itimer timer)))) | |
122 (defalias 'pgg-run-at-time 'run-at-time) | |
123 (defalias 'pgg-cancel-timer 'cancel-timer))) | |
86496
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
124 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
125 (defun pgg-invoke (func scheme &rest args) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
126 (progn |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
127 (require (intern (format "pgg-%s" scheme))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
128 (apply 'funcall (intern (format "pgg-%s-%s" scheme func)) args))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
129 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
130 (put 'pgg-save-coding-system 'lisp-indent-function 2) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
131 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
132 (defmacro pgg-save-coding-system (start end &rest body) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
133 `(if (called-interactively-p 'interactive) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
134 (let ((buffer (current-buffer))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
135 (with-temp-buffer |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
136 (let (buffer-undo-list) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
137 (insert-buffer-substring buffer ,start ,end) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
138 (encode-coding-region (point-min)(point-max) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
139 buffer-file-coding-system) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
140 (prog1 (save-excursion ,@body) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
141 (push nil buffer-undo-list) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
142 (ignore-errors (undo)))))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
143 (save-restriction |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
144 (narrow-to-region ,start ,end) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
145 ,@body))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
146 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
147 (defun pgg-temp-buffer-show-function (buffer) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
148 (let ((window (or (get-buffer-window buffer 'visible) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
149 (split-window-vertically)))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
150 (set-window-buffer window buffer) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
151 (shrink-window-if-larger-than-buffer window))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
152 |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
153 ;; XXX `pgg-display-output-buffer' is a horrible name for this function. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
154 ;; It should be something like `pgg-situate-output-or-display-error'. |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
155 (defun pgg-display-output-buffer (start end status) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
156 "Situate en/decryption results or pop up an error buffer. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
157 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
158 Text from START to END is replaced by contents of output buffer if STATUS |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
159 is true, or else the output buffer is displayed." |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
160 (if status |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
161 (pgg-situate-output start end) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
162 (pgg-display-error-buffer))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
163 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
164 (defun pgg-situate-output (start end) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
165 "Place en/decryption result in place of current text from START to END." |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
166 (delete-region start end) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
167 (insert-buffer-substring pgg-output-buffer) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
168 (decode-coding-region start (point) buffer-file-coding-system)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
169 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
170 (defun pgg-display-error-buffer () |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
171 "Pop up an error buffer indicating the reason for an en/decryption failure." |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
172 (let ((temp-buffer-show-function |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
173 (function pgg-temp-buffer-show-function))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
174 (with-output-to-temp-buffer pgg-echo-buffer |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
175 (set-buffer standard-output) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
176 (insert-buffer-substring pgg-errors-buffer)))) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
177 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
178 (defvar pgg-passphrase-cache (make-vector 7 0)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
179 |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
180 (defvar pgg-pending-timers (make-vector 7 0) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
181 "Hash table for managing scheduled pgg cache management timers. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
182 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
183 We associate key and timer, so the timer can be cancelled if a new |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
184 timeout for the key is set while an old one is still pending.") |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
185 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
186 (defun pgg-read-passphrase (prompt &optional key notruncate) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
187 "Using PROMPT, obtain passphrase for KEY from cache or user. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
188 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
189 Truncate the key to 8 trailing characters unless NOTRUNCATE is true |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
190 \(default false). |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
191 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
192 Custom variables `pgg-cache-passphrase' and `pgg-passphrase-cache-expiry' |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
193 regulate cache behavior." |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
194 (or (pgg-read-passphrase-from-cache key notruncate) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
195 (read-passwd prompt))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
196 |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
197 (defun pgg-read-passphrase-from-cache (key &optional notruncate) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
198 "Obtain passphrase for KEY from time-limited passphrase cache. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
199 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
200 Truncate the key to 8 trailing characters unless NOTRUNCATE is true |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
201 \(default false). |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
202 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
203 Custom variables `pgg-cache-passphrase' and `pgg-passphrase-cache-expiry' |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
204 regulate cache behavior." |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
205 (and pgg-cache-passphrase |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
206 key (or notruncate |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
207 (setq key (pgg-truncate-key-identifier key))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
208 (symbol-value (intern-soft key pgg-passphrase-cache)))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
209 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
210 (defun pgg-add-passphrase-to-cache (key passphrase &optional notruncate) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
211 "Associate KEY with PASSPHRASE in time-limited passphrase cache. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
212 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
213 Truncate the key to 8 trailing characters unless NOTRUNCATE is true |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
214 \(default false). |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
215 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
216 Custom variables `pgg-cache-passphrase' and `pgg-passphrase-cache-expiry' |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
217 regulate cache behavior." |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
218 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
219 (let* ((key (if notruncate key (pgg-truncate-key-identifier key))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
220 (interned-timer-key (intern-soft key pgg-pending-timers)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
221 (old-timer (symbol-value interned-timer-key)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
222 new-timer) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
223 (when old-timer |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
224 (cancel-timer old-timer) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
225 (unintern interned-timer-key pgg-pending-timers)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
226 (set (intern key pgg-passphrase-cache) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
227 passphrase) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
228 (set (intern key pgg-pending-timers) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
229 (pgg-run-at-time pgg-passphrase-cache-expiry nil |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
230 #'pgg-remove-passphrase-from-cache |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
231 key notruncate)))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
232 |
72653 | 233 (if (fboundp 'clear-string) |
234 (defalias 'pgg-clear-string 'clear-string) | |
235 (defun pgg-clear-string (string) | |
236 (fillarray string ?_))) | |
237 | |
86496
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
238 (declare-function pgg-clear-string "pgg" (string)) |
e793ef63bdb9
(pgg-clear-string): Declare as a function.
Glenn Morris <rgm@gnu.org>
parents:
82140
diff
changeset
|
239 |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
240 (defun pgg-remove-passphrase-from-cache (key &optional notruncate) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
241 "Omit passphrase associated with KEY in time-limited passphrase cache. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
242 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
243 Truncate the key to 8 trailing characters unless NOTRUNCATE is true |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
244 \(default false). |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
245 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
246 This is a no-op if there is not entry for KEY (eg, it's already expired. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
247 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
248 The memory for the passphrase is filled with underscores to clear any |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
249 references to it. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
250 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
251 Custom variables `pgg-cache-passphrase' and `pgg-passphrase-cache-expiry' |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
252 regulate cache behavior." |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
253 (let* ((passphrase (pgg-read-passphrase-from-cache key notruncate)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
254 (key (if notruncate key (pgg-truncate-key-identifier key))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
255 (interned-timer-key (intern-soft key pgg-pending-timers)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
256 (old-timer (symbol-value interned-timer-key))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
257 (when passphrase |
72653 | 258 (pgg-clear-string passphrase) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
259 (unintern key pgg-passphrase-cache)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
260 (when old-timer |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
261 (pgg-cancel-timer old-timer) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
262 (unintern interned-timer-key pgg-pending-timers)))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
263 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
264 (defmacro pgg-convert-lbt-region (start end lbt) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
265 `(let ((pgg-conversion-end (set-marker (make-marker) ,end))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
266 (goto-char ,start) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
267 (case ,lbt |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
268 (CRLF |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
269 (while (progn |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
270 (end-of-line) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
271 (> (marker-position pgg-conversion-end) (point))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
272 (insert "\r") |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
273 (forward-line 1))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
274 (LF |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
275 (while (re-search-forward "\r$" pgg-conversion-end t) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
276 (replace-match "")))))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
277 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
278 (put 'pgg-as-lbt 'lisp-indent-function 3) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
279 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
280 (defmacro pgg-as-lbt (start end lbt &rest body) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
281 `(let ((inhibit-read-only t) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
282 buffer-read-only |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
283 buffer-undo-list) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
284 (pgg-convert-lbt-region ,start ,end ,lbt) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
285 (let ((,end (point))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
286 ,@body) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
287 (push nil buffer-undo-list) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
288 (ignore-errors (undo)))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
289 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
290 (put 'pgg-process-when-success 'lisp-indent-function 0) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
291 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
292 (defmacro pgg-process-when-success (&rest body) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
293 `(with-current-buffer pgg-output-buffer |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
294 (if (zerop (buffer-size)) nil ,@body t))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
295 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
296 (defalias 'pgg-make-temp-file |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
297 (if (fboundp 'make-temp-file) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
298 'make-temp-file |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
299 (lambda (prefix &optional dir-flag) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
300 (let ((file (expand-file-name |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
301 (make-temp-name prefix) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
302 (if (fboundp 'temp-directory) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
303 (temp-directory) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
304 temporary-file-directory)))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
305 (if dir-flag |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
306 (make-directory file)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
307 file)))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
308 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
309 ;;; @ interface functions |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
310 ;;; |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
311 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
312 ;;;###autoload |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
313 (defun pgg-encrypt-region (start end rcpts &optional sign passphrase) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
314 "Encrypt the current region between START and END for RCPTS. |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
315 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
316 If optional argument SIGN is non-nil, do a combined sign and encrypt. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
317 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
318 If optional PASSPHRASE is not specified, it will be obtained from the |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
319 passphrase cache or user." |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
320 (interactive |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
321 (list (region-beginning)(region-end) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
322 (split-string (read-string "Recipients: ") "[ \t,]+"))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
323 (let ((status |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
324 (pgg-save-coding-system start end |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
325 (pgg-invoke "encrypt-region" (or pgg-scheme pgg-default-scheme) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
326 (point-min) (point-max) rcpts sign passphrase)))) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
327 (when (called-interactively-p 'interactive) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
328 (pgg-display-output-buffer start end status)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
329 status)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
330 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
331 ;;;###autoload |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
332 (defun pgg-encrypt-symmetric-region (start end &optional passphrase) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
333 "Encrypt the current region between START and END symmetric with passphrase. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
334 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
335 If optional PASSPHRASE is not specified, it will be obtained from the |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
336 cache or user." |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
337 (interactive "r") |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
338 (let ((status |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
339 (pgg-save-coding-system start end |
77932
491c39d86dc0
(pgg-sign-region, pgg-sign): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
75347
diff
changeset
|
340 (pgg-invoke "encrypt-symmetric-region" |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
341 (or pgg-scheme pgg-default-scheme) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
342 (point-min) (point-max) passphrase)))) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
343 (when (called-interactively-p 'interactive) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
344 (pgg-display-output-buffer start end status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
345 status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
346 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
347 ;;;###autoload |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
348 (defun pgg-encrypt-symmetric (&optional start end passphrase) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
349 "Encrypt the current buffer using a symmetric, rather than key-pair, cipher. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
350 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
351 If optional arguments START and END are specified, only encrypt within |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
352 the region. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
353 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
354 If optional PASSPHRASE is not specified, it will be obtained from the |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
355 passphrase cache or user." |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
356 (interactive) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
357 (let* ((start (or start (point-min))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
358 (end (or end (point-max))) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
359 (status (pgg-encrypt-symmetric-region start end passphrase))) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
360 (when (called-interactively-p 'interactive) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
361 (pgg-display-output-buffer start end status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
362 status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
363 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
364 ;;;###autoload |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
365 (defun pgg-encrypt (rcpts &optional sign start end passphrase) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
366 "Encrypt the current buffer for RCPTS. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
367 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
368 If optional argument SIGN is non-nil, do a combined sign and encrypt. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
369 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
370 If optional arguments START and END are specified, only encrypt within |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
371 the region. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
372 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
373 If optional PASSPHRASE is not specified, it will be obtained from the |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
374 passphrase cache or user." |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
375 (interactive (list (split-string (read-string "Recipients: ") "[ \t,]+"))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
376 (let* ((start (or start (point-min))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
377 (end (or end (point-max))) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
378 (status (pgg-encrypt-region start end rcpts sign passphrase))) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
379 (when (called-interactively-p 'interactive) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
380 (pgg-display-output-buffer start end status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
381 status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
382 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
383 ;;;###autoload |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
384 (defun pgg-decrypt-region (start end &optional passphrase) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
385 "Decrypt the current region between START and END. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
386 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
387 If optional PASSPHRASE is not specified, it will be obtained from the |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
388 passphrase cache or user." |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
389 (interactive "r") |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
390 (let* ((buf (current-buffer)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
391 (status |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
392 (pgg-save-coding-system start end |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
393 (pgg-invoke "decrypt-region" (or pgg-scheme pgg-default-scheme) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
394 (point-min) (point-max) passphrase)))) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
395 (when (called-interactively-p 'interactive) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
396 (pgg-display-output-buffer start end status)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
397 status)) |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
398 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
399 ;;;###autoload |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
400 (defun pgg-decrypt (&optional start end passphrase) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
401 "Decrypt the current buffer. |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
402 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
403 If optional arguments START and END are specified, only decrypt within |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
404 the region. |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
405 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
406 If optional PASSPHRASE is not specified, it will be obtained from the |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
407 passphrase cache or user." |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
408 (interactive "") |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
409 (let* ((start (or start (point-min))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
410 (end (or end (point-max))) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
411 (status (pgg-decrypt-region start end passphrase))) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
412 (when (called-interactively-p 'interactive) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
413 (pgg-display-output-buffer start end status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
414 status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
415 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
416 ;;;###autoload |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
417 (defun pgg-sign-region (start end &optional cleartext passphrase) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
418 "Make the signature from text between START and END. |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
419 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
420 If the optional 3rd argument CLEARTEXT is non-nil, it does not create |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
421 a detached signature. |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
422 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
423 If this function is called interactively, CLEARTEXT is enabled |
77932
491c39d86dc0
(pgg-sign-region, pgg-sign): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
75347
diff
changeset
|
424 and the output is displayed. |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
425 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
426 If optional PASSPHRASE is not specified, it will be obtained from the |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
427 passphrase cache or user." |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
428 (interactive "r") |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
429 (let ((status (pgg-save-coding-system start end |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
430 (pgg-invoke "sign-region" (or pgg-scheme pgg-default-scheme) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
431 (point-min) (point-max) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
432 (or (called-interactively-p 'interactive) |
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
433 cleartext) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
434 passphrase)))) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
435 (when (called-interactively-p 'interactive) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
436 (pgg-display-output-buffer start end status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
437 status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
438 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
439 ;;;###autoload |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
440 (defun pgg-sign (&optional cleartext start end passphrase) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
441 "Sign the current buffer. |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
442 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
443 If the optional argument CLEARTEXT is non-nil, it does not create a |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
444 detached signature. |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
445 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
446 If optional arguments START and END are specified, only sign data |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
447 within the region. |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
448 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
449 If this function is called interactively, CLEARTEXT is enabled |
77932
491c39d86dc0
(pgg-sign-region, pgg-sign): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
75347
diff
changeset
|
450 and the output is displayed. |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
451 |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
452 If optional PASSPHRASE is not specified, it will be obtained from the |
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
453 passphrase cache or user." |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
454 (interactive "") |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
455 (let* ((start (or start (point-min))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
456 (end (or end (point-max))) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
457 (status (pgg-sign-region start end |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
458 (or (called-interactively-p 'interactive) |
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
459 cleartext) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
460 passphrase))) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
461 (when (called-interactively-p 'interactive) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
462 (pgg-display-output-buffer start end status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
463 status)) |
66519
20539524a670
(pgg-decrypt): Passing along 'passphrase' in call to pgg-decrypt-region.
Eli Zaretskii <eliz@gnu.org>
parents:
66383
diff
changeset
|
464 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
465 ;;;###autoload |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
466 (defun pgg-verify-region (start end &optional signature fetch) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
467 "Verify the current region between START and END. |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
468 If the optional 3rd argument SIGNATURE is non-nil, it is treated as |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
469 the detached signature of the current region. |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
470 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
471 If the optional 4th argument FETCH is non-nil, we attempt to fetch the |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
472 signer's public key from `pgg-default-keyserver-address'." |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
473 (interactive "r") |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
474 (let* ((packet |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
475 (if (null signature) nil |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
476 (with-temp-buffer |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
477 (buffer-disable-undo) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
478 (if (fboundp 'set-buffer-multibyte) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
479 (set-buffer-multibyte nil)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
480 (insert-file-contents signature) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
481 (cdr (assq 2 (pgg-decode-armor-region |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
482 (point-min)(point-max))))))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
483 (key (cdr (assq 'key-identifier packet))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
484 status keyserver) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
485 (and (stringp key) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
486 pgg-query-keyserver |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
487 (setq key (concat "0x" (pgg-truncate-key-identifier key))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
488 (null (pgg-lookup-key key)) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
489 (or fetch (called-interactively-p 'interactive)) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
490 (y-or-n-p (format "Key %s not found; attempt to fetch? " key)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
491 (setq keyserver |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
492 (or (cdr (assq 'preferred-key-server packet)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
493 pgg-default-keyserver-address)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
494 (pgg-fetch-key keyserver key)) |
77932
491c39d86dc0
(pgg-sign-region, pgg-sign): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
75347
diff
changeset
|
495 (setq status |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
496 (pgg-save-coding-system start end |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
497 (pgg-invoke "verify-region" (or pgg-scheme pgg-default-scheme) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
498 (point-min) (point-max) signature))) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
499 (when (called-interactively-p 'interactive) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
500 (let ((temp-buffer-show-function |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
501 (function pgg-temp-buffer-show-function))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
502 (with-output-to-temp-buffer pgg-echo-buffer |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
503 (set-buffer standard-output) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
504 (insert-buffer-substring (if status pgg-output-buffer |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
505 pgg-errors-buffer))))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
506 status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
507 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
508 ;;;###autoload |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
509 (defun pgg-verify (&optional signature fetch start end) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
510 "Verify the current buffer. |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
511 If the optional argument SIGNATURE is non-nil, it is treated as |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
512 the detached signature of the current region. |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
513 If the optional argument FETCH is non-nil, we attempt to fetch the |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
514 signer's public key from `pgg-default-keyserver-address'. |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
515 If optional arguments START and END are specified, only verify data |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
516 within the region." |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
517 (interactive "") |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
518 (let* ((start (or start (point-min))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
519 (end (or end (point-max))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
520 (status (pgg-verify-region start end signature fetch))) |
105372
bd2966850aac
Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
521 (when (called-interactively-p 'interactive) |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
522 (let ((temp-buffer-show-function |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
523 (function pgg-temp-buffer-show-function))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
524 (with-output-to-temp-buffer pgg-echo-buffer |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
525 (set-buffer standard-output) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
526 (insert-buffer-substring (if status pgg-output-buffer |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
527 pgg-errors-buffer))))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
528 status)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
529 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
530 ;;;###autoload |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
531 (defun pgg-insert-key () |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
532 "Insert the ASCII armored public key." |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
533 (interactive) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
534 (pgg-invoke "insert-key" (or pgg-scheme pgg-default-scheme))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
535 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
536 ;;;###autoload |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
537 (defun pgg-snarf-keys-region (start end) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
538 "Import public keys in the current region between START and END." |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
539 (interactive "r") |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
540 (pgg-save-coding-system start end |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
541 (pgg-invoke "snarf-keys-region" (or pgg-scheme pgg-default-scheme) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
542 start end))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
543 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
544 ;;;###autoload |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
545 (defun pgg-snarf-keys () |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
546 "Import public keys in the current buffer." |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
547 (interactive "") |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
548 (pgg-snarf-keys-region (point-min) (point-max))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
549 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
550 (defun pgg-lookup-key (string &optional type) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
551 (pgg-invoke "lookup-key" (or pgg-scheme pgg-default-scheme) string type)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
552 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
553 (defvar pgg-insert-url-function (function pgg-insert-url-with-w3)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
554 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
555 (defun pgg-insert-url-with-w3 (url) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
556 (ignore-errors |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
557 (require 'url) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
558 (let (buffer-file-name) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
559 (url-insert-file-contents url)))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
560 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
561 (defvar pgg-insert-url-extra-arguments nil) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
562 (defvar pgg-insert-url-program nil) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
563 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
564 (defun pgg-insert-url-with-program (url) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
565 (let ((args (copy-sequence pgg-insert-url-extra-arguments)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
566 process) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
567 (insert |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
568 (with-temp-buffer |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
569 (setq process |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
570 (apply #'start-process " *PGG url*" (current-buffer) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
571 pgg-insert-url-program (nconc args (list url)))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
572 (set-process-sentinel process #'ignore) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
573 (while (eq 'run (process-status process)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
574 (accept-process-output process 5)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
575 (delete-process process) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
576 (if (and process (eq 'run (process-status process))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
577 (interrupt-process process)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
578 (buffer-string))))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
579 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
580 (defun pgg-fetch-key (keyserver key) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
581 "Attempt to fetch a KEY from KEYSERVER for addition to PGP or GnuPG keyring." |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
582 (with-current-buffer (get-buffer-create pgg-output-buffer) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
583 (buffer-disable-undo) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
584 (erase-buffer) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
585 (let ((proto (if (string-match "^[a-zA-Z\\+\\.\\\\-]+:" keyserver) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
586 (substring keyserver 0 (1- (match-end 0)))))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
587 (save-excursion |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
588 (funcall pgg-insert-url-function |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
589 (if proto keyserver |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
590 (format "http://%s:11371/pks/lookup?op=get&search=%s" |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
591 keyserver key)))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
592 (when (re-search-forward "^-+BEGIN" nil 'last) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
593 (delete-region (point-min) (match-beginning 0)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
594 (when (re-search-forward "^-+END" nil t) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
595 (delete-region (progn (end-of-line) (point)) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
596 (point-max))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
597 (insert "\n") |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
598 (with-temp-buffer |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
599 (insert-buffer-substring pgg-output-buffer) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
600 (pgg-snarf-keys-region (point-min)(point-max))))))) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
601 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
602 |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
603 (provide 'pgg) |
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
604 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
605 ;; arch-tag: 9cc705dd-1e6a-4c90-8dce-c3561f9a2cf4 |
66383
c82982d6cbc4
Moved pgg*.el files from lisp/gnus to lisp.
Eli Zaretskii <eliz@gnu.org>
parents:
diff
changeset
|
606 ;;; pgg.el ends here |