Sync with semi21-1_14_0-pre4-2.

diff --git a/pgg-def.el b/pgg-def.el
index 1227996..f1c62ea 100644 (file)
--- a/pgg-def.el
+++ b/pgg-def.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(require 'pcustom)
+(require 'custom)
 
 (defgroup pgg ()
   "Glue for the various PGP implementations."

diff --git a/pgg-gpg.el b/pgg-gpg.el
index dfd9ca7..8080bd7 100644 (file)
--- a/pgg-gpg.el
+++ b/pgg-gpg.el
@@ -74,10 +74,9 @@
     (unwind-protect
        (progn
          (set-default-file-modes 448)
-         (let ((coding-system-for-write 'binary))
-           (setq process
-                 (apply #'start-process "*GnuPG*" errors-buffer
-                        program args)))
+         (setq process
+               (apply #'binary-start-process "*GnuPG*" errors-buffer
+                      program args))
          (set-process-sentinel process #'ignore)
          (when passphrase
            (process-send-string process (concat passphrase "\n")))

diff --git a/pgg-parse.el b/pgg-parse.el
index 89003d9..f3aec73 100644 (file)
--- a/pgg-parse.el
+++ b/pgg-parse.el
@@ -104,8 +104,11 @@
   "Armor headers.")
 
 (defmacro pgg-format-key-identifier (string)
-  `(upcase (apply #'format "%02x%02x%02x%02x%02x%02x%02x%02x"
-                 (string-to-int-list ,string))))
+  `(mapconcat (lambda (c) (format "%02X" (char-int c)))
+             ,string "")
+  ;; `(upcase (apply #'format "%02x%02x%02x%02x%02x%02x%02x%02x"
+  ;;                 (string-to-int-list ,string)))
+  )
 
 (defmacro pgg-parse-time-field (bytes)
   `(list (logior (lsh (car ,bytes) 8)
@@ -126,7 +129,9 @@
              (forward-char ,nbytes))))
 
 (defmacro pgg-read-bytes (nbytes)
-  `(string-to-int-list (pgg-read-bytes-string ,nbytes)))
+  `(mapcar #'char-int (pgg-read-bytes-string ,nbytes))
+  ;; `(string-to-int-list (pgg-read-bytes-string ,nbytes))
+  )
 
 (defmacro pgg-read-body-string (ptag)
   `(if (nth 1 ,ptag)
@@ -134,7 +139,9 @@
      (pgg-read-bytes-string (- (point-max) (point)))))
 
 (defmacro pgg-read-body (ptag)
-  `(string-to-int-list (pgg-read-body-string ,ptag)))
+  `(mapcar #'char-int (pgg-read-body-string ,ptag))
+  ;; `(string-to-int-list (pgg-read-body-string ,ptag))
+  )
 
 (defalias 'pgg-skip-bytes 'forward-char)
 

diff --git a/pgg-pgp.el b/pgg-pgp.el
index 33f2481..dadd5fe 100644 (file)
--- a/pgg-pgp.el
+++ b/pgg-pgp.el
@@ -88,11 +88,10 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
       (setenv "PGPPASSFD" "0"))
     (unwind-protect
        (progn
-         (let ((coding-system-for-read 'binary)
-               (coding-system-for-write 'binary))
-           (setq process
-                 (apply #'start-process-shell-command "*PGP*" output-buffer
-                        program args)))
+         (setq process
+               (apply #'binary-start-process-shell-command "*PGP*"
+                      output-buffer
+                      program args))
          (set-process-sentinel process #'ignore)
          (when passphrase
            (process-send-string process (concat passphrase "\n")))

diff --git a/pgg-pgp5.el b/pgg-pgp5.el
index f4cfedc..fa1b0ee 100644 (file)
--- a/pgg-pgp5.el
+++ b/pgg-pgp5.el
@@ -103,11 +103,10 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
       (setenv "PGPPASSFD" "0"))
     (unwind-protect
        (progn
-         (let ((coding-system-for-read 'binary)
-               (coding-system-for-write 'binary))
-           (setq process
-                 (apply #'start-process-shell-command "*PGP*" output-buffer
-                        program args)))
+         (setq process
+               (apply #'binary-start-process-shell-command "*PGP*"
+                      output-buffer
+                      program args))
          (set-process-sentinel process #'ignore)
          (when passphrase
            (process-send-string process (concat passphrase "\n")))

diff --git a/postpet.el b/postpet.el
index f8730bb..4284cf6 100644 (file)
--- a/postpet.el
+++ b/postpet.el
@@ -24,6 +24,7 @@
 
 ;;; Code:
 
+(require 'mime)
 (require 'alist)
 
 (put 'unpack 'lisp-indent-function 1)

diff --git a/smime.el b/smime.el
index afa46f8..a45d399 100644 (file)
--- a/smime.el
+++ b/smime.el
@@ -39,6 +39,7 @@
 ;;; Code:
 
 (require 'path-util)
+(require 'raw-io)
 (eval-when-compile (require 'static))
 
 (defgroup smime ()
@@ -202,11 +203,9 @@
     (with-current-buffer (get-buffer-create smime-output-buffer)
       (buffer-disable-undo)
       (erase-buffer))
-    (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)))
+    (setq process
+         (apply #'binary-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)