From: ueno Date: Fri, 26 May 2006 09:28:54 +0000 (+0000) Subject: Prefix epg-- instead of epg- for non-interface functions. X-Git-Tag: epg-0_0_2~24 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=c9657bb821e19b47cbfd2c36912e95bfadfada24;p=elisp%2Fepg.git Prefix epg-- instead of epg- for non-interface functions. --- diff --git a/epa.el b/epa.el index 4d16a3c..6425d19 100644 --- a/epa.el +++ b/epa.el @@ -41,7 +41,7 @@ "If non-nil, epa commands treat input files as text." :type 'boolean :group 'epa) - + (defgroup epa-faces nil "Faces for epa-mode." :group 'epa) diff --git a/epg.el b/epg.el index 62c02fc..e56d635 100644 --- a/epg.el +++ b/epg.el @@ -792,7 +792,7 @@ This function is for internal use only." (format "%02X " (epg-new-signature-class new-signature)) (epg-new-signature-fingerprint new-signature))) -(defun epg-start (context args) +(defun epg--start (context args) "Start `epg-gpg-program' in a subprocess with given ARGS." (if (and (epg-context-process context) (eq (process-status (epg-context-process context)) 'run)) @@ -845,10 +845,10 @@ This function is for internal use only." epg-gpg-program) args))) (set-default-file-modes orig-mode)) - (set-process-filter process #'epg-process-filter) + (set-process-filter process #'epg--process-filter) (epg-context-set-process context process))) -(defun epg-process-filter (process input) +(defun epg--process-filter (process input) (if epg-debug (save-excursion (unless epg-debug-buffer @@ -868,7 +868,7 @@ This function is for internal use only." (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\) ?\\(.*\\)") (let* ((status (match-string 1)) (string (match-string 2)) - (symbol (intern-soft (concat "epg-status-" status)))) + (symbol (intern-soft (concat "epg--status-" status)))) (if (member status epg-pending-status-list) (setq epg-pending-status-list nil)) (if (and symbol @@ -913,7 +913,7 @@ This function is for internal use only." (file-exists-p (epg-context-output-file context))) (delete-file (epg-context-output-file context)))) -(defun epg-status-USERID_HINT (process string) +(defun epg--status-USERID_HINT (process string) (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string) (let* ((key-id (match-string 1 string)) (user-id (match-string 2 string)) @@ -923,17 +923,17 @@ This function is for internal use only." (setq epg-user-id-alist (cons (cons key-id user-id) epg-user-id-alist)))))) -(defun epg-status-NEED_PASSPHRASE (process string) +(defun epg--status-NEED_PASSPHRASE (process string) (if (string-match "\\`\\([^ ]+\\)" string) (setq epg-key-id (match-string 1 string)))) -(defun epg-status-NEED_PASSPHRASE_SYM (process string) +(defun epg--status-NEED_PASSPHRASE_SYM (process string) (setq epg-key-id 'SYM)) -(defun epg-status-NEED_PASSPHRASE_PIN (process string) +(defun epg--status-NEED_PASSPHRASE_PIN (process string) (setq epg-key-id 'PIN)) -(defun epg-status-GET_HIDDEN (process string) +(defun epg--status-GET_HIDDEN (process string) (if (and epg-key-id (string-match "\\`passphrase\\." string)) (let (inhibit-quit @@ -971,7 +971,7 @@ This function is for internal use only." (if passphrase-with-new-line (fillarray passphrase-with-new-line 0)))))) -(defun epg-status-GET_BOOL (process string) +(defun epg--status-GET_BOOL (process string) (let ((entry (assoc string epg-prompt-alist)) inhibit-quit) (condition-case nil @@ -985,7 +985,7 @@ This function is for internal use only." (epg-context-result-for epg-context 'error))) (delete-process process))))) -(defun epg-status-GET_LINE (process string) +(defun epg--status-GET_LINE (process string) (let ((entry (assoc string epg-prompt-alist)) inhibit-quit) (condition-case nil @@ -1000,7 +1000,7 @@ This function is for internal use only." (epg-context-result-for epg-context 'error))) (delete-process process))))) -(defun epg-status-*SIG (status string) +(defun epg--status-*SIG (status string) (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string) (let* ((key-id (match-string 1 string)) (user-id (match-string 2 string)) @@ -1024,29 +1024,29 @@ This function is for internal use only." (cons (epg-make-signature status) (epg-context-result-for epg-context 'verify))))) -(defun epg-status-GOODSIG (process string) - (epg-status-*SIG 'good string)) +(defun epg--status-GOODSIG (process string) + (epg--status-*SIG 'good string)) -(defun epg-status-EXPSIG (process string) - (epg-status-*SIG 'expired string)) +(defun epg--status-EXPSIG (process string) + (epg--status-*SIG 'expired string)) -(defun epg-status-EXPKEYSIG (process string) - (epg-status-*SIG 'expired-key string)) +(defun epg--status-EXPKEYSIG (process string) + (epg--status-*SIG 'expired-key string)) -(defun epg-status-REVKEYSIG (process string) - (epg-status-*SIG 'revoked-key string)) +(defun epg--status-REVKEYSIG (process string) + (epg--status-*SIG 'revoked-key string)) -(defun epg-status-BADSIG (process string) - (epg-status-*SIG 'bad string)) +(defun epg--status-BADSIG (process string) + (epg--status-*SIG 'bad string)) -(defun epg-status-NO_PUBKEY (process string) +(defun epg--status-NO_PUBKEY (process string) (epg-context-set-result-for epg-context 'verify (cons (epg-make-signature 'no-pubkey string) (epg-context-result-for epg-context 'verify)))) -(defun epg-status-ERRSIG (process string) +(defun epg--status-ERRSIG (process string) (let ((signatures (epg-context-result-for epg-context 'verify))) (unless signatures (setq signatures (list (epg-make-signature 'error))) @@ -1071,7 +1071,7 @@ This function is for internal use only." (car signatures) (match-string 5 string))))) -(defun epg-status-VALIDSIG (process string) +(defun epg--status-VALIDSIG (process string) (let ((signature (car (epg-context-result-for epg-context 'verify)))) (when (and signature (eq (epg-signature-status signature) 'good) @@ -1101,37 +1101,37 @@ This function is for internal use only." signature (string-to-number (match-string 7 string) 16))))) -(defun epg-status-TRUST_UNDEFINED (process string) +(defun epg--status-TRUST_UNDEFINED (process string) (let ((signature (car (epg-context-result-for epg-context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'good)) (epg-signature-set-validity signature 'undefined)))) -(defun epg-status-TRUST_NEVER (process string) +(defun epg--status-TRUST_NEVER (process string) (let ((signature (car (epg-context-result-for epg-context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'good)) (epg-signature-set-validity signature 'never)))) -(defun epg-status-TRUST_MARGINAL (process string) +(defun epg--status-TRUST_MARGINAL (process string) (let ((signature (car (epg-context-result-for epg-context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'marginal)) (epg-signature-set-validity signature 'marginal)))) -(defun epg-status-TRUST_FULLY (process string) +(defun epg--status-TRUST_FULLY (process string) (let ((signature (car (epg-context-result-for epg-context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'good)) (epg-signature-set-validity signature 'full)))) -(defun epg-status-TRUST_ULTIMATE (process string) +(defun epg--status-TRUST_ULTIMATE (process string) (let ((signature (car (epg-context-result-for epg-context 'verify)))) (if (and signature (eq (epg-signature-status signature) 'good)) (epg-signature-set-validity signature 'ultimate)))) -(defun epg-status-PROGRESS (process string) +(defun epg--status-PROGRESS (process string) (if (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)" string) (funcall (if (consp (epg-context-progress-callback epg-context)) @@ -1145,43 +1145,43 @@ This function is for internal use only." (if (consp (epg-context-progress-callback epg-context)) (cdr (epg-context-progress-callback epg-context)))))) -(defun epg-status-DECRYPTION_FAILED (process string) +(defun epg--status-DECRYPTION_FAILED (process string) (epg-context-set-result-for epg-context 'error (cons '(decryption-failed) (epg-context-result-for epg-context 'error)))) -(defun epg-status-NODATA (process string) +(defun epg--status-NODATA (process string) (epg-context-set-result-for epg-context 'error (cons (list 'no-data (cons 'reason (string-to-number string))) (epg-context-result-for epg-context 'error)))) -(defun epg-status-UNEXPECTED (process string) +(defun epg--status-UNEXPECTED (process string) (epg-context-set-result-for epg-context 'error (cons (list 'unexpected (cons 'reason (string-to-number string))) (epg-context-result-for epg-context 'error)))) -(defun epg-status-KEYEXPIRED (process string) +(defun epg--status-KEYEXPIRED (process string) (epg-context-set-result-for epg-context 'error (cons (list 'key-expired (cons 'expiration-time string)) (epg-context-result-for epg-context 'error)))) -(defun epg-status-KEYREVOKED (process string) +(defun epg--status-KEYREVOKED (process string) (epg-context-set-result-for epg-context 'error (cons '(key-revoked) (epg-context-result-for epg-context 'error)))) -(defun epg-status-BADARMOR (process string) +(defun epg--status-BADARMOR (process string) (epg-context-set-result-for epg-context 'error (cons '(bad-armor) (epg-context-result-for epg-context 'error)))) -(defun epg-status-INV_RECP (process string) +(defun epg--status-INV_RECP (process string) (if (string-match "\\`\\([0-9]+\\) \\(.*\\)" string) (epg-context-set-result-for epg-context 'error @@ -1192,13 +1192,13 @@ This function is for internal use only." (match-string 2 string))) (epg-context-result-for epg-context 'error))))) -(defun epg-status-NO_RECP (process string) +(defun epg--status-NO_RECP (process string) (epg-context-set-result-for epg-context 'error (cons '(no-recipients) (epg-context-result-for epg-context 'error)))) -(defun epg-status-DELETE_PROBLEM (process string) +(defun epg--status-DELETE_PROBLEM (process string) (if (string-match "\\`\\([0-9]+\\)" string) (epg-context-set-result-for epg-context 'error @@ -1206,7 +1206,7 @@ This function is for internal use only." (cons 'reason (string-to-number (match-string 1 string)))) (epg-context-result-for epg-context 'error))))) -(defun epg-status-SIG_CREATED (process string) +(defun epg--status-SIG_CREATED (process string) (if (string-match "\\`\\([DCS]\\) \\([0-9]+\\) \\([0-9]+\\) \ \\([0-9A-Fa-F][0-9A-Fa-F]\\) \\(.*\\) " string) (epg-context-set-result-for @@ -1221,7 +1221,7 @@ This function is for internal use only." (substring string (match-end 0))) (epg-context-result-for epg-context 'sign))))) -(defun epg-status-KEY_CREATED (process string) +(defun epg--status-KEY_CREATED (process string) (if (string-match "\\`\\([BPS]\\) \\([^ ]+\\)" string) (epg-context-set-result-for epg-context 'generate-key @@ -1229,13 +1229,13 @@ This function is for internal use only." (cons 'fingerprint (match-string 2 string))) (epg-context-result-for epg-context 'generate-key))))) -(defun epg-status-KEY_NOT_CREATED (process string) +(defun epg--status-KEY_NOT_CREATED (process string) (epg-context-set-result-for epg-context 'error (cons '(key-not-created) (epg-context-result-for epg-context 'error)))) -(defun epg-status-IMPORTED (process string) +(defun epg--status-IMPORTED (process string) (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string) (let* ((key-id (match-string 1 string)) (user-id (match-string 2 string)) @@ -1250,7 +1250,7 @@ This function is for internal use only." (cons 'user-id user-id)) (epg-context-result-for epg-context 'import)))))) -(defun epg-status-IMPORT_OK (process string) +(defun epg--status-IMPORT_OK (process string) (let ((result (epg-context-result-for epg-context 'import))) (if (and result (string-match "\\`\\([0-9]+\\)\\( \\(.+\\)\\)?" string)) @@ -1263,7 +1263,7 @@ This function is for internal use only." (match-string 3 string)))) (car result)))))) -(defun epg-status-IMPORT_PROBLEM (process string) +(defun epg--status-IMPORT_PROBLEM (process string) (if (string-match "\\`\\([0-9]+\\)\\( \\(.+\\)\\)?" string) (epg-context-set-result-for epg-context 'error @@ -1312,7 +1312,7 @@ This function is for internal use only." config)))) config)) -(defun epg-list-keys-1 (context name mode) +(defun epg--list-keys-1 (context name mode) (let ((args (append (list "--with-colons" "--no-greeting" "--batch" "--with-fingerprint" "--with-fingerprint" @@ -1344,7 +1344,7 @@ This function is for internal use only." (setq field (1+ field)))) (nreverse keys)))) -(defun epg-make-sub-key-1 (line) +(defun epg--make-sub-key-1 (line) (epg-make-sub-key (if (aref line 1) (cdr (assq (string-to-char (aref line 1)) epg-key-validity-alist))) @@ -1365,7 +1365,7 @@ If MODE is nil or 'public, only public keyring should be searched. If MODE is t or 'secret, only secret keyring should be searched. Otherwise, only public keyring should be searched and the key signatures should be included." - (let ((lines (epg-list-keys-1 context name mode)) + (let ((lines (epg--list-keys-1 context name mode)) keys cert pointer pointer-1) (while lines (cond @@ -1378,12 +1378,12 @@ signatures should be included." keys)) (epg-key-set-sub-key-list (car keys) - (cons (epg-make-sub-key-1 (car lines)) + (cons (epg--make-sub-key-1 (car lines)) (epg-key-sub-key-list (car keys))))) ((member (aref (car lines) 0) '("sub" "ssb")) (epg-key-set-sub-key-list (car keys) - (cons (epg-make-sub-key-1 (car lines)) + (cons (epg--make-sub-key-1 (car lines)) (epg-key-sub-key-list (car keys))))) ((equal (aref (car lines) 0) "uid") (epg-key-set-user-id-list @@ -1437,10 +1437,10 @@ signatures should be included." keys)) (if (fboundp 'make-temp-file) - (defalias 'epg-make-temp-file 'make-temp-file) + (defalias 'epg--make-temp-file 'make-temp-file) (defvar temporary-file-directory) ;; stolen from poe.el. - (defun epg-make-temp-file (prefix) + (defun epg--make-temp-file (prefix) "Create a temporary file. The returned file name (created by appending some random characters at the end of PREFIX, and expanding against `temporary-file-directory' if necessary), @@ -1516,7 +1516,7 @@ If you are unsure, use synchronous version of this function (error "Not a file")) (epg-context-set-operation context 'decrypt) (epg-context-set-result context nil) - (epg-start context (list "--decrypt" (epg-data-file cipher))) + (epg--start context (list "--decrypt" (epg-data-file cipher))) ;; `gpgsm' does not read passphrase from stdin, so waiting is not needed. (unless (eq (epg-context-protocol context) 'CMS) (epg-wait-for-status context '("BEGIN_DECRYPTION")))) @@ -1530,7 +1530,7 @@ If PLAIN is nil, it returns the result as a string." (if plain (epg-context-set-output-file context plain) (epg-context-set-output-file context - (epg-make-temp-file "epg-output"))) + (epg--make-temp-file "epg-output"))) (epg-start-decrypt context (epg-make-data-from-file cipher)) (epg-wait-for-completion context) (if (epg-context-result-for context 'error) @@ -1545,13 +1545,13 @@ If PLAIN is nil, it returns the result as a string." ;;;###autoload (defun epg-decrypt-string (context cipher) "Decrypt a string CIPHER and return the plain text." - (let ((input-file (epg-make-temp-file "epg-input")) + (let ((input-file (epg--make-temp-file "epg-input")) (coding-system-for-write 'binary)) (unwind-protect (progn (write-region cipher nil input-file nil 'quiet) (epg-context-set-output-file context - (epg-make-temp-file "epg-output")) + (epg--make-temp-file "epg-output")) (epg-start-decrypt context (epg-make-data-from-file input-file)) (epg-wait-for-completion context) (if (epg-context-result-for context 'error) @@ -1581,9 +1581,9 @@ If you are unsure, use synchronous version of this function (if signed-text ;; Detached signature. (if (epg-data-file signed-text) - (epg-start context (list "--verify" (epg-data-file signature) + (epg--start context (list "--verify" (epg-data-file signature) (epg-data-file signed-text))) - (epg-start context (list "--verify" (epg-data-file signature) "-")) + (epg--start context (list "--verify" (epg-data-file signature) "-")) (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) (epg-data-string signed-text))) @@ -1591,8 +1591,8 @@ If you are unsure, use synchronous version of this function (process-send-eof (epg-context-process context)))) ;; Normal (or cleartext) signature. (if (epg-data-file signature) - (epg-start context (list "--verify" (epg-data-file signature))) - (epg-start context (list "--verify")) + (epg--start context (list "--verify" (epg-data-file signature))) + (epg--start context (list "--verify")) (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) (epg-data-string signature))) @@ -1611,7 +1611,7 @@ For a normal or a clear text signature, SIGNED-TEXT should be nil." (if plain (epg-context-set-output-file context plain) (epg-context-set-output-file context - (epg-make-temp-file "epg-output"))) + (epg--make-temp-file "epg-output"))) (if signed-text (epg-start-verify context (epg-make-data-from-file signature) @@ -1640,10 +1640,10 @@ For a normal or a clear text signature, SIGNED-TEXT should be nil." (unwind-protect (progn (epg-context-set-output-file context - (epg-make-temp-file "epg-output")) + (epg--make-temp-file "epg-output")) (if signed-text (progn - (setq input-file (epg-make-temp-file "epg-signature")) + (setq input-file (epg--make-temp-file "epg-signature")) (write-region signature nil input-file nil 'quiet) (epg-start-verify context (epg-make-data-from-file input-file) @@ -1676,7 +1676,7 @@ If you are unsure, use synchronous version of this function `epg-sign-file' or `epg-sign-string' instead." (epg-context-set-operation context 'sign) (epg-context-set-result context nil) - (epg-start context + (epg--start context (append (list (if (memq mode '(t detached)) "--detach-sign" (if (memq mode '(nil normal)) @@ -1713,7 +1713,7 @@ Otherwise, it makes a clear text signature." (if signature (epg-context-set-output-file context signature) (epg-context-set-output-file context - (epg-make-temp-file "epg-output"))) + (epg--make-temp-file "epg-output"))) (epg-start-sign context (epg-make-data-from-file plain) mode) (epg-wait-for-completion context) (unless (epg-context-result-for context 'sign) @@ -1736,7 +1736,7 @@ Otherwise, it makes a clear text signature." (unwind-protect (progn (epg-context-set-output-file context - (epg-make-temp-file "epg-output")) + (epg--make-temp-file "epg-output")) (epg-start-sign context (epg-make-data-from-string plain) mode) (epg-wait-for-completion context) (unless (epg-context-result-for context 'sign) @@ -1762,7 +1762,7 @@ If you are unsure, use synchronous version of this function `epg-encrypt-file' or `epg-encrypt-string' instead." (epg-context-set-operation context 'encrypt) (epg-context-set-result context nil) - (epg-start context + (epg--start context (append (if always-trust '("--always-trust")) (if recipients '("--encrypt") '("--symmetric")) (if sign @@ -1803,7 +1803,7 @@ If RECIPIENTS is nil, it performs symmetric encryption." (if cipher (epg-context-set-output-file context cipher) (epg-context-set-output-file context - (epg-make-temp-file "epg-output"))) + (epg--make-temp-file "epg-output"))) (epg-start-encrypt context (epg-make-data-from-file plain) recipients sign always-trust) (epg-wait-for-completion context) @@ -1830,7 +1830,7 @@ If RECIPIENTS is nil, it performs symmetric encryption." (unwind-protect (progn (epg-context-set-output-file context - (epg-make-temp-file "epg-output")) + (epg--make-temp-file "epg-output")) (epg-start-encrypt context (epg-make-data-from-string plain) recipients sign always-trust) (epg-wait-for-completion context) @@ -1858,7 +1858,7 @@ If you are unsure, use synchronous version of this function `epg-export-keys-to-file' or `epg-export-keys-to-string' instead." (epg-context-set-operation context 'export-keys) (epg-context-set-result context nil) - (epg-start context (cons "--export" + (epg--start context (cons "--export" (mapcar (lambda (key) (epg-sub-key-id @@ -1873,7 +1873,7 @@ If you are unsure, use synchronous version of this function (if keys (epg-context-set-output-file context file) (epg-context-set-output-file context - (epg-make-temp-file "epg-output"))) + (epg--make-temp-file "epg-output"))) (epg-start-export-keys context keys) (epg-wait-for-completion context) (if (epg-context-result-for context 'error) @@ -1902,7 +1902,7 @@ If you are unsure, use synchronous version of this function `epg-import-keys-from-file' or `epg-import-keys-from-string' instead." (epg-context-set-operation context 'import-keys) (epg-context-set-result context nil) - (epg-start context (list "--import" (epg-data-file keys))) + (epg--start context (list "--import" (epg-data-file keys))) (when (epg-data-string keys) (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) @@ -1910,7 +1910,7 @@ If you are unsure, use synchronous version of this function (if (eq (process-status (epg-context-process context)) 'run) (process-send-eof (epg-context-process context))))) -(defun epg-import-keys-1 (context keys) +(defun epg--import-keys-1 (context keys) (unwind-protect (progn (epg-start-import-keys context keys) @@ -1923,12 +1923,12 @@ If you are unsure, use synchronous version of this function ;;;###autoload (defun epg-import-keys-from-file (context keys) "Add keys from a file KEYS." - (epg-import-keys-1 context (epg-make-data-from-file keys))) + (epg--import-keys-1 context (epg-make-data-from-file keys))) ;;;###autoload (defun epg-import-keys-from-string (context keys) "Add keys from a string KEYS." - (epg-import-keys-1 context (epg-make-data-from-string keys))) + (epg--import-keys-1 context (epg-make-data-from-string keys))) ;;;###autoload (defun epg-start-receive-keys (context key-id-list) @@ -1942,7 +1942,7 @@ If you are unsure, use synchronous version of this function `epg-generate-key-from-file' or `epg-generate-key-from-string' instead." (epg-context-set-operation context 'receive-keys) (epg-context-set-result context nil) - (epg-start context (cons "--recv-keys" key-id-list))) + (epg--start context (cons "--recv-keys" key-id-list))) ;;;###autoload (defun epg-receive-keys (context keys) @@ -1971,7 +1971,7 @@ If you are unsure, use synchronous version of this function `epg-delete-keys' instead." (epg-context-set-operation context 'delete-keys) (epg-context-set-result context nil) - (epg-start context (cons (if allow-secret + (epg--start context (cons (if allow-secret "--delete-secret-key" "--delete-key") (mapcar @@ -2003,7 +2003,7 @@ If you are unsure, use synchronous version of this function `epg-sign-keys' instead." (epg-context-set-operation context 'sign-keys) (epg-context-set-result context nil) - (epg-start context (cons (if local + (epg--start context (cons (if local "--lsign-key" "--sign-key") (mapcar @@ -2037,9 +2037,9 @@ If you are unsure, use synchronous version of this function (epg-context-set-operation context 'generate-key) (epg-context-set-result context nil) (if (epg-data-file parameters) - (epg-start context (list "--batch" "--genkey" + (epg--start context (list "--batch" "--genkey" (epg-data-file parameters))) - (epg-start context '("--batch" "--genkey")) + (epg--start context '("--batch" "--genkey")) (if (eq (process-status (epg-context-process context)) 'run) (process-send-string (epg-context-process context) (epg-data-string parameters))) @@ -2072,14 +2072,14 @@ PARAMETERS is a string which tells how to create the key." (epg-context-result-for context 'error)))) (epg-reset context))) -(defun epg-decode-hexstring (string) +(defun epg--decode-hexstring (string) (let ((index 0)) (while (eq index (string-match "[0-9A-Fa-f][0-9A-Fa-f]" string index)) (setq string (replace-match "\\x\\&" t nil string) index (+ index 4))) (car (read-from-string (concat "\"" string "\""))))) -(defun epg-decode-quotedstring (string) +(defun epg--decode-quotedstring (string) (let ((index 0)) (while (string-match "\\\\\\(\\([,=+<>#;\\\"]\\)\\|\ \\([0-9A-Fa-f][0-9A-Fa-f]\\)\\|\\(.\\)\\)" @@ -2118,14 +2118,15 @@ The return value is an alist mapping from types to values." "\\([^,=+<>#;\\\"]\\|\\\\.\\)+" string index)) (setq index (match-end 0) - value (epg-decode-quotedstring (match-string 0 string))) + value (epg--decode-quotedstring (match-string 0 string))) (if (eq index (string-match "#\\([0-9A-Fa-f]+\\)" string index)) (setq index (match-end 0) - value (epg-decode-hexstring (match-string 1 string))) + value (epg--decode-hexstring (match-string 1 string))) (if (eq index (string-match "\"\\([^\\\"]\\|\\\\.\\)*\"" string index)) (setq index (match-end 0) - value (epg-decode-quotedstring (match-string 0 string)))))) + value (epg--decode-quotedstring + (match-string 0 string)))))) (if group (if (stringp (car (car alist))) (setcar alist (list (cons type value) (car alist)))