X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-gpg.el;h=404eae07dfce66b769e1440b8bbd79c09d6a26c7;hb=3a4794f686e29666a2893de822d4a08463f40e59;hp=957ea6178f3901ef0e18795f105bc14a11842aa4;hpb=513481757377c7ade9f47b21d084fdff47a8a057;p=elisp%2Fsemi.git

diff --git a/pgg-gpg.el b/pgg-gpg.el
index 957ea61..404eae0 100644
--- a/pgg-gpg.el
+++ b/pgg-gpg.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -79,7 +79,8 @@
 	 process status exit-status)
     (when pgg-gpg-messages-locale
       (setq process-environment (copy-sequence process-environment))
-      (setenv "LC_ALL" pgg-gpg-messages-locale))
+      (setenv "LC_ALL" pgg-gpg-messages-locale)
+      (setenv "LANGUAGE" pgg-gpg-messages-locale))
     (with-current-buffer (get-buffer-create errors-buffer)
       (buffer-disable-undo)
       (erase-buffer))
@@ -137,12 +138,9 @@
     (with-temp-buffer
       (apply #'call-process pgg-gpg-program nil t nil args)
       (goto-char (point-min))
-      (if (re-search-forward "^\\(sec\\|pub\\):"  nil t)
-	  (substring
-	   (nth 3 (split-string
-		   (buffer-substring (match-end 0)
-				     (progn (end-of-line)(point)))
-		   ":")) 8)))))
+      (if (re-search-forward "^\\(sec\\|pub\\):[^:]*:[^:]*:[^:]*:\\([^:]*\\)"
+			     nil t)
+	  (substring (match-string 2) 8)))))
 
 (luna-define-method pgg-scheme-encrypt-region ((scheme pgg-scheme-gpg)
 					       start end recipients)