aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-09-19 03:18:30 +0000
committerGlenn Morris2009-09-19 03:18:30 +0000
commit665906840afc8db0a28b0435d5c798a25462abcc (patch)
treef21750ad0ffddcda8d98dc4e3c4715092b983ea5
parent0bae4e09edd730765af582e5c414a83fdc454869 (diff)
downloademacs-665906840afc8db0a28b0435d5c798a25462abcc.tar.gz
emacs-665906840afc8db0a28b0435d5c798a25462abcc.zip
(pgg-pgp-encrypt-region): Add missing mapconcat separator.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/pgg-pgp.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dcbe3034a53..faf571fa719 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-09-19 Glenn Morris <rgm@gnu.org>
2
3 * pgg-pgp.el (pgg-pgp-encrypt-region): Add missing mapconcat separator.
4
12009-09-18 Chong Yidong <cyd@stupidchicken.com> 52009-09-18 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * files.el (auto-mode-alist): Change default for XML files to nXML 7 * files.el (auto-mode-alist): Change default for XML files to nXML
diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el
index 26c7fccd78d..19d9a0ba240 100644
--- a/lisp/pgg-pgp.el
+++ b/lisp/pgg-pgp.el
@@ -1,7 +1,7 @@
1;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG. 1;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG.
2 2
3;; Copyright (C) 1999, 2000, 2002, 2003, 2004, 3;; Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
4;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 4;; 2009 Free Software Foundation, Inc.
5 5
6;; Author: Daiki Ueno <ueno@unixuser.org> 6;; Author: Daiki Ueno <ueno@unixuser.org>
7;; Created: 1999/11/02 7;; Created: 1999/11/02
@@ -145,7 +145,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
145 (mapconcat 'shell-quote-argument 145 (mapconcat 'shell-quote-argument
146 (append recipients 146 (append recipients
147 (if pgg-encrypt-for-me 147 (if pgg-encrypt-for-me
148 (list pgg-pgp-user-id))))) 148 (list pgg-pgp-user-id))) " "))
149 (if sign (concat " -s -u " (shell-quote-argument pgg-pgp-user-id)))))) 149 (if sign (concat " -s -u " (shell-quote-argument pgg-pgp-user-id))))))
150 (pgg-pgp-process-region start end nil pgg-pgp-program args) 150 (pgg-pgp-process-region start end nil pgg-pgp-program args)
151 (pgg-process-when-success nil))) 151 (pgg-process-when-success nil)))