From c63de88ff94b0e52a4bab5d11e3266184eede5ff Mon Sep 17 00:00:00 2001 From: tomo Date: Wed, 25 Oct 2000 03:40:47 +0000 Subject: [PATCH] Merge flim-1_13_2_2. --- ChangeLog | 52 +++++++++++++++++++++++++++++++++++----------------- Makefile | 2 +- mel-b-el.el | 39 +++++++++++++++++++++++---------------- mime-en.sgml | 7 +++---- mime-ja.sgml | 7 +++---- smtp.el | 4 ++-- 6 files changed, 67 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34050af..d591c14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,10 +2,28 @@ * mime-en.sgml, mime-ja.sgml: Update for CVS via SSH. +2000-05-09 Katsumi Yamaoka + + * smtp.el (smtp-deduce-address-list): Set `case-fold-search' to `t' + in the working buffer. + +2000-01-05 Katsumi Yamaoka + + * Makefile, mime-en.sgml, mime-ja.sgml: Update for the new CVS + server. + +1999-12-20 Katsumi Yamaoka + + * mel-b-el.el (base64-encode-region): Allow the optional second arg + `no-line-break'. + (base64-external-encode-region): Likewise. + (base64-internal-encode-region): Likewise. + (base64-encode-string): Likewise. + 1999-12-13 Katsumi Yamaoka * README.en,README.ja,mime-en.sgml,mime-en.texi,mime-ja.sgml, - mime-ja.texi: Update fot the recent ML address and ftp site. + mime-ja.texi: Update for the recent ML address and ftp site. 1999-10-17 Yoshiki Hayashi @@ -424,7 +442,7 @@ 1999-05-31 MORIOKA Tomohiko - * FLIM: Version 1.12.7 (Y-D~zaki) released. + * FLIM: Version 1.12.7 (Y-Dþzaki)-A released. 1999-05-31 MORIOKA Tomohiko @@ -599,7 +617,7 @@ 1999-05-11 MORIOKA Tomohiko - * FLIM: Version 1.12.6 (Family-K-Drenmae) released. + * FLIM: Version 1.12.6 (Family-K-Dòenmae)-A released. 1999-04-27 Shuhei KOBAYASHI @@ -716,7 +734,7 @@ 1999-01-23 MORIOKA Tomohiko - * FLIM: Version 1.12.3 (Kintetsu-K-Drriyama) released. + * FLIM: Version 1.12.3 (Kintetsu-K-Dòriyama)-A released. 1999-01-23 MORIOKA Tomohiko @@ -759,7 +777,7 @@ 1999-01-21 MORIOKA Tomohiko - * FLIM: Version 1.12.2 (Kuj-Dr) released. + * FLIM: Version 1.12.2 (Kuj-Dò)-A released. 1999-01-16 MORIOKA Tomohiko @@ -945,7 +963,7 @@ 1998-12-02 MORIOKA Tomohiko - * FLIM: Version 1.12.1 (Nishinoky-Dr) released. + * FLIM: Version 1.12.1 (Nishinoky-Dò)-A released. 1998-11-30 MORIOKA Tomohiko @@ -1163,7 +1181,7 @@ 1998-10-26 MORIOKA Tomohiko - * FLIM: Version 1.11.2 (Heij-Dr) was released. + * FLIM: Version 1.11.2 (Heij-Dò)-A was released. * NEWS (Abolish variable `mime-temp-directory'): New subsection. @@ -1443,7 +1461,7 @@ 1998-10-12 MORIOKA Tomohiko - * FLIM: Version 1.10.4 (Shin-H-Drsono) was released. + * FLIM: Version 1.10.4 (Shin-H-Dòsono)-A was released. 1998-10-12 Katsumi Yamaoka @@ -1628,7 +1646,7 @@ 1998-09-29 MORIOKA Tomohiko - * FLIM: Version 1.10.0 (K-Drdo) was released. + * FLIM: Version 1.10.0 (K-Dòdo)-A was released. * README.en (What's FLIM): Add mel-ccl.el. @@ -1915,7 +1933,7 @@ 1998-08-31 MORIOKA Tomohiko - * FLIM: Version 1.9.1 (Tonosh-Dr) was released. + * FLIM: Version 1.9.1 (Tonosh-Dò)-A was released. * mime-en.sgml (mm-backend): Translate a little. @@ -2058,7 +2076,7 @@ 1998-07-07 MORIOKA Tomohiko - * FLIM-Chao: Version 1.8.0 (Shij-Dr) was released. + * FLIM-Chao: Version 1.8.0 (Shij-Dò)-A was released. 1998-07-07 MORIOKA Tomohiko @@ -2170,7 +2188,7 @@ 1998-07-01 MORIOKA Tomohiko - * FLIM: Version 1.8.0 (-DRkubo) was released. + * FLIM: Version 1.8.0 (-DÒkubo)-A was released. * README.en: Delete `How to use'. @@ -2295,7 +2313,7 @@ 1998-06-28 MORIOKA Tomohiko - * FLIM-Chao: Version 1.7.0 (Goj-Dr) was released. + * FLIM-Chao: Version 1.7.0 (Goj-Dò)-A was released. 1998-06-26 MORIOKA Tomohiko @@ -2554,7 +2572,7 @@ 1998-06-19 MORIOKA Tomohiko - * FLIM: Version 1.4.1 (Momoyama-Gory-Drmae) was released. + * FLIM: Version 1.4.1 (Momoyama-Gory-Dòmae)-A was released. 1998-06-18 MORIOKA Tomohiko @@ -2674,7 +2692,7 @@ 1998-05-06 MORIOKA Tomohiko - * FLIM: Version 1.2.0 (J-D~jr) was released. + * FLIM: Version 1.2.0 (J-Dþjò)-A was released. * README.en (What's FLIM): Delete description about std11-parse.el; add description about mailcap.el. @@ -2725,7 +2743,7 @@ 1998-05-05 MORIOKA Tomohiko - * FLIM: Version 1.1.0 (T-Drji) was released. + * FLIM: Version 1.1.0 (T-Dòji)-A was released. 1998-05-04 MORIOKA Tomohiko @@ -2761,7 +2779,7 @@ 1998-04-17 MORIOKA Tomohiko - * FLIM: Version 1.0.1 (Ky-Drto) was released. + * FLIM: Version 1.0.1 (Ky-Dòto)-A was released. * mime-def.el (mime-spadework-module-version-string): New constant. diff --git a/Makefile b/Makefile index 996e16c..9d899e4 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ tar: cvs commit sh -c 'cvs tag -RF $(PACKAGE)-`echo $(VERSION) | tr . _`; \ cd /tmp; \ - cvs -d :pserver:anonymous@chamonix.jaist.ac.jp:/hare/cvs/root \ + cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root \ export -d $(PACKAGE)-$(VERSION) \ -r $(PACKAGE)-`echo $(VERSION) | tr . _` \ flim' diff --git a/mel-b-el.el b/mel-b-el.el index f661853..2937238 100644 --- a/mel-b-el.el +++ b/mel-b-el.el @@ -123,8 +123,10 @@ external decoder is called." (ash (logand (car pack) 3) 4)))) buf)) -(defun-maybe base64-encode-string (string) - "Encode STRING to base64, and return the result." +(defun-maybe base64-encode-string (string &optional no-line-break) + "Base64-encode STRING and return the result. +Optional second argument NO-LINE-BREAK means do not break long lines +into shorter lines." (let* ((len (length string)) (b 0)(e 57) (dest "")) @@ -135,7 +137,7 @@ external decoder is called." (function base64-encode-1) (pack-sequence (substring string b e) 3) "") - "\n")) + (if (not no-line-break) "\n"))) (setq b e e (+ e 57))) (concat dest @@ -144,16 +146,14 @@ external decoder is called." (pack-sequence (substring string b) 3) "")))) -(defun base64-internal-encode-region (beg end) +(defun base64-internal-encode-region (beg end &optional no-line-break) (save-excursion (save-restriction (narrow-to-region beg end) (insert (prog1 - (base64-encode-string - (buffer-substring beg end)) - (delete-region beg end))) - (or (bolp) (insert ?\n))))) + (base64-encode-string (buffer-substring beg end) no-line-break) + (delete-region beg end)))))) ;;; @ internal base64 decoder @@ -231,7 +231,7 @@ external decoder is called." ;;; @ external encoder/decoder ;;; -(defun base64-external-encode-region (beg end) +(defun base64-external-encode-region (beg end &optional no-line-break) (save-excursion (save-restriction (narrow-to-region beg end) @@ -244,7 +244,12 @@ external decoder is called." ;; regularize line break code (goto-char (point-min)) (while (re-search-forward "\r$" nil t) - (replace-match ""))))) + (replace-match "")) + (if no-line-break + (progn + (goto-char (point-min)) + (while (search-forward "\n" nil t) + (replace-match ""))))))) (defun base64-external-decode-region (beg end) (save-excursion @@ -268,9 +273,11 @@ external decoder is called." ;;; @ application interfaces ;;; -(defun-maybe base64-encode-region (start end) - "Encode current region by base64. -START and END are buffer positions. +(defun-maybe base64-encode-region (start end &optional no-line-break) + "Base64-encode the region between START and END. +Return the length of the encoded text. +Optional third argument NO-LINE-BREAK means do not break long lines +into shorter lines. This function calls internal base64 encoder if size of region is smaller than `base64-internal-encoding-limit', otherwise it calls external base64 encoder specified by `base64-external-encoder'. In @@ -279,8 +286,8 @@ metamail or XEmacs package)." (interactive "*r") (if (and base64-internal-encoding-limit (> (- end start) base64-internal-encoding-limit)) - (base64-external-encode-region start end) - (base64-internal-encode-region start end))) + (base64-external-encode-region start end no-line-break) + (base64-internal-encode-region start end no-line-break))) (defun-maybe base64-decode-region (start end) "Decode current region by base64. @@ -374,7 +381,7 @@ START and END are buffer positions." (mime-write-decoded-region start end filename (nil "base64")) 'base64-write-decoded-region) - + ;;; @ end ;;; diff --git a/mime-en.sgml b/mime-en.sgml index 7271d36..746c987 100644 --- a/mime-en.sgml +++ b/mime-en.sgml @@ -1333,14 +1333,13 @@ FLIM $B$N(B file $B$O(B CVS $B$r;H$C$F4IM}$5$l$F$$$^$9!#$3$N$?$a!"0J2<$NJ}K (0) cvs login - % cvs -d :pserver:anonymous@chamonix.jaist.ac.jp:/hare/cvs/root \ - login + % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root login CVS password: [CR] # NULL string (1) checkout - % cvs -d :pserver:anonymous@chamonix.jaist.ac.jp:/hare/cvs/root \ + % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root \ checkout [-r TAG] flim @@ -1348,7 +1347,7 @@ FLIM $B$N(B file $B$O(B CVS $B$r;H$C$F4IM}$5$l$F$$$^$9!#$3$N$?$a!"0J2<$NJ}K CVS $B$rMQ$$$?3+H/$K;22C$7$?$$J}$O(B
    -
  • cvs@chamonix.jaist.ac.jp +
  • cvs@cvs.m17n.org
diff --git a/mime-ja.sgml b/mime-ja.sgml index 74b5861..e4bc50b 100644 --- a/mime-ja.sgml +++ b/mime-ja.sgml @@ -1333,14 +1333,13 @@ FLIM $B$N(B file $B$O(B CVS $B$r;H$C$F4IM}$5$l$F$$$^$9!#$3$N$?$a!"0J2<$NJ}K (0) cvs login - % cvs -d :pserver:anonymous@chamonix.jaist.ac.jp:/hare/cvs/root \ - login + % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root login CVS password: [CR] # NULL string (1) checkout - % cvs -d :pserver:anonymous@chamonix.jaist.ac.jp:/hare/cvs/root \ + % cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root \ checkout [-r TAG] flim @@ -1348,7 +1347,7 @@ FLIM $B$N(B file $B$O(B CVS $B$r;H$C$F4IM}$5$l$F$$$^$9!#$3$N$?$a!"0J2<$NJ}K CVS $B$rMQ$$$?3+H/$K;22C$7$?$$J}$O(B
    -
  • cvs@chamonix.jaist.ac.jp +
  • cvs@cvs.m17n.org
diff --git a/smtp.el b/smtp.el index 532bb14..27a0b99 100644 --- a/smtp.el +++ b/smtp.el @@ -348,8 +348,7 @@ don't define this value." (defun smtp-deduce-address-list (smtp-text-buffer header-start header-end) "Get address list suitable for smtp RCPT TO:
." - (let ((case-fold-search t) - (simple-address-list "") + (let ((simple-address-list "") this-line this-line-end addr-regexp @@ -358,6 +357,7 @@ don't define this value." (save-excursion ;; (set-buffer smtp-address-buffer) + (setq case-fold-search t) (erase-buffer) (insert (save-excursion (set-buffer smtp-text-buffer) -- 1.7.10.4