Mercurial > emacs
comparison lisp/epg.el @ 108851:cb093dac3d58
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Fri, 28 May 2010 00:48:45 +0000 |
parents | 511da81b16c5 |
children | a3e1f7134e6e |
comparison
equal
deleted
inserted
replaced
108850:7cd8ffa6f7db | 108851:cb093dac3d58 |
---|---|
1897 (file-already-exists t))) | 1897 (file-already-exists t))) |
1898 file) | 1898 file) |
1899 ;; Cleanup the tempfile. | 1899 ;; Cleanup the tempfile. |
1900 (and tempfile | 1900 (and tempfile |
1901 (file-exists-p tempfile) | 1901 (file-exists-p tempfile) |
1902 (delete-file tempfile t)) | 1902 (delete-file tempfile)) |
1903 ;; Cleanup the tempdir. | 1903 ;; Cleanup the tempdir. |
1904 (and tempdir | 1904 (and tempdir |
1905 (file-directory-p tempdir) | 1905 (file-directory-p tempdir) |
1906 (delete-directory tempdir))))))) | 1906 (delete-directory tempdir))))))) |
1907 | 1907 |
1997 (epg-wait-for-completion context) | 1997 (epg-wait-for-completion context) |
1998 (epg--check-error-for-decrypt context) | 1998 (epg--check-error-for-decrypt context) |
1999 (epg-read-output context)) | 1999 (epg-read-output context)) |
2000 (epg-delete-output-file context) | 2000 (epg-delete-output-file context) |
2001 (if (file-exists-p input-file) | 2001 (if (file-exists-p input-file) |
2002 (delete-file input-file t)) | 2002 (delete-file input-file)) |
2003 (epg-reset context)))) | 2003 (epg-reset context)))) |
2004 | 2004 |
2005 (defun epg-start-verify (context signature &optional signed-text) | 2005 (defun epg-start-verify (context signature &optional signed-text) |
2006 "Initiate a verify operation on SIGNATURE. | 2006 "Initiate a verify operation on SIGNATURE. |
2007 SIGNATURE and SIGNED-TEXT are a data object if they are specified. | 2007 SIGNATURE and SIGNED-TEXT are a data object if they are specified. |
2201 (epg-context-result-for context 'error)) | 2201 (epg-context-result-for context 'error)) |
2202 (error "Sign failed"))) | 2202 (error "Sign failed"))) |
2203 (epg-read-output context)) | 2203 (epg-read-output context)) |
2204 (epg-delete-output-file context) | 2204 (epg-delete-output-file context) |
2205 (if input-file | 2205 (if input-file |
2206 (delete-file input-file t)) | 2206 (delete-file input-file)) |
2207 (epg-reset context)))) | 2207 (epg-reset context)))) |
2208 | 2208 |
2209 (defun epg-start-encrypt (context plain recipients | 2209 (defun epg-start-encrypt (context plain recipients |
2210 &optional sign always-trust) | 2210 &optional sign always-trust) |
2211 "Initiate an encrypt operation on PLAIN. | 2211 "Initiate an encrypt operation on PLAIN. |
2321 (error "Encrypt failed: %S" | 2321 (error "Encrypt failed: %S" |
2322 (epg-context-result-for context 'error))) | 2322 (epg-context-result-for context 'error))) |
2323 (epg-read-output context)) | 2323 (epg-read-output context)) |
2324 (epg-delete-output-file context) | 2324 (epg-delete-output-file context) |
2325 (if input-file | 2325 (if input-file |
2326 (delete-file input-file t)) | 2326 (delete-file input-file)) |
2327 (epg-reset context)))) | 2327 (epg-reset context)))) |
2328 | 2328 |
2329 (defun epg-start-export-keys (context keys) | 2329 (defun epg-start-export-keys (context keys) |
2330 "Initiate an export keys operation. | 2330 "Initiate an export keys operation. |
2331 | 2331 |