From: tomo <tomo>
Date: Fri, 22 Dec 2000 11:30:30 +0000 (+0000)
Subject: Sync with SEMI 1.14.1 (Kaga-Onsen).
X-Git-Tag: semi21-1_14_2-emh-1_14_1~2
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f8dbd1f289baeb99234a3fbebaf153058d0af6b;p=elisp%2Flemi.git

Sync with SEMI 1.14.1 (Kaga-Onsen).
---

diff --git a/mime/pgg-def.el b/mime/pgg-def.el
index f1c62ea..d5f01b8 100644
--- a/mime/pgg-def.el
+++ b/mime/pgg-def.el
@@ -1,8 +1,8 @@
 ;;; pgg-def.el --- functions/macros for defining PGG functions
 
-;; Copyright (C) 1999 Daiki Ueno
+;; Copyright (C) 1999 Free Software Foundation, Inc.
 
-;; Author: Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
+;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
 ;; Keywords: PGP, OpenPGP, GnuPG
 
@@ -58,6 +58,11 @@
   :group 'pgg
   :type 'boolean)
 
+(defcustom pgg-messages-coding-system 'undecided
+  "Coding system used when reading from a PGP external process."
+  :group 'pgg
+  :type 'coding-system)
+
 (defvar pgg-status-buffer " *PGG status*")
 (defvar pgg-errors-buffer " *PGG errors*")
 (defvar pgg-output-buffer " *PGG output*")
diff --git a/mime/pgg-gpg.el b/mime/pgg-gpg.el
index 8080bd7..5b29a76 100644
--- a/mime/pgg-gpg.el
+++ b/mime/pgg-gpg.el
@@ -1,6 +1,6 @@
 ;;; pgg-gpg.el --- GnuPG support for PGG.
 
-;; Copyright (C) 1999,2000 Daiki Ueno
+;; Copyright (C) 1999,2000 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/10/28
@@ -47,6 +47,9 @@
 (defvar pgg-gpg-user-id nil
   "GnuPG ID of your default identity.")
 
+(defvar pgg-gpg-messages-coding-system pgg-messages-coding-system
+  "Coding system used when reading from a GnuPG external process.")
+
 (defvar pgg-scheme-gpg-instance nil)
 
 ;;;###autoload
@@ -77,6 +80,9 @@
 	  (setq process
 		(apply #'binary-start-process "*GnuPG*" errors-buffer
 		       program args))
+	  (if (fboundp 'set-process-coding-system)
+	      (set-process-coding-system process
+					 pgg-gpg-messages-coding-system))
 	  (set-process-sentinel process #'ignore)
 	  (when passphrase
 	    (process-send-string process (concat passphrase "\n")))
@@ -186,6 +192,7 @@
   (let ((args '("--batch" "--verify")))
     (when (stringp signature)
       (setq args (append args (list signature))))
+    (setq args (append args '("-")))
     (pgg-gpg-process-region start end nil pgg-gpg-program args)
     (with-current-buffer pgg-errors-buffer
       (goto-char (point-min))
diff --git a/mime/pgg.el b/mime/pgg.el
index 6975eef..1b40d48 100644
--- a/mime/pgg.el
+++ b/mime/pgg.el
@@ -1,8 +1,8 @@
 ;;; pgg.el --- glue for the various PGP implementations.
 
-;; Copyright (C) 1999,2000 Daiki Ueno
+;; Copyright (C) 1999,2000 Free Software Foundation, Inc.
 
-;; Author: Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
+;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/10/28
 ;; Keywords: PGP
 
diff --git a/mime/semi-def.el b/mime/semi-def.el
index 70e6934..564ee66 100644
--- a/mime/semi-def.el
+++ b/mime/semi-def.el
@@ -28,7 +28,7 @@
 
 (require 'custom)
 
-(defconst mime-user-interface-product ["SEMI" (1 14 0) "Iburihashi"]
+(defconst mime-user-interface-product ["SEMI" (1 14 1) "Kaga-Onsen"]
   "Product name, version number and code name of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"