Merge semi-1_12_1.

diff --git a/ChangeLog b/ChangeLog
index 8efe4d5..d9b2a51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,43 @@
-1998-11-17  Kazuhiro Ohta  <ohta@ele.cst.nihon-u.ac.jp>
+1999-01-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * SEMI: Version 1.12.1 ([JR] Nonoichi) released.
+
+       * mime-play.el (mime-detect-content): Use `mime-entity-content'
+       not to refer to buffer directly.
+
+1999-01-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-view.el: Must require `emu'.
+
+1999-01-04  OKUNISHI Fujikazu <fuji0924@mbox.kyoto-inet.or.jp>
+
+       * mime-view.el (mime-view-insert-entity-button): Use URL if it
+       exists in Content-Type field.
+
+       * mime-play.el (mime-raw-browse-url-function): Default to
+       `mime-browse-url-function' instead of `mime-browse-url'.
+
+1998-12-24  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * mime-view.el (mime-preview-move-to-next): Don't move forward at
+       the end of buffer.
+
+1998-12-03  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * mime-edit.el (mime-edit-user-agent-value): Include
+       `xemacs-betaname'.
+
+\f
+1998-12-02  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * SEMI: Version 1.12.0 (Nishi-Kanazawa) released.
+
+1998-11-30  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (eliminate-top-spaces): New function (moved from
+       mime-def.el of FLIM).
+
+1998-11-17  Kazuhiro Ohta     <ohta@ele.cst.nihon-u.ac.jp>
 
        * mime-partial.el
        (mime-combine-message/partial-pieces-automatically): Fix

diff --git a/Makefile b/Makefile
index 2baacbf..0b459b5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@
 #
 
 PACKAGE = semi
-VERSION = 1.11.0
+API    = 1.12
+RELEASE = 1
 
 TAR    = tar
 RM     = /bin/rm -f
@@ -21,6 +22,9 @@ VERSION_SPECIFIC_LISPDIR = NONE
 
 GOMI   = *.elc
 
+VERSION        = $(API).$(RELEASE)
+ARC_DIR = /pub/GNU/elisp/semi/semi-$(API)-for-flim-1.12
+
 
 elc:
        $(EMACS) $(FLAGS) -f compile-semi \
@@ -48,15 +52,18 @@ clean:
 
 tar:
        cvs commit
-       sh -c 'cvs tag -RF $(PACKAGE)-`echo $(VERSION) \
-                               | sed s/\\\\./_/ | sed s/\\\\./_/`; \
+       sh -c 'cvs tag -RF $(PACKAGE)-`echo $(VERSION) | tr . _`; \
        cd /tmp; \
        cvs -d :pserver:anonymous@chamonix.jaist.ac.jp:/hare/cvs/root \
                export -d $(PACKAGE)-$(VERSION) \
-               -r $(PACKAGE)-`echo $(VERSION) \
-                       | sed s/\\\\./_/ | sed s/\\\\./_/` semi'
+               -r $(PACKAGE)-`echo $(VERSION) | tr . _` \
+               semi'
        $(RM) /tmp/$(PACKAGE)-$(VERSION)/ftp.in
        cd /tmp; $(TAR) cvzf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
        cd /tmp; $(RM) -r $(PACKAGE)-$(VERSION)
-       sed "s/VERSION/$(VERSION)/" < ftp.in \
+       sed "s/VERSION/$(VERSION)/" < ftp.in | sed "s/API/$(API)/" \
                | sed "s/PACKAGE/$(PACKAGE)/" > ftp
+
+release:
+       -$(RM) $(ARC_DIR)/$(PACKAGE)-$(VERSION).tar.gz
+       mv /tmp/$(PACKAGE)-$(VERSION).tar.gz $(ARC_DIR)

diff --git a/VERSION b/VERSION
index 1d92e23..e103fee 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -71,8 +71,9 @@
 1.10.1 Morimoto                \e$(B?9K\\e(B
 1.10.2 Higashi-Kanazawa        \e$(BEl6bBt\e(B
 1.11.0 Kanazawa                \e$(B6bBt\e(B             ; <=> \e$(BKLN&E4F;\e(B \e$(BKLE46bBt\e(B
-1.11.1 Nishi-Kanazawa          \e$(B@>6bBt\e(B           ; <=> \e$(BKLN&E4F;\e(B \e$(B?7@>6bBt\e(B
--------        (JR) Nonoichi           \e$(BLn!9;T\e(B
+1.12.0 Nishi-Kanazawa          \e$(B@>6bBt\e(B           ; <=> \e$(BKLN&E4F;\e(B \e$(B?7@>6bBt\e(B
+1.12.1 [JR] Nonoichi           [JR] \e$(BLn!9;T\e(B
+------ Matt\e-Dò\e-A                     \e$(B>>G$\e(B
 :      :                       :
 -------        Tsuruga                 \e$(BFX2l\e(B             ; = JR \e$(B>.IM@~\e(B
 -------        Shin-Hikida             \e$(B?7I%ED\e(B
@@ -132,8 +133,8 @@
 1.10.1 Kambara                 \e$(B3w86\e(B
 1.10.2 Yui                     \e$(BM3Hf\e(B
 1.11.0 Okitsu                  \e$(B6=DE\e(B
-1.11.1 Shimizu                 \e$(B@6?e\e(B
------- Kusanagi                \e$(BApFe\e(B
+1.12.0 Shimizu                 \e$(B@6?e\e(B
+1.12.1 Kusanagi                \e$(BApFe\e(B
 ------ Shizuoka                \e$(B@E2,\e(B
 ------ Abekawa                 \e$(B0BG\@n\e(B
 ------ Mochimune               \e$(BMQ=!\e(B

diff --git a/ftp.in b/ftp.in
index 8408dbb..6c3ad02 100644 (file)
--- a/ftp.in
+++ b/ftp.in
@@ -2,12 +2,12 @@
 
   It is available from
 
-    ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/
+    ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-API-for-flim-1.12
 
 --[[message/external-body;
        access-type=anon-ftp;
        site="ftp.jaist.ac.jp";
-       directory="/pub/GNU/elisp/semi";
+       directory="/pub/GNU/elisp/semi/semi-API-for-flim-1.12";
        name="PACKAGE-VERSION.tar.gz";
        mode=image]]
 Content-Type: application/octet-stream;

diff --git a/mime-edit.el b/mime-edit.el
index 873c5bf..89b4655 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -633,6 +633,12 @@ If it is not specified for a major-mode,
                          (concat "/"
                                  (substring emacs-version 0
                                             (match-beginning 0))
+                                 (if (and (boundp 'xemacs-betaname)
+                                          ;; It does not exist in XEmacs
+                                          ;; versions prior to 20.3.
+                                          xemacs-betaname)
+                                     (concat " " xemacs-betaname)
+                                   "")
                                  " (" xemacs-codename ") ("
                                  system-configuration ")")
                        " (" emacs-version ")"))
@@ -2589,6 +2595,12 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
          "\\):")
   "Regexp for deleted header fields when `mime-edit-again' is called.")
 
