* pgg-gpg.el (pgg-gpg-shell-command-switch): New user option.

(pgg-gpg-process-region): Bind `shell-command-switch' to the value
of `pgg-gpg-shell-command-switch'.

* pgg-pgp.el (pgg-pgp-shell-command-switch): New user option.
(pgg-pgp-process-region): Bind `shell-command-switch' to the value
of `pgg-pgp-shell-command-switch'.

* pgg-pgp5.el (pgg-pgp5-shell-command-switch): New user option.
(pgg-pgp5-process-region): Bind `shell-command-switch' to the value
of `pgg-pgp5-shell-command-switch'.

* pgg-gpg.el, pgg-pgp.el, pgg-pgp5.el (sign-region): Use fixed end
position of the signature.

diff --git a/pgg-gpg.el b/pgg-gpg.el
index 37b259f..fc17c07 100644 (file)
--- a/pgg-gpg.el
+++ b/pgg-gpg.el
@@ -37,7 +37,13 @@
   :type 'string)
 
 (defcustom pgg-gpg-shell-file-name "/bin/sh"
-  "The GnuPG executable."
+  "File name to load inferior shells from.  Bourne shell or its equivalent
+\(not tcsh) is needed for \"2>\"."
+  :group 'pgg-gpg
+  :type 'string)
+
+(defcustom pgg-gpg-shell-command-switch "-c"
+  "Switch used to have the shell execute its command line argument."
   :group 'pgg-gpg
   :type 'string)
 
@@ -77,6 +83,7 @@
           (list (concat "2>" errors-file-name)
                 (concat "3>" status-file-name))))
         (shell-file-name pgg-gpg-shell-file-name)
+        (shell-command-switch pgg-gpg-shell-command-switch)
         (output-buffer pgg-output-buffer)
         (errors-buffer pgg-errors-buffer)
         (status-buffer pgg-status-buffer)
@@ -203,7 +210,7 @@
       (replace-match ""))
     (pgg-process-when-success
       (goto-char (point-min))
-      (while (re-search-forward "\r$" end t)
+      (while (re-search-forward "\r$" nil t)
        (replace-match ""))
       (when (re-search-forward "^-+BEGIN PGP SIGNATURE" nil t);XXX
        (let ((packet 

diff --git a/pgg-pgp.el b/pgg-pgp.el
index e2dad34..7fe332d 100644 (file)
--- a/pgg-pgp.el
+++ b/pgg-pgp.el
@@ -37,7 +37,13 @@
   :type 'string)
 
 (defcustom pgg-pgp-shell-file-name "/bin/sh"
-  "The GnuPG executable."
+  "File name to load inferior shells from.  Bourne shell or its equivalent
+\(not tcsh) is needed for \"2>\"."
+  :group 'pgg-pgp
+  :type 'string)
+
+(defcustom pgg-pgp-shell-command-switch "-c"
+  "Switch used to have the shell execute its command line argument."
   :group 'pgg-pgp
   :type 'string)
 
@@ -70,6 +76,7 @@
                  pgg-pgp-extra-args
                  (list (concat "2>" errors-file-name))))
         (shell-file-name pgg-pgp-shell-file-name)
+        (shell-command-switch pgg-pgp-shell-command-switch)
         (output-buffer pgg-output-buffer)
         (errors-buffer pgg-errors-buffer)
         (process-connection-type nil)
@@ -189,7 +196,7 @@
                             pgg-pgp-program args)
     (pgg-process-when-success
       (goto-char (point-min))
-      (while (re-search-forward "\r$" end t)
+      (while (re-search-forward "\r$" nil t)
        (replace-match ""))
       (when (re-search-forward "^-+BEGIN PGP SIGNATURE" nil t);XXX
        (let ((packet 

diff --git a/pgg-pgp5.el b/pgg-pgp5.el
index f02040d..49f1815 100644 (file)
--- a/pgg-pgp5.el
+++ b/pgg-pgp5.el
@@ -52,7 +52,13 @@
   :type 'string)
 
 (defcustom pgg-pgp5-shell-file-name "/bin/sh"
-  "The GnuPG executable."
+  "File name to load inferior shells from.  Bourne shell or its equivalent
+\(not tcsh) is needed for \"2>\"."
+  :group 'pgg-pgp5
+  :type 'string)
+
+(defcustom pgg-pgp5-shell-command-switch "-c"
+  "Switch used to have the shell execute its command line argument."
   :group 'pgg-pgp5
   :type 'string)
 
@@ -85,6 +91,7 @@
                  pgg-pgp5-extra-args
                  (list (concat "2>" errors-file-name))))
         (shell-file-name pgg-pgp5-shell-file-name)
+        (shell-command-switch pgg-pgp5-shell-command-switch)
         (output-buffer pgg-output-buffer)
         (errors-buffer pgg-errors-buffer)
         (process-connection-type nil)
@@ -211,7 +218,7 @@
                             pgg-pgp5-pgps-program args)
     (pgg-process-when-success
       (goto-char (point-min))
-      (while (re-search-forward "\r$" end t)
+      (while (re-search-forward "\r$" nil t)
        (replace-match ""))
       (when (re-search-forward "^-+BEGIN PGP SIGNATURE" nil t);XXX
        (let ((packet