From: ueno <ueno>
Date: Tue, 26 Dec 2000 02:32:05 +0000 (+0000)
Subject: Synch with `semi-1_14_2'.
X-Git-Tag: emiko-1_14-pgg-0_1-last-~1
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=bf7e08bd7cfe04654f724a049282365e3244d306;p=elisp%2Fsemi.git

Synch with `semi-1_14_2'.

Morioka-san, the implementation of `pgg-pgp-process-region' is
different from `pgg-gpg-process-region'.  In the latter I don't expect
OpenPGP packets in the output of the "gpg" command.

* pgg-pgp.el (pgg-pgp-messages-coding-system): Abolish.
(pgg-pgp-process-region): Use `binary-funcall' instead of
`binary-to-text-funcall'.

* pgg-pgp5.el (pgg-pgp5-messages-coding-system): Abolish.
(pgg-pgp5-process-region): Use `binary-funcall' instead of
`binary-to-text-funcall'.
---

diff --git a/Makefile b/Makefile
index d0f7125..8719100 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Makefile for SEMI kernel.
 #
 
-PACKAGE = semi
+PACKAGE = emiko
 API	= 1.14
 RELEASE = 0
 
diff --git a/README.en b/README.en
index a1760c6..5315343 100644
--- a/README.en
+++ b/README.en
@@ -40,7 +40,10 @@ Required environment
   19.14.  SEMI also does not support Emacs 19.29 to 19.34, XEmacs
   19.15 or XEmacs 20.2 without mule, but SEMI may work with them.
 
-  SEMI requires APEL (9.22 or later) and FLIM (Chao 1.14.1 or later)
+  SEMI also does not support Emacs 19.29 to 19.34, XEmacs 19.15 or
+  XEmacs 20.2, but SEMI may work with them.
+
+  SEMI requires APEL (9.22 or later) and FLIM (1.14.2 or later)
   package.  Please install them before installing it.  APEL package is
   available at:
 
