;;; Code:
(require 'path-util)
+(eval-when-compile (require 'static))
(defgroup smime ()
"S/MIME interface"
(smime-parse-attribute
(buffer-substring (point)(progn (end-of-line)(point))))))))
+(static-condition-case nil
+ (directory-files nil nil nil nil nil)
+ (wrong-number-of-arguments
+ (defmacro smime-directory-files
+ (directory &optional full match nosort files-only)
+ (if files-only
+ `(delq nil (mapcar
+ (lambda (file)
+ ,(if (eq files-only t)
+ `(if (file-directory-p file) nil file)
+ `(if (file-directory-p file) file nil)))
+ (directory-files ,directory ,full ,match ,nosort)))
+ `(directory-files ,directory ,full ,match ,nosort))))
+ (error
+ (defalias 'smime-directory-files 'directory-files)))
+
(defsubst smime-find-certificate (attr)
(let ((files (if (file-directory-p smime-certificate-directory)
- (directory-files smime-certificate-directory
- 'full nil nil t)
+ (delq nil (mapcar (lambda (file)
+ (if (file-directory-p file) nil
+ file))
+ (directory-files
+ smime-certificate-directory
+ 'full)))
nil)))
(catch 'found
(while files
(expand-file-name (read-file-name "Public key file: "))))
(args (list "-e" key-file)))
(smime-process-region start end smime-program args)
- (smime-process-when-success nil)))
+ (smime-process-when-success
+ (goto-char (point-min))
+ (delete-region (point-min) (progn
+ (re-search-forward "^$" nil t)
+ (1+ (point)))))))
;;;###autoload
(defun smime-decrypt-region (start end)
(args (list "-ds" key-file passphrase)))
(smime-process-region start end smime-program args)
(smime-process-when-success
+ (goto-char (point-min))
+ (delete-region (point-min) (progn
+ (re-search-forward "^$" nil t)
+ (1+ (point))))
(when smime-cache-passphrase
(smime-add-passphrase-cache hash passphrase)))))