Sync up with Pterodactyl Gnus v0.48.

diff --git a/ChangeLog b/ChangeLog
index 98e7746..8d20b31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 1998-11-16  Katsumi Yamaoka   <yamaoka@jpl.org>
 
+       * lisp/gnus.el (gnus-version-number): Update to 6.10.033.
+
+       * Sync up with Pterodactyl Gnus 0.48.
+
+1998-11-16  Katsumi Yamaoka   <yamaoka@jpl.org>
+
        * texi/emacs-mime.texi: Fix iso-8859-1 chars.
 
        * lisp/message.el (message-send-news): Call
@@ -27,7 +33,8 @@
 
 1998-11-14  Tatsuya Ichikawa  <t-ichi@po.shiojiri.ne.jp>
 
-       * lisp/message.el: Forget bind "\C-c\C-a" 'message-insert-mime-part
+       * lisp/message.el: Restore the forgotten function
+       `message-insert-mime-part' from the original source.
 
        * lisp/gnus.el (gnus-version-number): Update to 6.10.030.
 

diff --git a/README.ichikawa b/README.ichikawa
index b0d0846..ce26309 100644 (file)
--- a/README.ichikawa
+++ b/README.ichikawa
@@ -31,4 +31,4 @@ NEWS:
 * T-gnus 6.8.19 is the last version Gnus 5.6 base.
   After this , T-gnus 6.10 - this is based on Pterodactyl Gnus.
 
-  The latest T-gnus is T-gnus 6.10.032 (Based on pgnus-0.47).
+  The latest T-gnus is T-gnus 6.10.033 (Based on pgnus-0.48).

diff --git a/README.semi b/README.semi
index edaf251..d080a59 100644 (file)
--- a/README.semi
+++ b/README.semi
@@ -15,7 +15,7 @@ Required environment for SEMI is written in README.en of SEMI package.
   T-gnus major change has been done. It won't work with the old versions
 of SEMI packages, e.g. FLIM 1.10.5, SEMI 1.9.1, etc. If you have that one,
 please update your environment before installing it. The recommended
-versions of SEMI packages are APEL 9.9, FLIM 1.11.3 and SEMI 1.10.2 or
+versions of SEMI packages are APEL 9.10, FLIM 1.11.3 and SEMI 1.10.2 or
 newer than them.
 
 

diff --git a/README.semi.ja b/README.semi.ja
index 180a111..e833856 100644 (file)
--- a/README.semi.ja
+++ b/README.semi.ja
@@ -16,7 +16,7 @@ ftp://ftp.jaist.ac.jp/pub/elisp/semi/ \e$B$+$i<hF@$9$k$3$H$,$G$-$^$9!#I,MW\e(B
   T-gnus \e$B$G$OBg$-$JJQ99$,9T$J$o$l$^$7$?!#$3$l$O8E$$\e(B SEMI \e$B%Q%C%1!<%8!"\e(B
 \e$BNc$($P\e(B FLIM 1.10.5, SEMI 1.9.1 \e$B$G$OF0:n$7$^$;$s!#$b$7$=$l$i$r$*;H$$$J\e(B
 \e$B$i$P!"\e(BT-gnus \e$B$r%$%s%9%H!<%k$9$kA0$K?7$7$$$b$N$HF~$lBX$($F2<$5$$!#\e(B
-\e$B?d>)$5$l$k$N$O\e(B APEL 9.9, FLIM 1.11.3 \e$B$*$h$S\e(B SEMI 1.10.2 \e$B$^$?$O$=$l$i$h\e(B
+\e$B?d>)$5$l$k$N$O\e(B APEL 9.10, FLIM 1.11.3 \e$B$*$h$S\e(B SEMI 1.10.2 \e$B$^$?$O$=$l$i$h\e(B
 \e$B$j?7$7$$$b$N$G$9!#\e(B
 
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3075085..8cfa5c2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+Mon Nov 16 02:00:05 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+       * gnus.el: Pterodactyl Gnus v0.48 is released.
+
+1998-11-15 23:18:56  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-bodies.el (mm-encode-body): Disbabled for nonmule.
+
+       * mm-util.el (mm-find-charset-region): Bogus change for non-Mule.
+
+       * message.el (message-cite-original-without-signature): Ditto. 
+       (message-cite-original): Quote parts.
+
 Sun Nov 15 22:01:55 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Pterodactyl Gnus v0.47 is released.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 7e875c7..6161cf8 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -259,10 +259,10 @@ is restarted, and sometimes reloaded."
 (defconst gnus-product-name "T-gnus"
   "Product name of this version of gnus.")
 
-(defconst gnus-version-number "6.10.032"
+(defconst gnus-version-number "6.10.033"
   "Version number for this version of gnus.")
 
-(defconst gnus-original-version-number "0.47"
+(defconst gnus-original-version-number "0.48"
     "Version number for this version of Gnus.")
 
 (defconst gnus-original-product-name "Pterodactyl Gnus"

diff --git a/lisp/message.el b/lisp/message.el
index 4a8f10c..ba4ada5 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1444,7 +1444,6 @@ Point is left at the beginning of the narrowed-to region."
 
   (define-key message-mode-map "\t" 'message-tab)
 
-  (define-key message-mode-map "\C-c\C-a" 'message-insert-mime-part)
   (define-key message-mode-map "\C-x\C-s" 'message-save-drafts)
   (define-key message-mode-map "\C-xk" 'message-kill-buffer))
 
@@ -2000,6 +1999,11 @@ prefix, and don't delete any headers."
           (if (listp message-indent-citation-function)
               message-indent-citation-function
             (list message-indent-citation-function)))))
+    (goto-char start)
+    ;; Quote parts.
+    (while (re-search-forward "<#/?!*\\(multi\\|part\\)>" end t)
+      (goto-char (match-beginning 1))
+      (insert "!"))
     (goto-char end)
     (when (re-search-backward "^-- $" start t)
       ;; Also peel off any blank lines before the signature.
@@ -2023,12 +2027,18 @@ prefix, and don't delete any headers."
           mail-citation-hook)
       (run-hooks 'mail-citation-hook)
     (let ((start (point))
+         (end (mark t))
          (functions
           (when message-indent-citation-function
             (if (listp message-indent-citation-function)
                 message-indent-citation-function
               (list message-indent-citation-function)))))
       (goto-char start)
+      ;; Quote parts.
+      (while (re-search-forward "<#/?!*\\(multi\\|part\\)>" end t)
+       (goto-char (match-beginning 1))
+       (insert "!"))
+      (goto-char start)
       (while functions
        (funcall (pop functions)))
       (when message-citation-line-function

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index d4e05f0..78bf4c5 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -40,46 +40,49 @@ If there is more than one non-ASCII MULE charset, then list of found
 MULE charsets are returned.
 If successful, the MIME charset is returned.
 If no encoding was done, nil is returned."
-  (save-excursion
-    (goto-char (point-min))
-    (let ((charsets
-          (delq 'ascii (mm-find-charset-region (point-min) (point-max))))
-         charset)
-      (cond
-       ;; No encoding.
-       ((null charsets)
-       nil)
-       ;; Too many charsets.
-       ((> (length charsets) 1)
-       charsets)
-       ;; We encode.
-       (t
-       (let ((mime-charset 
-              (mm-mime-charset (car charsets) (point-min) (point-max)))
-             start)
-         (when (or t
-                   ;; We always decode.
-                   (not (mm-coding-system-equal
-                         mime-charset buffer-file-coding-system)))
-           (while (not (eobp))
-             (if (eq (char-charset (char-after)) 'ascii)
-                 (when start
-                   (save-restriction
-                     (narrow-to-region start (point))
-                     (mm-encode-coding-region start (point) mime-charset)
-                     (goto-char (point-max)))
-                   (setq start nil))
-               (unless start
-                 (setq start (point))))
-             (forward-char 1))
-           (when start
-             (mm-encode-coding-region start (point) mime-charset)
-             (setq start nil)))
-         mime-charset))))))
+  (if (not (featurep 'mule))
+      'iso-8859-1
+    (save-excursion
+      (goto-char (point-min))
+      (let ((charsets
+            (delq 'ascii (mm-find-charset-region (point-min) (point-max))))
+           charset)
+       (cond
+        ;; No encoding.
+        ((null charsets)
+         nil)
+        ;; Too many charsets.
+        ((> (length charsets) 1)
+         charsets)
+        ;; We encode.
+        (t
+         (let ((mime-charset 
+                (mm-mime-charset (car charsets) (point-min) (point-max)))
+               start)
+           (when (or t
+                     ;; We always decode.
+                     (not (mm-coding-system-equal
+                           mime-charset buffer-file-coding-system)))
+             (while (not (eobp))
+               (if (eq (char-charset (char-after)) 'ascii)
+                   (when start
+                     (save-restriction
+                       (narrow-to-region start (point))
+                       (mm-encode-coding-region start (point) mime-charset)
+                       (goto-char (point-max)))
+                     (setq start nil))
+                 (unless start
+                   (setq start (point))))
+               (forward-char 1))
+             (when start
+               (mm-encode-coding-region start (point) mime-charset)
+               (setq start nil)))
+           mime-charset)))))))
 
 (defun mm-body-encoding ()
   "Return the encoding of the current buffer."
-  (if (and  
+  (if (and
+       (featurep 'mule)
        (null (delq 'ascii (find-charset-region (point-min) (point-max))))
        ;;;!!!The following is necessary because the function
        ;;;!!!above seems to return the wrong result under Emacs 20.3.

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index e0d8920..2cd6003 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -224,9 +224,21 @@ See also `with-temp-file' and `with-output-to-string'."
 
 (defun mm-find-charset-region (b e)
   "Return a list of charsets in the region."
-  (if (and (boundp 'enable-multibyte-characters)
-          enable-multibyte-characters)
-      (find-charset-region b e)
+  (cond
+   ((and (boundp 'enable-multibyte-characters)
+        enable-multibyte-characters)
+    (find-charset-region b e))
+   ((not (boundp 'current-language-environment))
+    (save-excursion
+      (save-restriction
+       (narrow-to-region b e)
+       (goto-char (point-min))
+       (skip-chars-forward "\0-\177")
+       (if (eobp)
+           '(ascii)
+         ;;;!!!bogus
+         (list 'ascii 'latin-iso8859-1)))))
+   (t
     ;; We are in a unibyte buffer, so we futz around a bit.
     (save-excursion
       (save-restriction
@@ -237,7 +249,7 @@ See also `with-temp-file' and `with-output-to-string'."
          (skip-chars-forward "\0-\177")
          (if (eobp)
              '(ascii)
-           (list 'ascii (car (last (assq 'charset entry))))))))))
+           (list 'ascii (car (last (assq 'charset entry)))))))))))
 
 (provide 'mm-util)
 

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 6f9911b..a69081c 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus-ja
-@settitle Semi-gnus 6.10.032 Manual
+@settitle Semi-gnus 6.10.033 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -345,7 +345,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Semi-gnus 6.10.032 Manual
+@title Semi-gnus 6.10.033 Manual
 
 @author by Lars Magne Ingebrigtsen
 @author by members of Semi-gnus mailing-list
@@ -399,7 +399,7 @@ Semi-gnus \e$B$O!"Bg$-$J3($,F~$C$F$$$?$j$5$^$6$^$J7A<0$rMQ$$$?$j$7$F$$$k$A$g$C\e(B
 \e$B$J8@8l7w$r:9JL$7$^$;$s!#$"$"!"%/%j%s%4%s$NJ}$O\e(B Unicode Next Generation\e$B$r\e(B
 \e$B$*BT$A$/$@$5$$!#\e(B
 
-\e$B$3$N@bL@=q$O\e(B Semi-gnus 6.10.032 \e$B$KBP1~$7$^$9!#\e(B
+\e$B$3$N@bL@=q$O\e(B Semi-gnus 6.10.033 \e$B$KBP1~$7$^$9!#\e(B
 
 @end ifinfo
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 561ee24..9483f7f 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus
-@settitle Semi-gnus 6.10.032 Manual
+@settitle Semi-gnus 6.10.033 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -318,7 +318,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Semi-gnus 6.10.032 Manual
+@title Semi-gnus 6.10.033 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -361,7 +361,7 @@ internationalization/localization and multiscript features based on MULE
 API.  So Semi-gnus does not discriminate various language communities.
 Oh, if you are a Klingon, please wait Unicode Next Generation.
 
-This manual corresponds to Semi-gnus 6.10.032.
+This manual corresponds to Semi-gnus 6.10.033.
 
 @end ifinfo
 

diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index dcb57b7..b3dbc97 100644 (file)
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename message-ja
-@settitle Message 6.10.032 Manual
+@settitle Message 6.10.033 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -60,7 +60,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Message 6.10.032 Manual
+@title Message 6.10.033 Manual
 
 @author by Lars Magne Ingebrigtsen
 @translated by members of Semi-gnus mailing-list
@@ -112,7 +112,7 @@ Gnus \e$B$NA4$F$N%a%C%;!<%8$N:n@.\e(B (\e$B%a!<%k$H%K%e!<%9$NN>J}\e(B) \e$B$O%a%C%;!<
 * Key Index::         \e$B%a%C%;!<%8%b!<%I%-!<$N0lMw!#\e(B
 @end menu
 
-\e$B$3$N%^%K%e%"%k$O\e(B Message 6.10.032 \e$B$KBP1~$7$^$9!#\e(BMessage \e$B$O$3$N%^%K%e%"%k$H\e(B
+\e$B$3$N%^%K%e%"%k$O\e(B Message 6.10.033 \e$B$KBP1~$7$^$9!#\e(BMessage \e$B$O$3$N%^%K%e%"%k$H\e(B
 \e$BF1$8HGHV9f$N\e(B Gnus \e$B$NG[I[$H6&$KG[I[$5$l$^$9!#\e(B
 
 

diff --git a/texi/message.texi b/texi/message.texi
index 7939ace..badb908 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename message
-@settitle Message 6.10.032 Manual
+@settitle Message 6.10.033 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -42,7 +42,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Message 6.10.032 Manual
+@title Message 6.10.033 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -83,7 +83,7 @@ Message mode buffers.
 * Key Index::         List of Message mode keys.
 @end menu
 
-This manual corresponds to Message 6.10.032.  Message is
+This manual corresponds to Message 6.10.033.  Message is
 distributed with the Gnus distribution bearing the same version number
 as this manual.