diff --git a/VERSION b/VERSION
index 8b8d6ef..019f250 100644
--- a/VERSION
+++ b/VERSION
@@ -82,8 +82,8 @@
 1.13.6	Komatsu			$(B>.>>(B
 1.13.7	Awazu			$(B0@DE(B
 1.14.0	Iburihashi		$(BF066(B
-------	Kaga-Onsen		$(B2C2l29@t(B
-------	Daish-Dòji-A		$(BBg@;;{(B
+1.14.1	Kaga-Onsen		$(B2C2l29@t(B
+1.14.2	Daish-Dòji-A		$(BBg@;;{(B
 ------	Ushinoya		$(B5m%NC+(B
 ------	Hosorogi		$(B:YO$LZ(B
 ------	Awara-Onsen		$(B028629@t(B
diff --git a/mail-mime-setup.el b/mail-mime-setup.el
index ba509c2..60c46aa 100644
--- a/mail-mime-setup.el
+++ b/mail-mime-setup.el
@@ -1,6 +1,6 @@
 ;;; mail-mime-setup.el --- setup file for mail-mode.
 
-;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: mail-mode, MIME, multimedia, multilingual, encoded-word
@@ -31,14 +31,14 @@
 (autoload 'turn-on-mime-edit "mime-edit"
   "Unconditionally turn on MIME-Edit minor mode." t)
 
-(autoload 'eword-decode-header "eword-decode"
-  "Decode MIME encoded-words in header fields." t)
+;; (autoload 'eword-decode-header "eword-decode"
+;;   "Decode MIME encoded-words in header fields." t)
 
 
 ;;; @ for mail-mode, RMAIL and VM
 ;;;
 
-(add-hook 'mail-setup-hook 'eword-decode-header)
+;; (add-hook 'mail-setup-hook 'eword-decode-header)
 (add-hook 'mail-setup-hook 'turn-on-mime-edit 'append)
 (add-hook 'mail-send-hook  'mime-edit-maybe-translate)
 (set-alist 'mime-edit-split-message-sender-alist
diff --git a/mime-play.el b/mime-play.el
index 7341183..ff06bbf 100644
--- a/mime-play.el
+++ b/mime-play.el
@@ -345,7 +345,7 @@ It is registered to variable `mime-preview-quitting-method-alist'."
 	  (save-window-excursion
 	    (set-buffer full-buf)
 	    (erase-buffer)
-	    (binary-insert-file-contents file)
+	    (binary-insert-encoded-file file)
 	    (setq major-mode 'mime-show-message-mode)
 	    (mime-view-buffer (current-buffer) nil mother)
 	    (setq pbuf (current-buffer))
@@ -390,11 +390,12 @@ It is registered to variable `mime-preview-quitting-method-alist'."
 		    (setq file (concat root-dir "/" (int-to-string i)))
 		    (or (file-exists-p file)
 			(throw 'tag nil))
-		    (binary-insert-file-contents file)
+		    (binary-insert-encoded-file file)
 		    (goto-char (point-max))
 		    (setq i (1+ i))))
-		(binary-write-region (point-min)(point-max)
-				     (expand-file-name "FULL" root-dir))
+		(binary-write-decoded-region
+		 (point-min)(point-max)
+		 (expand-file-name "FULL" root-dir))
 		(let ((i 1))
 		  (while (<= i total)
 		    (let ((file (format "%s/%d" root-dir i)))
diff --git a/mime-view.el b/mime-view.el
index eb8417a..6af7784 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -358,13 +358,15 @@ mother-buffer."
 	  (insert "\n;;; "
 		  (file-name-nondirectory file)
 		  " ends here.\n")
-	  (static-cond
-	   ((boundp 'buffer-file-coding-system)
-	    (setq buffer-file-coding-system
-		  mime-situation-examples-file-coding-system))
-	   ((boundp 'file-coding-system)
-	    (setq file-coding-system
-		  mime-situation-examples-file-coding-system)))
+	  (setq buffer-file-coding-system
+		mime-situation-examples-file-coding-system)
+          ;; (static-cond
+          ;;  ((boundp 'buffer-file-coding-system)
+          ;;   (setq buffer-file-coding-system
+          ;;         mime-situation-examples-file-coding-system))
+          ;;  ((boundp 'file-coding-system)
+          ;;   (setq file-coding-system
+          ;;         mime-situation-examples-file-coding-system)))
 	  (setq buffer-file-name file)
 	  (save-buffer)))))
 
@@ -1101,14 +1103,17 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
     (define-key mime-view-mode-map
       [backspace] (function mime-preview-scroll-down-entity))
     (if (functionp default)
-	(static-if (featurep 'xemacs)
+	(if (featurep 'xemacs)
 	    (set-keymap-default-binding mime-view-mode-map default)
 	  (setq mime-view-mode-map
 		(append mime-view-mode-map (list (cons t default))))))
     (define-key mime-view-mode-map
       [down-mouse-3] (function mime-view-popup-menu))
-    (use-local-map mime-view-mode-map)
-    (run-hooks 'mime-view-define-keymap-hook)))
+    ;; (run-hooks 'mime-view-define-keymap-hook)
+    mime-view-mode-map))
+
+(defvar mime-view-mode-default-map (mime-view-define-keymap))
+
 
 (defsubst mime-maybe-hide-echo-buffer ()
   "Clear mime-echo buffer and delete window for it."
@@ -1127,7 +1132,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
 ;;;###autoload
 (defun mime-display-message (message &optional preview-buffer
 				     mother default-keymap-or-function
-				     original-major-mode)
+				     original-major-mode keymap)
   "View MESSAGE in MIME-View mode.
 
 Optional argument PREVIEW-BUFFER specifies the buffer of the
@@ -1138,7 +1143,14 @@ Optional argument MOTHER specifies mother-buffer of the preview-buffer.
 Optional argument DEFAULT-KEYMAP-OR-FUNCTION is nil, keymap or
 function.  If it is a keymap, keymap of MIME-View mode will be added
 to it.  If it is a function, it will be bound as default binding of
-keymap of MIME-View mode."
+keymap of MIME-View mode.
+
+Optional argument ORIGINAL-MAJOR-MODE is major-mode of representation
+buffer of MESSAGE.  If it is nil, current `major-mode' is used.
+
+Optional argument KEYMAP is keymap of MIME-View mode.  If it is
+non-nil, DEFAULT-KEYMAP-OR-FUNCTION is ignored.  If it is nil,
+`mime-view-mode-default-map' is used."
   (mime-maybe-hide-echo-buffer)
   (let ((win-conf (current-window-configuration)))
     (or preview-buffer
@@ -1160,7 +1172,11 @@ keymap of MIME-View mode."
 			     (header . visible)
 			     (major-mode . ,original-major-mode))
 			   preview-buffer)
-      (mime-view-define-keymap default-keymap-or-function)
+      (use-local-map
+       (or keymap
+	   (if default-keymap-or-function
+	       (mime-view-define-keymap default-keymap-or-function)
+	     mime-view-mode-default-map)))
       (let ((point
 	     (next-single-property-change (point-min) 'mime-view-entity)))
 	(if point
diff --git a/pgg-gpg.el b/pgg-gpg.el
index 926140e..873cff4 100644
--- a/pgg-gpg.el
+++ b/pgg-gpg.el
@@ -25,6 +25,7 @@
 
 ;;; Code:
 
+(require 'mel) ; binary-to-text-funcall
 (eval-when-compile (require 'pgg))
 
 (defgroup pgg-gpg ()
diff --git a/pgg-pgp.el b/pgg-pgp.el
index c37ebaf..a09e60c 100644
--- a/pgg-pgp.el
+++ b/pgg-pgp.el
@@ -25,6 +25,7 @@
 
 ;;; Code:
 
+(require 'mel) ; binary-to-text-funcall, binary-write-decoded-region
 (eval-when-compile (require 'pgg))
 
 (defgroup pgg-pgp ()
@@ -89,9 +90,8 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
     (unwind-protect
 	(progn
 	  (setq process
-		(apply #'binary-start-process-shell-command "*PGP*"
-		       output-buffer
-		       program args))
+		(apply #'binary-funcall #'start-process-shell-command
+		       "*PGP*" output-buffer program args))
 	  (set-process-sentinel process #'ignore)
 	  (when passphrase
 	    (process-send-string process (concat passphrase "\n")))
@@ -198,7 +198,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
     (unwind-protect
 	(progn
 	  (set-default-file-modes 448)
-	  (binary-write-region start end orig-file))
+	  (binary-write-decoded-region start end orig-file))
       (set-default-file-modes orig-mode))
     (when (stringp signature)
       (copy-file signature (setq signature (concat orig-file ".asc")))
diff --git a/pgg-pgp5.el b/pgg-pgp5.el
index e8dedef..cdc0029 100644
--- a/pgg-pgp5.el
+++ b/pgg-pgp5.el
@@ -25,6 +25,7 @@
 
 ;;; Code:
 
+(require 'mel) ; binary-to-text-funcall, binary-write-decoded-region
 (eval-when-compile (require 'pgg))
 
 (defgroup pgg-pgp5 ()
@@ -104,9 +105,8 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
     (unwind-protect
 	(progn
 	  (setq process
-		(apply #'binary-start-process-shell-command "*PGP*"
-		       output-buffer
-		       program args))
+		(apply #'binary-funcall #'start-process-shell-command
+		       "*PGP*" output-buffer program args))
 	  (set-process-sentinel process #'ignore)
 	  (when passphrase
 	    (process-send-string process (concat passphrase "\n")))
@@ -210,7 +210,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
     (unwind-protect
 	(progn
 	  (set-default-file-modes 448)
-	  (binary-write-region start end orig-file))
+	  (binary-write-decoded-region start end orig-file))
       (set-default-file-modes orig-mode))
     (when (stringp signature)
       (copy-file signature (setq signature (concat orig-file ".asc")))
diff --git a/smime.el b/smime.el
index f4195dd..d0c6471 100644
--- a/smime.el
+++ b/smime.el
@@ -39,7 +39,8 @@
 ;;; Code:
 
 (require 'path-util)
-(require 'raw-io)
+(require 'mel)
+;; binary-funcall, binary-write-decoded-region, binary-insert-encoded-file
 (eval-when-compile (require 'static))
 
 (defgroup smime ()
@@ -204,8 +205,9 @@
       (buffer-disable-undo)
       (erase-buffer))
     (setq process
-	  (apply #'binary-start-process-shell-command "*S/MIME*"
-		 smime-output-buffer program args))
+	  (apply #'binary-funcall #'start-process-shell-command
+		 "*S/MIME*" smime-output-buffer
+		 program args))
     (set-process-sentinel process 'ignore)
     (process-send-region process start end)
     (process-send-eof process)
@@ -301,12 +303,12 @@ the detached signature of the current region."
     (unwind-protect
 	(progn
 	  (set-default-file-modes 448)
-	  (binary-write-region start end orig-file))
+	  (binary-write-decoded-region start end orig-file))
       (set-default-file-modes orig-mode))
     (with-temp-buffer
-      (binary-insert-file-contents signature)
+      (binary-insert-encoded-file signature)
       (goto-char (point-max))
-      (binary-insert-file-contents
+      (binary-insert-encoded-file
        (or (smime-find-certificate 
 	    (smime-query-signer (point-min)(point-max)))
 	   (expand-file-name