diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/pgg-gpg.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9397101c432..f94a9fd6ce5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-04-05 Daiki Ueno <ueno@unixuser.org> | ||
| 2 | |||
| 3 | * pgg-gpg.el (pgg-gpg-encrypt-region, pgg-gpg-sign-region): Wait | ||
| 4 | for BEGIN_SIGNING too, new in GnuPG 1.4.3. | ||
| 5 | |||
| 1 | 2006-04-05 Kenichi Handa <handa@m17n.org> | 6 | 2006-04-05 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * international/characters.el: Setup cases of Latin, Greek, and | 8 | * international/characters.el: Setup cases of Latin, Greek, and |
diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index 293431b7e84..d8ceeabc25f 100644 --- a/lisp/pgg-gpg.el +++ b/lisp/pgg-gpg.el | |||
| @@ -256,7 +256,7 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt." | |||
| 256 | (list pgg-gpg-user-id)))))))) | 256 | (list pgg-gpg-user-id)))))))) |
| 257 | (process (pgg-gpg-start-process args))) | 257 | (process (pgg-gpg-start-process args))) |
| 258 | (if (and sign (not pgg-gpg-use-agent)) | 258 | (if (and sign (not pgg-gpg-use-agent)) |
| 259 | (pgg-gpg-wait-for-status process '("GOOD_PASSPHRASE"))) | 259 | (pgg-gpg-wait-for-status process '("BEGIN_SIGNING" "GOOD_PASSPHRASE"))) |
| 260 | (process-send-region process start end) | 260 | (process-send-region process start end) |
| 261 | (pgg-gpg-wait-for-completion process) | 261 | (pgg-gpg-wait-for-completion process) |
| 262 | (save-excursion | 262 | (save-excursion |
| @@ -303,7 +303,7 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt." | |||
| 303 | (if pgg-text-mode '("--textmode")))) | 303 | (if pgg-text-mode '("--textmode")))) |
| 304 | (process (pgg-gpg-start-process args))) | 304 | (process (pgg-gpg-start-process args))) |
| 305 | (unless pgg-gpg-use-agent | 305 | (unless pgg-gpg-use-agent |
| 306 | (pgg-gpg-wait-for-status process '("GOOD_PASSPHRASE"))) | 306 | (pgg-gpg-wait-for-status process '("BEGIN_SIGNING" "GOOD_PASSPHRASE"))) |
| 307 | (process-send-region process start end) | 307 | (process-send-region process start end) |
| 308 | (pgg-gpg-wait-for-completion process) | 308 | (pgg-gpg-wait-for-completion process) |
| 309 | (save-excursion | 309 | (save-excursion |