Synch with `semi-1_14_0'.
authorueno <ueno>
Thu, 21 Dec 2000 13:42:50 +0000 (13:42 +0000)
committerueno <ueno>
Thu, 21 Dec 2000 13:42:50 +0000 (13:42 +0000)
15 files changed:
ChangeLog
Makefile
VERSION
mime-edit.el
mime-play.el
mime-view.el
mime-w3.el
pgg-def.el
pgg-gpg.el
pgg-parse.el
pgg-pgp.el
pgg-pgp5.el
postpet.el
semi-def.el
smime.el

index 011e94e..1cfe3e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,99 @@
+2000-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * SEMI: Version 1.14.0 (Iburihashi) released.
+
+2000-12-19  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mime-edit.el (mime-edit-mime-version-field-for-message/partial):
+       Use `mime-encode-field-body' instead of `eword-encode-field-body'.
+
+2000-12-19  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mime-edit.el (mime-edit-translate-header): Use
+       `mime-encode-header-in-buffer' instead of `eword-encode-header'.
+       (mime-edit-encrypt-pgp-mime): Likewise.
+       (mime-edit-translate-single-part-tag): Likewise.
+
+2000-12-17  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * postpet.el: Require `mime'.
+
+       * pgg-parse.el (pgg-format-key-identifier): Don't use
+       `string-to-int-list'.
+       (pgg-read-bytes): Likewise.
+       (pgg-read-body): Likewise.
+
+2000-12-16  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * smime.el: Require `raw-io'.
+       (smime-process-region): Use `binary-start-process-shell-command'.
+
+       * pgg-pgp5.el (pgg-pgp5-process-region): Use
+       `binary-start-process-shell-command'.
+
+       * pgg-pgp.el (pgg-pgp-process-region): Use
+       `binary-start-process-shell-command'.
+
+       * pgg-gpg.el (pgg-gpg-process-region): Use `binary-start-process'.
+
+2000-12-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * pgg-def.el: Require `custom' instead of `pcustom'.
+
+2000-12-15  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * Makefile (tar): Use `cvs tag -R' instead of `cvs tag -RF'.
+
+2000-12-15  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * smime.el (smime-process-region): Don't use `as-binary-process'.
+       (smime-verify-region): Use `binary-write-region' instead of
+       `write-region-as-binary'; use `binary-insert-file-contents'
+       instead of `insert-file-contents-as-binary'.
+
+       * semi-def.el: Don't require `poe'.
+
+       * pgg-pgp5.el (pgg-pgp5-process-region): Don't use
+       `as-binary-process'.
+       (pgg-scheme-verify-region): Use `binary-write-region' instead of
+       `write-region-as-binary'.
+       (pgg-scheme-snarf-keys-region): Don't use
+       `write-region-as-raw-text-CRLF'.
+
+       * pgg-pgp.el (pgg-pgp-process-region): Don't use
+       `as-binary-process'.
+       (pgg-scheme-verify-region): Use `binary-write-region' instead of
+       `write-region-as-binary'.
+       (pgg-scheme-snarf-keys-region): Don't use
+       `write-region-as-raw-text-CRLF'.
+
+       * pgg-parse.el: Don't require `poem'; require `custom' instead of
+       `pcustom'.
+
+       * pgg-gpg.el (pgg-gpg-process-region): Don't use
+       `as-binary-output-file' and
+       `insert-file-contents-as-raw-text-CRLF'.
+
+       * mime-view.el: Don't require `emu'.
+       (mouse-button-3): New variable.
+
+       * mime-play.el (mime-store-message/partial-piece): Use
+       `binary-insert-file-contents' instead of
+       `insert-file-contents-as-binary'; don't use
+       `as-binary-input-file'; use `binary-write-region' instead of
+       `write-region-as-binary'.
+
+2000-12-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mime-w3.el: Avoid error even if `w3' is not found.
+
+2000-11-26  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mime-view.el: Use `mime-conf' instead of `mailcap'.
+
+       * mime-play.el (mime-activate-mailcap-method): Use
+       `mime-format-mailcap-command' instead of `mailcap-format-command'.
+
 2000-10-31   Daiki Ueno  <ueno@unixuser.org>
 
        * mime-edit.el: Don't require `invisible'.
        locally so that setenv's effect won't last forever.
        pgg-pgp5.el (pgg-pgp5-process-region): Ditto.
 
