Sync with semi-1_14_0-pre5.

diff --git a/mime/mime-play.el b/mime/mime-play.el
index 1b1b869..edd46d5 100644 (file)
--- a/mime/mime-play.el
+++ b/mime/mime-play.el
@@ -369,7 +369,7 @@ It is registered to variable `mime-preview-quitting-method-alist'."
          (save-window-excursion
            (set-buffer full-buf)
            (erase-buffer)
-           (insert-file-contents-as-binary file)
+           (binary-insert-file-contents file)
            (setq major-mode 'mime-show-message-mode)
            (mime-view-buffer (current-buffer) nil mother)
            (setq pbuf (current-buffer))
@@ -420,12 +420,12 @@ It is registered to variable `mime-preview-quitting-method-alist'."
                    (or (file-exists-p file)
                        (throw 'tag nil)
                        )
-                   (as-binary-input-file (insert-file-contents file))
+                   (binary-insert-file-contents file)
                    (goto-char (point-max))
                    (setq i (1+ i))
                    ))
-               (write-region-as-binary (point-min)(point-max)
-                                       (expand-file-name "FULL" root-dir))
+               (binary-write-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/mime-view.el b/mime/mime-view.el
index 26836ac..10eb7a3 100644 (file)
--- a/mime/mime-view.el
+++ b/mime/mime-view.el
@@ -27,7 +27,6 @@
 
 ;;; Code:
 
-(require 'emu)
 (require 'mime)
 (require 'semi-def)
 (require 'calist)
@@ -1089,6 +1088,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
         (set-buffer (event-buffer event))
         (popup-menu 'mime-view-xemacs-popup-menu))
        (defvar mouse-button-2 'button2)
+       (defvar mouse-button-3 'button3)
        )
       (t
        (defvar mime-view-popup-menu 
@@ -1110,6 +1110,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
                 (commandp func)
                 (funcall func))))
        (defvar mouse-button-2 [mouse-2])
+       (defvar mouse-button-2 [mouse-3])
        ))
 
 (defun mime-view-define-keymap (&optional default)

diff --git a/mime/pgg-gpg.el b/mime/pgg-gpg.el
index 5ac69f6..dfd9ca7 100644 (file)
--- a/mime/pgg-gpg.el
+++ b/mime/pgg-gpg.el
@@ -74,9 +74,10 @@
     (unwind-protect
        (progn
          (set-default-file-modes 448)
-         (as-binary-output-file
-          (setq process
-                (apply #'start-process "*GnuPG*" errors-buffer program args)))
+         (let ((coding-system-for-write 'binary))
+           (setq process
+                 (apply #'start-process "*GnuPG*" errors-buffer
+                        program args)))
          (set-process-sentinel process #'ignore)
          (when passphrase
            (process-send-string process (concat passphrase "\n")))
@@ -91,7 +92,8 @@
            (buffer-disable-undo)
            (erase-buffer)
            (if (file-exists-p output-file-name)
-               (insert-file-contents-as-raw-text-CRLF output-file-name))
+               (let ((coding-system-for-read 'raw-text-dos))
+                 (insert-file-contents output-file-name)))
            (set-buffer errors-buffer)
            (if (memq status '(stop signal))
                (error "%s exited abnormally: '%s'" program exit-status))

diff --git a/mime/pgg-parse.el b/mime/pgg-parse.el
index 910b0ff..89003d9 100644 (file)
--- a/mime/pgg-parse.el
+++ b/mime/pgg-parse.el
@@ -39,9 +39,8 @@
 
 (eval-when-compile (require 'static))
 
-(require 'poem)
 (require 'pccl)
-(require 'pcustom)
+(require 'custom)
 (require 'mel)
 
 (defgroup pgg-parse ()

diff --git a/mime/pgg-pgp.el b/mime/pgg-pgp.el
index 4f3fbd7..33f2481 100644 (file)
--- a/mime/pgg-pgp.el
+++ b/mime/pgg-pgp.el
@@ -88,10 +88,11 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
       (setenv "PGPPASSFD" "0"))
     (unwind-protect
        (progn
-         (as-binary-process
-          (setq process
-                (apply #'start-process-shell-command "*PGP*" output-buffer
-                       program args)))
+         (let ((coding-system-for-read 'binary)
+               (coding-system-for-write 'binary))
+           (setq process
+                 (apply #'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 +199,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
     (unwind-protect
        (progn
          (set-default-file-modes 448)
-         (write-region-as-binary start end orig-file))
+         (binary-write-region start end orig-file))
       (set-default-file-modes orig-mode))
     (when (stringp signature)
       (copy-file signature (setq signature (concat orig-file ".asc")))
@@ -234,7 +235,8 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
         (args
          (list "+verbose=1" "+batchmode" "+language=us" "-kaf"
                key-file)))
-    (write-region-as-raw-text-CRLF start end key-file)
+    (let ((coding-system-for-write 'raw-text-dos))
+      (write-region start end key-file))
     (pgg-pgp-process-region start end nil pgg-pgp-program args)
     (delete-file key-file)
     (pgg-process-when-success nil)))

diff --git a/mime/pgg-pgp5.el b/mime/pgg-pgp5.el
index 83e8187..f4cfedc 100644 (file)
--- a/mime/pgg-pgp5.el
+++ b/mime/pgg-pgp5.el
@@ -103,10 +103,11 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
       (setenv "PGPPASSFD" "0"))
     (unwind-protect
        (progn
-         (as-binary-process
-          (setq process
-                (apply #'start-process-shell-command "*PGP*" output-buffer
-                       program args)))
+         (let ((coding-system-for-read 'binary)
+               (coding-system-for-write 'binary))
+           (setq process
+                 (apply #'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 +211,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
     (unwind-protect
        (progn
          (set-default-file-modes 448)
-         (write-region-as-binary start end orig-file))
+         (binary-write-region start end orig-file))
       (set-default-file-modes orig-mode))
     (when (stringp signature)
       (copy-file signature (setq signature (concat orig-file ".asc")))
@@ -243,7 +244,8 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
         (args
          (list "+verbose=1" "+batchmode=1" "+language=us" "-a"
                key-file)))
-    (write-region-as-raw-text-CRLF start end key-file)
+    (let ((coding-system-for-write 'raw-text-dos))
+      (write-region start end key-file))
     (pgg-pgp5-process-region start end nil pgg-pgp5-pgpk-program args)
     (delete-file key-file)
     (pgg-process-when-success nil)))

diff --git a/mime/semi-def.el b/mime/semi-def.el
index a9aed93..70e6934 100644 (file)
--- a/mime/semi-def.el
+++ b/mime/semi-def.el
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(require 'poe)
-
 (eval-when-compile (require 'cl))
 
 (require 'custom)

diff --git a/mime/smime.el b/mime/smime.el
index d01ee0d..afa46f8 100644 (file)
--- a/mime/smime.el
+++ b/mime/smime.el
@@ -202,10 +202,11 @@
     (with-current-buffer (get-buffer-create smime-output-buffer)
       (buffer-disable-undo)
       (erase-buffer))
-    (as-binary-process
-     (setq process
-          (apply #'start-process-shell-command "*S/MIME*"
-                 smime-output-buffer program args)))
+    (let ((coding-system-for-read 'binary)
+         (coding-system-for-write 'binary))
+      (setq process
+           (apply #'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 +302,12 @@ the detached signature of the current region."
     (unwind-protect
        (progn
          (set-default-file-modes 448)
-         (write-region-as-binary start end orig-file))
+         (binary-write-region start end orig-file))
       (set-default-file-modes orig-mode))
     (with-temp-buffer
-      (insert-file-contents-as-binary signature)
+      (binary-insert-file-contents signature)
       (goto-char (point-max))
-      (insert-file-contents-as-binary
+      (binary-insert-file-contents
        (or (smime-find-certificate 
            (smime-query-signer (point-min)(point-max)))
           (expand-file-name