projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(sieve-manage-is-string): Accept literals too.
[gnus]
/
lisp
/
pgg-pgp5.el
diff --git
a/lisp/pgg-pgp5.el
b/lisp/pgg-pgp5.el
index
a21e244
..
537aaed
100644
(file)
--- a/
lisp/pgg-pgp5.el
+++ b/
lisp/pgg-pgp5.el
@@
-1,7
+1,7
@@
;;; pgg-pgp5.el --- PGP 5.* support for PGG.
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
;;; pgg-pgp5.el --- PGP 5.* support for PGG.
;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;; 2005, 2006 Free Software Foundation, Inc.
+;; 2005, 2006
, 2007, 2008
Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/11/02
;; Author: Daiki Ueno <ueno@unixuser.org>
;; Created: 1999/11/02
@@
-9,10
+9,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,9
+20,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Code:
;;; Code:
@@
-88,8
+86,7
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(errors-buffer pgg-errors-buffer)
(process-connection-type nil)
process status exit-status)
(errors-buffer pgg-errors-buffer)
(process-connection-type nil)
process status exit-status)
- (with-current-buffer (let ((default-enable-multibyte-characters t))
- (get-buffer-create output-buffer))
+ (with-current-buffer (get-buffer-create output-buffer)
(buffer-disable-undo)
(erase-buffer))
(when passphrase
(buffer-disable-undo)
(erase-buffer))
(when passphrase
@@
-133,8
+130,7
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(defun pgg-pgp5-lookup-key (string &optional type)
"Search keys associated with STRING."
(let ((args (list "+language=en" "-l" string)))
(defun pgg-pgp5-lookup-key (string &optional type)
"Search keys associated with STRING."
(let ((args (list "+language=en" "-l" string)))
- (with-current-buffer (let ((default-enable-multibyte-characters t))
- (get-buffer-create pgg-output-buffer))
+ (with-current-buffer (get-buffer-create pgg-output-buffer)
(buffer-disable-undo)
(erase-buffer)
(apply #'call-process pgg-pgp5-pgpk-program nil t nil args)
(buffer-disable-undo)
(erase-buffer)
(apply #'call-process pgg-pgp5-pgpk-program nil t nil args)
@@
-157,7
+153,7
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(args
(append
`("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1"
(args
(append
`("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1"
- ,@(if
recipients
+ ,@(if
(or recipients pgg-encrypt-for-me)
(apply #'append
(mapcar (lambda (rcpt)
(list "-r"
(apply #'append
(mapcar (lambda (rcpt)
(list "-r"
@@
-258,5
+254,5
@@
Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
(provide 'pgg-pgp5)
(provide 'pgg-pgp5)
-;;
;
arch-tag: 3dbd1073-6b3a-466c-9f55-5c587ffa6d7b
+;; arch-tag: 3dbd1073-6b3a-466c-9f55-5c587ffa6d7b
;;; pgg-pgp5.el ends here
;;; pgg-pgp5.el ends here