+(defsubst eliminate-top-spaces (string)
+  "Eliminate top sequence of space or tab in STRING."
+  (if (string-match "^[ \t]+" string)
+      (substring string (match-end 0))
+    string))
+
 (defun mime-edit-decode-multipart-in-buffer (content-type not-decode-text)
   (let* ((subtype (mime-content-type-subtype content-type))
         (boundary (mime-content-type-parameter content-type "boundary"))

diff --git a/mime-play.el b/mime-play.el
index 11f904b..65949f3 100644 (file)
--- a/mime-play.el
+++ b/mime-play.el
@@ -1,6 +1,6 @@
 ;;; mime-play.el --- Playback processing module for mime-view.el
 
-;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998,1999 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1995/9/26 (separated from tm-view.el)
@@ -472,16 +472,7 @@ SUBTYPE is symbol to indicate subtype of media-type.")
 
 (defun mime-detect-content (entity situation)
   (let (type subtype)
-    (let ((mdata (save-excursion
-                  ;;(set-buffer (mime-entity-buffer entity))
-                  (let* ((start (mime-entity-body-start entity))
-                         (end (progn
-                                (goto-char start)
-                                (end-of-line)
-                                (point))))
-                    (mime-decode-string (buffer-substring start end)
-                                        (mime-entity-encoding entity))
-                    )))
+    (let ((mdata (mime-entity-content entity))
          (rest mime-magic-type-alist))
       (while (not (let ((cell (car rest)))
                    (if cell
@@ -679,7 +670,7 @@ It is registered to variable `mime-preview-quitting-method-alist'."
     (search-forward name)
     ))
 
-(defvar mime-raw-browse-url-function (function mime-browse-url))
+(defvar mime-raw-browse-url-function mime-browse-url-function)
 
 (defun mime-view-message/external-url (entity cal)
   (let ((url (cdr (assoc "url" cal))))

diff --git a/mime-view.el b/mime-view.el
index c9a29ed..763b20e 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -1,6 +1,6 @@
 ;;; mime-view.el --- interactive MIME viewer for GNU Emacs
 
-;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1994/07/13
@@ -8,7 +8,7 @@
 ;;     Renamed: 1997/02/19 from tm-view.el
 ;; Keywords: MIME, multimedia, mail, news
 
-;; This file is part of SEMI (Sophisticated Emacs MIME Interfaces).
+;; This file is part of SEMI (Sample of Elastic MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(require 'emu)
 (require 'mime)
 (require 'semi-def)
 (require 'calist)
@@ -256,9 +257,13 @@ Please redefine this function if you want to change default setting."
                            num subject access-type (cdr server))
                (let ((site (cdr (assoc "site" params)))
                      (dir (cdr (assoc "directory" params)))
+                     (url (cdr (assoc "url" params)))
                      )
-                 (format "%s %s ([%s] %s:%s)"
-                         num subject access-type site dir)
+                 (if url
+                     (format "%s %s ([%s] %s)"
+                             num subject access-type url)
+                   (format "%s %s ([%s] %s:%s)"
+                           num subject access-type site dir))
                  )))
            )
           (t
@@ -1213,7 +1218,8 @@ variable `mime-preview-over-to-previous-method-alist'."
 If there is no previous entity, it calls function registered in
 variable `mime-preview-over-to-next-method-alist'."
   (interactive)
-  (while (null (get-text-property (point) 'mime-view-entity))
+  (while (and (not (eobp))
+             (null (get-text-property (point) 'mime-view-entity)))
     (forward-char)
     )
   (let ((point (next-single-property-change (point) 'mime-view-entity)))

diff --git a/semi-def.el b/semi-def.el
index a443d71..12311dd 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -30,7 +30,7 @@
 
 (require 'custom)
 
-(defconst mime-user-interface-product ["SEMI" (1 11 1) "Nishi-Kanazawa"]
+(defconst mime-user-interface-product ["SEMI" (1 12 1) "[JR] Nonoichi"]
   "Product name, version number and code name of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"