Revert.

diff --git a/epg.el b/epg.el
index 720a686..e8bbc5d 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -818,7 +818,7 @@ This function is for internal use only."
              (epg-context-result-for epg-context 'error)))
        (delete-process process)))))
 
              (epg-context-result-for epg-context 'error)))
        (delete-process process)))))
 

-(defun epg-fvtangher-fgnghf (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))
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (let* ((key-id (match-string 1 string))
             (user-id (match-string 2 string))

@@ -843,19 +843,19 @@ This function is for internal use only."
           (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-GOODSIG (process string)
           (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-GOODSIG (process string)

-  (epg-fvtangher-fgnghf 'good string))
+  (epg-status-*SIG 'good string))

 
 (defun epg-status-EXPSIG (process string)
 
 (defun epg-status-EXPSIG (process string)

-  (epg-fvtangher-fgnghf 'expired string))
+  (epg-status-*SIG 'expired string))

 
 (defun epg-status-EXPKEYSIG (process string)
 
 (defun epg-status-EXPKEYSIG (process string)

-  (epg-fvtangher-fgnghf 'expired-key string))
+  (epg-status-*SIG 'expired-key string))

 
 (defun epg-status-REVKEYSIG (process string)
 
 (defun epg-status-REVKEYSIG (process string)

-  (epg-fvtangher-fgnghf 'revoked-key string))
+  (epg-status-*SIG 'revoked-key string))

 
 (defun epg-status-BADSIG (process string)
 
 (defun epg-status-BADSIG (process string)

-  (epg-fvtangher-fgnghf 'bad string))
+  (epg-status-*SIG 'bad string))

 
 (defun epg-status-NO_PUBKEY (process string)
   (epg-context-set-result-for
 
 (defun epg-status-NO_PUBKEY (process string)
   (epg-context-set-result-for

@@ -1072,7 +1072,7 @@ This function is for internal use only."
                           config))))
     config))
 
                           config))))
     config))
 

-(defun epg-yvfg-xrlf-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"
   (let ((args (append (list "--with-colons" "--no-greeting" "--batch"
                            "--with-fingerprint"
                            "--with-fingerprint"

@@ -1104,7 +1104,7 @@ This function is for internal use only."
          (setq field (1+ field))))
       (nreverse keys))))
 
          (setq field (1+ field))))
       (nreverse keys))))
 

-(defun epg-znxr-fho-xrl-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)))
   (epg-make-sub-key
    (if (aref line 1)
        (cdr (assq (string-to-char (aref line 1)) epg-key-validity-alist)))

@@ -1118,7 +1118,7 @@ This function is for internal use only."
    (aref line 5)
    (aref line 6)))
 
    (aref line 5)
    (aref line 6)))
 

-(defun epg-yvfg-xrlf-cbfgcebprff (key)
+(defun epg-list-keys-postprocess-one-key (key)

   (let (key-id user-id-string entry)
     (epg-key-set-sub-key-list
      key
   (let (key-id user-id-string entry)
     (epg-key-set-sub-key-list
      key

@@ -1142,13 +1142,13 @@ If MODE is nil, 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."
 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-yvfg-xrlf-1 context name mode))
+  (let ((lines (epg-list-keys-1 context name mode))

        keys cert)
     (while lines
       (cond
        ((member (aref (car lines) 0) '("pub" "sec" "crt" "crs"))
        (if (car keys)
        keys cert)
     (while lines
       (cond
        ((member (aref (car lines) 0) '("pub" "sec" "crt" "crs"))
        (if (car keys)

-           (epg-yvfg-xrlf-cbfgcebprff (car keys)))
+           (epg-list-keys-postprocess-one-key (car keys)))

        (setq cert (member (aref (car lines) 0) '("crt" "crs"))
              keys (cons (epg-make-key
                          (if (aref (car lines) 8)
        (setq cert (member (aref (car lines) 0) '("crt" "crs"))
              keys (cons (epg-make-key
                          (if (aref (car lines) 8)

@@ -1157,12 +1157,12 @@ signatures should be included."
                         keys))
        (epg-key-set-sub-key-list
         (car keys)
                         keys))
        (epg-key-set-sub-key-list
         (car keys)

-        (cons (epg-znxr-fho-xrl-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)
               (epg-key-sub-key-list (car keys)))))
        ((member (aref (car lines) 0) '("sub" "ssb"))
        (epg-key-set-sub-key-list
         (car keys)

-        (cons (epg-znxr-fho-xrl-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
               (epg-key-sub-key-list (car keys)))))
        ((equal (aref (car lines) 0) "uid")
        (epg-key-set-user-id-list

@@ -1182,7 +1182,7 @@ signatures should be included."
                                     (aref (car lines) 9))))
       (setq lines (cdr lines)))
     (if (car keys)
                                     (aref (car lines) 9))))
       (setq lines (cdr lines)))
     (if (car keys)

-       (epg-yvfg-xrlf-cbfgcebprff (car keys)))
+       (epg-list-keys-postprocess-one-key (car keys)))

     (nreverse keys)))
 
 (if (fboundp 'make-temp-file)
     (nreverse keys)))
 
 (if (fboundp 'make-temp-file)