+2000-09-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * mime-edit.el (mime-file-types): Fix to use application/msword
+       instead of application/winword.
+
 2000-09-13   Daiki Ueno  <ueno@unixuser.org>
 
        * mime-play.el (mime-play-entity): Pass easymenu-style menu to
index 758331f..d0f7125 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@
 # Makefile for SEMI kernel.
 #
 
-PACKAGE = remi
+PACKAGE = semi
 API    = 1.14
-RELEASE = 2
+RELEASE = 0
 
 FLIM_API= 1.14
 
@@ -51,7 +51,7 @@ clean:
 
 tar:
        cvs commit
-       sh -c 'cvs tag -RF $(PACKAGE)-`echo $(VERSION) | tr . _`; \
+       sh -c 'cvs tag -R $(PACKAGE)-`echo $(VERSION) | tr . _`; \
        cd /tmp; \
        cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root \
                export -d $(PACKAGE)-$(VERSION) \
diff --git a/VERSION b/VERSION
index 7367163..8b8d6ef 100644 (file)
--- a/VERSION
+++ b/VERSION
 1.13.5 Meih\e-Dò\e-A                     \e$(BL@Jv\e(B
 1.13.6 Komatsu                 \e$(B>.>>\e(B
 1.13.7 Awazu                   \e$(B0@DE\e(B
+1.14.0 Iburihashi              \e$(BF066\e(B
+------ Kaga-Onsen              \e$(B2C2l29@t\e(B
+------ Daish\e-Dòji\e-A          \e$(BBg@;;{\e(B
+------ Ushinoya                \e$(B5m%NC+\e(B
+------ Hosorogi                \e$(B:YO$LZ\e(B
+------ Awara-Onsen             \e$(B028629@t\e(B
 :      :                       :
 -------        Tsuruga                 \e$(BFX2l\e(B             ; = JR \e$(B>.IM@~\e(B
 -------        Shin-Hikida             \e$(B?7I%ED\e(B
 1.13.5 Fijieda                 \e$(BF#;^\e(B
 1.13.6 Rokug\e-Dò\e-A                    \e$(BO;9g\e(B
 1.13.7 Shimada                 \e$(BEgED\e(B
------- Kanaya                  \e$(B6bC+\e(B     ; = \e$(BBg0f@nE4F;\e(B
+1.14.0 Kanaya                  \e$(B6bC+\e(B     ; = \e$(BBg0f@nE4F;\e(B
 ------ Kikugawa                \e$(B5F@n\e(B
 ------ Kakegawa                \e$(B3]@n\e(B     ; = \e$(BE7N5IML>8PE4F;\e(B
 ------ Fukuroi                 \e$(BB^0f\e(B
index d68f6e2..134c076 100644 (file)
 (require 'sendmail)
 (require 'mail-utils)
 (require 'mel)
-(require 'eword-encode) ; eword-encode-field-body
 (require 'mime-view)
 (require 'signature)
 (require 'alist)
@@ -305,7 +304,7 @@ To insert a signature file automatically, call the function
     ;;  Octect binary text
 
     ("\\.doc$"                         ;MS Word
-     "application" "winword" nil
+     "application" "msword" nil
      "base64"
      "attachment" (("filename" . file)))
     ("\\.ppt$"                         ; MS Power Point
@@ -669,7 +668,7 @@ Tspecials means any character that matches with it in header must be quoted.")
 
 (defconst mime-edit-mime-version-field-for-message/partial
   (concat "MIME-Version:"
-         (eword-encode-field-body
+         (mime-encode-field-body
           (concat " 1.0 (split by " mime-edit-version ")\n")
           "MIME-Version:"))
   "MIME version field for message/partial.")
@@ -1534,7 +1533,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 
 (defun mime-edit-translate-header ()
   "Encode the message header into network representation."
-  (eword-encode-header 'code-conversion)
+  (mime-encode-header-in-buffer 'code-conversion)
   (run-hooks 'mime-edit-translate-header-hook))
 
 (defun mime-edit-translate-buffer ()
@@ -1731,7 +1730,7 @@ Content-Transfer-Encoding: 7bit
           (if encoding
               (insert (format "Content-Transfer-Encoding: %s\n" encoding)))
           (insert "\n")
-         (eword-encode-header)
+         (mime-encode-header-in-buffer)
          (or (let ((pgg-default-user-id 
                     (or mime-edit-pgp-user-id
                         (if from 
@@ -1957,7 +1956,7 @@ Content-Description: S/MIME Encrypted Message][base64]]\n")
            (insert "Content-Type: " contype "\n")
            (if encoding
                (insert "Content-Transfer-Encoding: " encoding "\n"))
-           (eword-encode-header))
+           (mime-encode-header-in-buffer))
          (cons (and contype
                     (downcase contype))
                (and encoding
index 0f8288e..7341183 100644 (file)
@@ -140,7 +140,7 @@ specified, play as it.  Default MODE is \"play\"."
     (message "External method is starting...")
     (let ((process
           (let ((command
-                 (mailcap-format-command
+                 (mime-format-mailcap-command
                   method
                   (cons (cons 'filename name) situation))))
             (start-process command mime-echo-buffer-name
@@ -345,7 +345,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))
@@ -390,11 +390,11 @@ 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))
-                   (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)))
index a077ae1..0532ee8 100644 (file)
 
 ;;; Code:
 
-(require 'emu)
 (require 'mime)
 (require 'semi-def)
 (require 'calist)
 (require 'alist)
-(require 'mailcap)
+(require 'mime-conf)
 
 
 ;;; @ version
@@ -828,8 +827,8 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
 (defvar mime-acting-condition nil
   "Condition-tree about how to process entity.")
 
-(if (file-readable-p mailcap-file)
-    (let ((entries (mailcap-parse-file)))
+(if (file-readable-p mime-mailcap-file)
+    (let ((entries (mime-parse-mailcap-file)))
       (while entries
        (let ((entry (car entries))
              view print shared)
index 796342e..4d69c35 100644 (file)
@@ -24,7 +24,9 @@
 
 ;;; Code:
 
-(require 'w3)
+(condition-case nil
+    (require 'w3)
+  (error nil))
 (require 'mime)
 
 (defmacro mime-put-keymap-region (start end keymap)
index bae37bd..cb3fff8 100644 (file)
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(require 'pcustom)
+(require 'custom)
 
 (defgroup pgg ()
   "Glue for the various PGP implementations."
index bc1316a..0d5c833 100644 (file)
@@ -74,9 +74,9 @@
     (unwind-protect
        (progn
          (set-default-file-modes 448)
-         (as-binary-output-file
-          (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")))
@@ -91,7 +91,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))
index ecbdf65..48b702a 100644 (file)
@@ -39,9 +39,8 @@
 
 (eval-when-compile (require 'static))
 
-(require 'poem)
 (require 'pccl)
-(require 'pcustom)
+(require 'custom)
 (require 'mel)
 
 (defgroup pgg-parse ()
   "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)
              (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)
      (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)
 
index a888cc8..c37ebaf 100644 (file)
@@ -88,10 +88,10 @@ 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)))
+         (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")))
@@ -198,7 +198,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 +234,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)))
index 998c8a3..e8dedef 100644 (file)
@@ -103,10 +103,10 @@ 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)))
+         (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")))
@@ -210,7 +210,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 +243,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)))
index f8730bb..4284cf6 100644 (file)
@@ -24,6 +24,7 @@
 
 ;;; Code:
 
+(require 'mime)
 (require 'alist)
 
 (put 'unpack 'lisp-indent-function 1)
index f39d217..d702729 100644 (file)
@@ -24,8 +24,6 @@
 
 ;;; Code:
 
-(require 'poe)
-
 (eval-when-compile (require 'cl))
 
 (require 'custom)
index 3c4edbc..f4195dd 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 ()
     (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)))
+    (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)
@@ -301,12 +301,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