* Sync up with the latest semi-1_13.

diff --git a/ChangeLog b/ChangeLog
index 9b4c546..df4beae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-01-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-w3.el (mime-preview-text/html): Display err if error occurs
+       in `w3-region'.
+
+       * mime-w3.el (mime-preview-text/html): Guard from error of
+       `w3-region'.
+
+\f
 1999-01-24  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * WEMI: Version 1.13.1 (Abekawa) released.

diff --git a/VERSION b/VERSION
index caacd72..54312ec 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -75,7 +75,7 @@
 1.12.1 [JR] Nonoichi           [JR] \e$(BLn!9;T\e(B
 1.13.0 Matt\e-Dò\e-A                     \e$(B>>G$\e(B
 1.13.1 Kaga-Kasama             \e$(B2C2l3^4V\e(B
------- Mikawa                  \e$(BH~@n\e(B
+1.13.2 Mikawa                  \e$(BH~@n\e(B
 ------ Komaiko                 \e$(B>.Iq;R\e(B
 ------ Terai                   \e$(B;{0f\e(B
 ------ Meih\e-Dò\e-A                     \e$(BL@Jv\e(B
@@ -143,7 +143,7 @@
 1.12.1 Kusanagi                \e$(BApFe\e(B
 1.13.0 Shizuoka                \e$(B@E2,\e(B
 1.13.1 Abekawa                 \e$(B0BG\@n\e(B
------- Mochimune               \e$(BMQ=!\e(B
+1.13.2 Mochimune               \e$(BMQ=!\e(B
 ------ Yaizu                   \e$(B>FDE\e(B
 ------ Nishi-Yaizu             \e$(B@>>FDE\e(B
 ------ Fijieda                 \e$(BF#;^\e(B
@@ -152,6 +152,19 @@
 ------ 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
+------ Iwata                   \e$(BHXED\e(B
+------ Toyodach\e-Dò\e-A         \e$(BK-EDD.\e(B
+------ Tenry\e-Dþgawa\e-A                \e$(BE7N5@n\e(B
+------ Hamamatsu               \e$(BIM>>\e(B     ; = \e$(B1s=#E4F;\e(B
+------ Takatsuka               \e$(B9bDM\e(B
+------ Maisaka                 \e$(BIq:e\e(B
+------ Bentenjima              \e$(BJ[E7Eg\e(B
+------ Araimachi               \e$(B?75oD.\e(B
+------ Wasizu                  \e$(BOIDE\e(B
+------ Shinjohara              \e$(B?7=j86\e(B   ; = \e$(BE7N5IML>8PE4F;\e(B
+------ Futagawa                \e$(BFs2O\e(B
+------ Toyohashi               \e$(BK-66\e(B     ; = JR \e$(BHSED@~\e(B
 :      :                       :
 ------ Kanayama                \e$(B6b;3\e(B     ; =\e$(B!J\e(BJR \e$(BCf1{K\@~!K\e(B
 ------ Ot\e-Dòbashi\e-A          \e$(BHxF,66\e(B

diff --git a/mime-w3.el b/mime-w3.el
index be90783..6ce9927 100644 (file)
--- a/mime-w3.el
+++ b/mime-w3.el
@@ -58,7 +58,9 @@
        (narrow-to-region p p)
        (mime-insert-text-content entity)
        (run-hooks 'mime-text-decode-hook)
-       (w3-region p (point-max))
+       (condition-case err
+          (w3-region p (point-max))
+        (error (message (format "%s" err))))
        (mime-put-keymap-region p (point-max) w3-mode-map)
        ))))
 

diff --git a/semi-def.el b/semi-def.el
index d59876e..92e1364 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -30,7 +30,7 @@
 
 (require 'custom)
 
-(defconst mime-user-interface-product ["WEMI" (1 13 1) "Abekawa"]
+(defconst mime-user-interface-product ["WEMI" (1 13 2) "Mochimune"]
   "Implementation name, version name and numbers of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"