pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(devel/flim) update to github.com/wanderlust 20230808
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By: mef
Date: Sat Sep 2 19:54:11 2023 +0900
Changeset: cd228e203b805ad935fecb15a4acdb572ff39d97
Modified Files:
flim/Makefile
flim/distinfo
flim/patches/patch-FLIM-CFG
flim/patches/patch-FLIM-ELS
flim/patches/patch-FLIM-MK
flim/patches/patch-README.en
flim/patches/patch-README.ja
flim/patches/patch-eword-decode.el
flim/patches/patch-eword-encode.el
flim/patches/patch-hmac-sha1.el
flim/patches/patch-luna.el
flim/patches/patch-lunit.el
flim/patches/patch-md5.el
flim/patches/patch-mel-g.el
flim/patches/patch-mel-q-ccl.el
flim/patches/patch-mel-q.el
flim/patches/patch-mel-u.el
flim/patches/patch-mel.el
flim/patches/patch-mime-conf.el
flim/patches/patch-mime-def.el
flim/patches/patch-mime-parse.el
flim/patches/patch-mime.el
flim/patches/patch-mmbuffer.el
flim/patches/patch-mmcooked.el
flim/patches/patch-mmexternal.el
flim/patches/patch-mmgeneric.el
flim/patches/patch-qmtp.el
flim/patches/patch-sasl-scram.el
flim/patches/patch-sasl.el
flim/patches/patch-sha1.el
flim/patches/patch-smtp.el
flim/patches/patch-std11.el
Added Files:
flim/files/split-patch
Removed Files:
flim/patches/patch-tests_test-rfc2231.el
Log Message:
(devel/flim) update to github.com/wanderlust 20230808
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cd228e203b805ad935fecb15a4acdb572ff39d97
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
flim/Makefile | 7 +-
flim/distinfo | 64 +++++------
flim/files/split-patch | 43 ++++++++
flim/patches/patch-FLIM-CFG | 17 ++-
flim/patches/patch-FLIM-ELS | 24 ++---
flim/patches/patch-FLIM-MK | 69 +++++++++---
flim/patches/patch-README.en | 6 +-
flim/patches/patch-README.ja | 6 +-
flim/patches/patch-eword-decode.el | 35 +++++-
flim/patches/patch-eword-encode.el | 64 ++++++-----
flim/patches/patch-hmac-sha1.el | 10 +-
flim/patches/patch-luna.el | 33 ++++--
flim/patches/patch-lunit.el | 6 +-
flim/patches/patch-md5.el | 6 +-
flim/patches/patch-mel-g.el | 6 +-
flim/patches/patch-mel-q-ccl.el | 176 ++++++++++++++++++++++++++-----
flim/patches/patch-mel-q.el | 39 ++++---
flim/patches/patch-mel-u.el | 6 +-
flim/patches/patch-mel.el | 33 +++---
flim/patches/patch-mime-conf.el | 19 +++-
flim/patches/patch-mime-def.el | 47 +++++----
flim/patches/patch-mime-parse.el | 41 ++++---
flim/patches/patch-mime.el | 32 +++---
flim/patches/patch-mmbuffer.el | 6 +-
flim/patches/patch-mmcooked.el | 6 +-
flim/patches/patch-mmexternal.el | 6 +-
flim/patches/patch-mmgeneric.el | 136 ++++++++++++++++++------
flim/patches/patch-qmtp.el | 6 +-
flim/patches/patch-sasl-scram.el | 18 +++-
flim/patches/patch-sasl.el | 31 +++++-
flim/patches/patch-sha1.el | 6 +-
flim/patches/patch-smtp.el | 68 +++++++-----
flim/patches/patch-std11.el | 65 +++++++-----
flim/patches/patch-tests_test-rfc2231.el | 31 ------
34 files changed, 788 insertions(+), 380 deletions(-)
diffs:
diff --git a/flim/Makefile b/flim/Makefile
index 976f8bda0c..88177df7da 100644
--- a/flim/Makefile
+++ b/flim/Makefile
@@ -39,11 +39,12 @@ post-patch:
${RM} -f ${WRKSRC}/hmac-def.el
${RM} -f ${WRKSRC}/hex-utile.el
+pre-configure:
+ ${MKDIR} -p ${WRKDIR}/.home/.emacs.d/elpa
+ find ${WRKSRC} -name \*orig | xargs rm
+
post-build:
cd ${WRKSRC}; for i in mime-en mime-ja; do \
- ${RM} -f $${i}.info*; \
- ${CP} $${i}.texi $${i}.texi.orig; \
- ${PREFIX}/bin/qkc -Oeu $${i}.texi.orig >$${i}.texi; \
makeinfo --force --no-validate $${i}.texi; \
done
diff --git a/flim/distinfo b/flim/distinfo
index 5ed91aa60f..8156681b22 100644
--- a/flim/distinfo
+++ b/flim/distinfo
@@ -4,43 +4,45 @@ BLAKE2s (flim-1.14.9.tar.gz) = a21dfc084bedd6ba75f20988d5e1e5fae0d758dd5e0f97752
SHA512 (flim-1.14.9.tar.gz) = a272a30f27cea24f537b9bf3a6dbb25113deff0ab8e1c03bd802e4d32d673d567d282297ed9e4d35217f069699a1fc25bfdde09778171a188dfa46f49e9bb7dd
Size (flim-1.14.9.tar.gz) = 182065 bytes
SHA1 (patch-ChangeLog) = dcbda73d526164f238dbd17b5a0344ed3aa989ac
-SHA1 (patch-FLIM-CFG) = e0aae8ed5fb4ce512cc747d5851177ddefa17973
-SHA1 (patch-FLIM-ELS) = d16541599be8bc2d672d79803fc148e34efd2096
-SHA1 (patch-FLIM-MK) = 700f41267470380d12fba0a09f86a621e3746d9f
-SHA1 (patch-README.en) = 341c8f1f87f753c5b2a7b303176fa87c4548bd1f
-SHA1 (patch-README.ja) = 854f4fad821e8598909250d929187a1d80094147
+SHA1 (patch-FLIM-CFG) = 7fd16f95b4cf5b19e1f9cec16e538d2535145bbf
+SHA1 (patch-FLIM-ELS) = a664460a3c860447a20d300b58353fc3827809b8
+SHA1 (patch-FLIM-MK) = ff218a29d5fdab817a287e4e482548ec26df4fb6
+SHA1 (patch-Makefile) = 3892aab070b9a4ea3820285535a707a11a0e3c4c
+SHA1 (patch-README.en) = 0594c72d60c32f3b84d6dee2cd763e5ea86eb743
+SHA1 (patch-README.ja) = 1ea7da76d00e5cbea27b68d61d6f578e003a820e
SHA1 (patch-ab) = 9f19f6575917bb4c590c8e788b69741b27bccf52
SHA1 (patch-ac) = 7c1f6a9d8bed1d87f4215bde996c8cfd1f3ea42d
-SHA1 (patch-eword-decode.el) = 959b211d5a065af3d683a37534fc1e7a553fb134
-SHA1 (patch-eword-encode.el) = 38e09ace5b2a53e9b43d34dee844423b4303f031
+SHA1 (patch-eword-decode.el) = c5587fa80f1999c781baab9a8641f8a48b1ccc3f
+SHA1 (patch-eword-encode.el) = 1c5bc4b38ece8867191b0aa75ecd988e7104e194
SHA1 (patch-flim-pkg.el) = 5277943f6d8fe8bd3f20c0be7c6a00ddf0488f83
SHA1 (patch-ftp.in) = 1e51ceb9f57bb7e129d20963fc32e7e4620b7543
SHA1 (patch-hmac-md5.el) = 2c30a6956eb7d435394a034a937a5a5fd0b894ca
-SHA1 (patch-hmac-sha1.el) = a6db75b2148ea420947b8fd5803546c11867ca4e
-SHA1 (patch-luna.el) = 6f1fb1d9e59ae56099505a44f70a19dc43469d71
-SHA1 (patch-lunit.el) = 06a3e027cd33c39db0380176297d3698410eed3f
-SHA1 (patch-md5.el) = 10c057206ea895c84d6b0e8bd5c4da7efad24eba
-SHA1 (patch-mel-g.el) = de50971f68edf041e3f4cf7d973d1c8304107e40
-SHA1 (patch-mel-q-ccl.el) = fe8dc432dfc3056c2b51c7f24079515b2bd30790
-SHA1 (patch-mel-q.el) = 5e1d79f820ea5a6a3cf1a1c13bea837b49f11271
-SHA1 (patch-mel-u.el) = a9759efefb416ccb31aeeba3272e33d46927b792
-SHA1 (patch-mel.el) = d2b7cecd3138199b73f710455d64e46d7dad0663
-SHA1 (patch-mime-conf.el) = 391e8fe58e82d0fe59e0f5ce5fa5b340d9cdf33b
-SHA1 (patch-mime-def.el) = 5187e0d51c1a3fa1755aa9a775857243c0616ff4
-SHA1 (patch-mime-parse.el) = f350bd586bbac8e43b385bc5e822114e54989b66
+SHA1 (patch-hmac-sha1.el) = a82426d00c4e437c5b76f37c4a7adf670b435db0
+SHA1 (patch-luna.el) = 204848486896438fe3293823171d6dd57080392a
+SHA1 (patch-lunit.el) = 5072b93134716f02a71c80d08cc38f0242074395
+SHA1 (patch-md5.el) = e7468476e5af0a01c234e3ab668e5a935ab73b11
+SHA1 (patch-mel-g.el) = 863f46e4ac2382e50343748165e8629f00d7d43c
+SHA1 (patch-mel-q-ccl.el) = 7e78fd934afe76d08e0ac0b94142b3505fa57fef
+SHA1 (patch-mel-q.el) = c6e6a6385b2d569a6ad2c59e82d5ed8217f76f7b
+SHA1 (patch-mel-u.el) = 7b81fc86c134294844bd1a962451cbc26aee156a
+SHA1 (patch-mel.el) = b6ba9f8c9a98829d824f7caeccc8cbef7b8e5c93
+SHA1 (patch-mime-conf.el) = f5b416fb3a5c4a215ab1f91a6ffa3a43b4f1e864
+SHA1 (patch-mime-def.el) = d2402e3e87f56119dd6376806d80bcba146ca226
+SHA1 (patch-mime-en.texi) = 7aec003da716e020b2bcf1b7871704cf998f7fe1
+SHA1 (patch-mime-ja.texi) = 93b1b11ac75058b3dadb72103477845487ee1e39
+SHA1 (patch-mime-parse.el) = b836b35e2ee55205f0043660e6f9695a8492e8d6
SHA1 (patch-mime-parse.el-00) = 557e8bb815cf361acc1f7c6b0d6867aa6a2dad64
-SHA1 (patch-mime.el) = 299c288a9a3b7a9c106f69b515a9d8f691c128a0
-SHA1 (patch-mmbuffer.el) = e6b7952fb3a7e9fb5f27a5ba4f341a71c015fd96
-SHA1 (patch-mmcooked.el) = e58c52c8aa4ce88943584da8212f3100c472b733
-SHA1 (patch-mmexternal.el) = f824dc52ee089d735b618c774ee4e62cd2112038
-SHA1 (patch-mmgeneric.el) = 9a442bb894df4b332e74198908ab135a9b0b4877
-SHA1 (patch-qmtp.el) = be0d13e634038b6e575af17b83539e1467ad90fd
+SHA1 (patch-mime.el) = b8eb7d1884a0198baa03931daf0f033e57aee622
+SHA1 (patch-mmbuffer.el) = 637507580af8ff1709e776db2d9faffb71684d17
+SHA1 (patch-mmcooked.el) = f922bcc9d8e37dc0a145d747c89e24f1ce988f94
+SHA1 (patch-mmexternal.el) = a19262529f738c413b6ae0d15c4b34a625cdcb32
+SHA1 (patch-mmgeneric.el) = 5a2a646981621ac9d9d72ecc99e0d188ad827b44
+SHA1 (patch-qmtp.el) = 98521f9e98dcfde8321bcc96a8837835d1f3fcf4
SHA1 (patch-sasl-cram.el) = 3e539e8144cba639dbef52c0c8402e17a2814253
SHA1 (patch-sasl-digest.el) = fbc2fe257d100fc2a2e9ceb8c154ff1d4507e687
-SHA1 (patch-sasl-scram.el) = fbb75a628d3641891f52e40c9adac0e797532c27
+SHA1 (patch-sasl-scram.el) = 13db72ebd4bda2f3c996510e0747e4ca83d4e9c5
SHA1 (patch-sasl-xoauth2.el) = e8bc389bf9c0b6f7554ac8ff00132a0c6e79c790
-SHA1 (patch-sasl.el) = de724edbf09fbd8d58ef774591068c2d253c185f
-SHA1 (patch-sha1.el) = 408a37f445c911beda840840740bd4bf53fe3716
-SHA1 (patch-smtp.el) = bce1cbc11893d7d3211d050b58dc6739dd200723
-SHA1 (patch-std11.el) = 698204e171a938e546cf21dd751c0fdedd90371b
-SHA1 (patch-tests_test-rfc2231.el) = fe8e549c290d0cdda33de60ea380650771508035
+SHA1 (patch-sasl.el) = ed09e6665f4fedcf9293afc79cf7ee5dca41a9a9
+SHA1 (patch-sha1.el) = f6f758a3eb612207e4a6df401d0312d7d422537a
+SHA1 (patch-smtp.el) = 1a0e8c17099e2cdcfe14a3a3e202e71d634afc99
+SHA1 (patch-std11.el) = d61eaa6580735f003e57b13897fae807d5b01631
diff --git a/flim/files/split-patch b/flim/files/split-patch
new file mode 100644
index 0000000000..e36b9b98cc
--- /dev/null
+++ b/flim/files/split-patch
@@ -0,0 +1,43 @@
+#!/usr/pkg/bin/perl
+use strict;
+my @lines = '';
+my $DIR = '/tmp/patches';
+my $patch;
+my $next_patch;
+
+if ( -d $DIR) { print "$DIR already exist, deleting\n"; system ('rm -rf /tmp/patches'); }
+
+mkdir ($DIR);
+while(<>) {
+# +++ ./FLIM-CFG 2023-08-31 08:29:38.576546360 +0900
+ if (/Only in/) { next;}
+ if (m,^diff -ur /tmp/W/\S*/flim/work/flim-[0-9.]+/(\S+),) {
+# print STDERR $_;
+# push (@lines, $_);
+ $patch = $next_patch;
+ my $file = $1;
+ $file =~ s/\.\///;
+ $file =~ s/\//_/g;
+
+ $next_patch = sprintf("%s/patch-%s", $DIR, $file);
+# print STDERR $patch,"\n";
+ if (@lines && $patch) {
+ open (PATCH, "> $patch") || print STDERR " problem opening to write: %s: $!\n", $patch;
+ print PATCH '$NetBSD$'."\n\n";
+ print PATCH " flim-1_14-wl branch at 2023-08-08\n\n";
+ print PATCH @lines;
+ close(PATCH);
+ @lines = ();
+ }
+ } else {
+ push (@lines, $_);
+ }
+}
+__END__
+cd /export/git-work/flimdiff -ur /tmp/W/devel/flim/work/flim-1.14.9/ ./ >! /tmp/diff
+cd /tmp
+perl /export/git-work/perl/split-patch < /tmp/diff
+rsync -avH /tmp/patches/ /PATH/TO/wip/flim/patches/
+
+
+ 235 2023-09-02 12:12 diff -ur /tmp/W/wip/flim/work/flim-1.14.9/ ./ |& > /tmp/diff
diff --git a/flim/patches/patch-FLIM-CFG b/flim/patches/patch-FLIM-CFG
index 544a3fb7c1..7e6f52cf1f 100644
--- a/flim/patches/patch-FLIM-CFG
+++ b/flim/patches/patch-FLIM-CFG
@@ -1,10 +1,10 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./FLIM-CFG 2006-12-21 02:40:42.000000000 +0900
-+++ ././FLIM-CFG 2018-07-29 22:48:22.272294473 +0900
-@@ -13,6 +13,7 @@
+--- /tmp/W/devel/flim/work/flim-1.14.9/FLIM-CFG 2006-12-21 02:40:42.000000000 +0900
++++ ./FLIM-CFG 2023-08-31 08:29:38.576546360 +0900
+@@ -13,11 +13,16 @@
(progn
(add-to-list 'default-load-path LISPDIR)
(add-to-list 'load-path LISPDIR)
@@ -12,3 +12,12 @@ sync to lexical-binding
(add-to-list 'load-path (expand-file-name "apel" LISPDIR))))
(if (boundp 'VERSION_SPECIFIC_LISPDIR)
+ (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR))
+
++(if (boundp 'PACKAGE_LISPDIR)
++ (let ((default-directory PACKAGE_LISPDIR))
++ (normal-top-level-add-subdirs-to-load-path)))
++
+ (require 'install)
+
+ (add-latest-path "custom")
diff --git a/flim/patches/patch-FLIM-ELS b/flim/patches/patch-FLIM-ELS
index 9a0730d317..5501a625e4 100644
--- a/flim/patches/patch-FLIM-ELS
+++ b/flim/patches/patch-FLIM-ELS
@@ -1,15 +1,16 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./FLIM-ELS 2003-11-13 09:31:39.000000000 +0900
-+++ ././FLIM-ELS 2020-09-05 16:02:39.898246465 +0900
-@@ -12,37 +12,19 @@
+--- /tmp/W/devel/flim/work/flim-1.14.9/FLIM-ELS 2003-11-13 09:31:39.000000000 +0900
++++ ./FLIM-ELS 2023-08-31 08:29:38.577768707 +0900
+@@ -11,37 +11,20 @@
+ mime mime-parse mmgeneric
mmbuffer mmcooked mmexternal
mime-conf
- sasl sasl-cram sasl-digest
+- sasl sasl-cram sasl-digest
- md4 ntlm sasl-ntlm sasl-scram
-+ sasl-scram
++ sasl sasl-scram
smtp qmtp))
(setq flim-version-specific-modules nil)
@@ -24,12 +25,13 @@ sync to lexical-binding
- (if (fboundp 'dynamic-link)
- (setq flim-modules (cons 'mel-b-dl flim-modules))))
-(setq flim-modules (cons 'mel-b-el flim-modules))
-+(setq hmac-modules '(md5 sha1 hmac-md5 hmac-sha1))
++(setq hmac-modules '(md5 sha1 hmac-sha1))
(require 'pccl)
(unless-broken ccl-usable
- (setq flim-modules (cons 'mel-b-ccl (cons 'mel-q-ccl flim-modules))))
--
++ (setq flim-modules (cons 'mel-q-ccl flim-modules)))
+
-(if (and (fboundp 'md5)
- (subrp (symbol-function 'md5)))
- nil
@@ -40,11 +42,9 @@ sync to lexical-binding
-(if (fboundp 'dynamic-link)
- (setq hmac-modules (cons 'sha1-dl hmac-modules))
- (setq hmac-modules (cons 'sha1-el hmac-modules)))
-+ (setq flim-modules (cons 'mel-q-ccl flim-modules)))
-
--(setq flim-modules (nconc hmac-modules flim-modules))
+(require 'path-util)
+(when (module-installed-p 'oauth2)
+ (setq flim-modules (append flim-modules '(sasl-xoauth2))))
- ;;; FLIM-ELS ends here
+ (setq flim-modules (nconc hmac-modules flim-modules))
+
diff --git a/flim/patches/patch-FLIM-MK b/flim/patches/patch-FLIM-MK
index afd6dbb9b0..4d04e29969 100644
--- a/flim/patches/patch-FLIM-MK
+++ b/flim/patches/patch-FLIM-MK
@@ -1,13 +1,45 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./FLIM-MK 2006-12-12 17:21:00.000000000 +0900
-+++ ././FLIM-MK 2020-09-05 16:02:39.898626305 +0900
-@@ -69,15 +69,9 @@
- (defun compile-flim-package ()
- (config-flim-package)
+--- /tmp/W/devel/flim/work/flim-1.14.9/FLIM-MK 2006-12-12 17:21:00.000000000 +0900
++++ ./FLIM-MK 2023-08-31 08:29:38.579192058 +0900
+@@ -21,6 +21,16 @@
+ (princ (format "VERSION_SPECIFIC_LISPDIR=%s\n"
+ VERSION_SPECIFIC_LISPDIR)))))
+ (setq command-line-args-left (cdr command-line-args-left))
++ (and (setq package-lisp-dir (car command-line-args-left))
++ (or (string-equal "NONE" package-lisp-dir)
++ (progn
++ (defvar PACKAGE_LISPDIR
++ (if (boundp (intern package-lisp-dir))
++ (symbol-value (intern package-lisp-dir))
++ package-lisp-dir))
++ (princ (format "PACKAGE_LISPDIR=%s\n"
++ PACKAGE_LISPDIR)))))
++ (setq command-line-args-left (cdr command-line-args-left))
+ (load-file "FLIM-CFG")
+ (load-file "FLIM-ELS")
+ (princ (format "PREFIX=%s
+@@ -54,46 +64,4 @@
+ (setq files (cdr files)))
+ (lunit suite)))
+-(defun config-flim-package ()
+- (let (package-dir)
+- (and (setq package-dir (car command-line-args-left))
+- (or (string= "NONE" package-dir)
+- (defvar PACKAGEDIR package-dir)))
+- (setq command-line-args-left (cdr command-line-args-left))
+- (load-file "FLIM-CFG")
+- (load-file "FLIM-ELS")
+- (setq flim-modules (append flim-modules
+- '(auto-autoloads custom-load)))
+- (princ (format "PACKAGEDIR=%s\n" PACKAGEDIR))))
+-
+-(defun compile-flim-package ()
+- (config-flim-package)
+-
- (if (fboundp 'batch-update-directory-autoloads)
- ;; XEmacs 21.5.19 and newer.
- (progn
@@ -17,9 +49,22 @@ sync to lexical-binding
- (setq autoload-package-name "flim")
- (add-to-list 'command-line-args-left ".")
- (batch-update-directory))
-+ (setq autoload-package-name "flim")
-+ (add-to-list 'command-line-args-left ".")
-+ (batch-update-directory)
-
- (add-to-list 'command-line-args-left ".")
- (Custom-make-dependencies)
+-
+- (add-to-list 'command-line-args-left ".")
+- (Custom-make-dependencies)
+-
+- (compile-elisp-modules flim-version-specific-modules ".")
+- (compile-elisp-modules flim-modules "."))
+-
+-(defun install-flim-package ()
+- (config-flim-package)
+- (install-elisp-modules (append flim-version-specific-modules
+- flim-modules)
+- "./"
+- (expand-file-name FLIM_PREFIX
+- (expand-file-name "lisp"
+- PACKAGEDIR)))
+- (delete-file "./auto-autoloads.el")
+- (delete-file "./custom-load.el"))
+-
+ ;;; FLIM-MK ends here
diff --git a/flim/patches/patch-README.en b/flim/patches/patch-README.en
index b81d9b98c3..5b35bdf6c4 100644
--- a/flim/patches/patch-README.en
+++ b/flim/patches/patch-README.en
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./README.en 2006-12-21 02:44:48.000000000 +0900
-+++ ././README.en 2018-07-29 22:48:22.273146888 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/README.en 2006-12-21 02:44:48.000000000 +0900
++++ ./README.en 2023-08-31 08:29:38.582561272 +0900
@@ -33,8 +33,6 @@
eword-decode.el --- encoded-word decoder
eword-encode.el --- encoded-word encoder
diff --git a/flim/patches/patch-README.ja b/flim/patches/patch-README.ja
index 04707bb097..4c14cfba44 100644
--- a/flim/patches/patch-README.ja
+++ b/flim/patches/patch-README.ja
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./README.ja 2006-12-21 03:06:14.000000000 +0900
-+++ ././README.ja 2020-09-05 16:02:39.898751689 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/README.ja 2006-12-21 03:06:14.000000000 +0900
++++ ./README.ja 2023-08-31 08:29:38.583869221 +0900
@@ -1,159 +1,156 @@
-[FLIM の README (日本語版)]
+[FLIM の README (日本語版)]
diff --git a/flim/patches/patch-eword-decode.el b/flim/patches/patch-eword-decode.el
index 2f317ac09b..306a4068af 100644
--- a/flim/patches/patch-eword-decode.el
+++ b/flim/patches/patch-eword-decode.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./eword-decode.el 2005-12-25 19:45:52.000000000 +0900
-+++ ././eword-decode.el 2020-09-05 16:02:39.898948422 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/eword-decode.el 2005-12-25 19:45:52.000000000 +0900
++++ ./eword-decode.el 2023-08-31 08:29:38.587163972 +0900
@@ -1,4 +1,4 @@
-;;; eword-decode.el --- RFC 2047 based encoded-word decoder for GNU Emacs
+;;; eword-decode.el --- RFC 2047 based encoded-word decoder for GNU Emacs -*- lexical-binding: t -*-
@@ -578,7 +578,32 @@ sync to lexical-binding
(defun eword-lexical-analyze (string &optional start must-unfold)
"Return lexical analyzed list corresponding STRING.
-@@ -783,18 +770,15 @@
+@@ -763,18 +750,17 @@
+ characters encoded as encoded-words or invalid \"raw\" format.
+ \"Raw\" non us-ascii characters are regarded as variable
+ `default-mime-charset'."
+- (let ((key (substring string (or start 0)))
++ (let ((key (substring-no-properties string start))
+ ret cell)
+- (set-text-properties 0 (length key) nil key)
+ (if (setq ret (assoc key eword-lexical-analyze-cache))
+ (cdr ret)
+- (setq ret (eword-lexical-analyze-internal key 0 must-unfold))
+- (setq eword-lexical-analyze-cache
++ (setq ret (eword-lexical-analyze-internal key 0 must-unfold)
++ eword-lexical-analyze-cache
+ (cons (cons key ret)
+ eword-lexical-analyze-cache))
+- (if (cdr (setq cell (nthcdr eword-lexical-analyze-cache-max
+- eword-lexical-analyze-cache)))
+- (setcdr cell nil))
++ (when (cdr (setq cell (nthcdr eword-lexical-analyze-cache-max
++ eword-lexical-analyze-cache)))
++ (setcdr cell nil))
+ ret)))
+
+ (defun eword-decode-token (token)
+@@ -783,18 +769,15 @@
(cond ((eq type 'quoted-string)
(std11-wrap-as-quoted-string value))
((eq type 'comment)
@@ -605,7 +630,7 @@ sync to lexical-binding
(t value))))
(defun eword-extract-address-components (string &optional start)
-@@ -809,10 +793,8 @@
+@@ -809,10 +792,8 @@
(std11-unfold-string string) start
'must-unfold))))
(phrase (std11-full-name-string structure))
diff --git a/flim/patches/patch-eword-encode.el b/flim/patches/patch-eword-encode.el
index 5f47351119..bbc74aea7f 100644
--- a/flim/patches/patch-eword-encode.el
+++ b/flim/patches/patch-eword-encode.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./eword-encode.el 2007-09-06 16:48:50.000000000 +0900
-+++ ././eword-encode.el 2020-09-05 16:02:39.899126931 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/eword-encode.el 2007-09-06 16:48:50.000000000 +0900
++++ ./eword-encode.el 2023-08-31 08:29:38.589006246 +0900
@@ -1,4 +1,4 @@
-;;; eword-encode.el --- RFC 2047 based encoded-word encoder for GNU Emacs
+;;; eword-encode.el --- RFC 2047 based encoded-word encoder for GNU Emacs -*- lexical-binding: t -*-
@@ -37,7 +37,7 @@ sync to lexical-binding
(eword-encode-unstructured-field-body)))
;;; @ encoded-text encoder
-@@ -88,126 +88,75 @@
+@@ -88,126 +88,64 @@
(let ((text (encoded-text-encode-string string encoding mode)))
(if text
(concat "=?" (upcase (symbol-name charset)) "?"
@@ -130,18 +130,6 @@ sync to lexical-binding
(defmacro ew-rword-type (rword)
- (` (car (cdr (cdr (cdr (, rword)))))))
+ `(car (cdr (cdr (cdr ,rword)))))
-
-+(unless (and (boundp 'mule-version)
-+ (null (string< mule-version "6.0"))
-+ (fboundp 'detect-mime-charset-string))
- (defun ew-find-charset-rule (charsets)
- (if charsets
- (let* ((charset (find-mime-charset-by-charsets charsets))
- (encoding
- (cdr (or (assq charset mime-header-charset-encoding-alist)
- (cons charset mime-header-default-charset-encoding)))))
-- (list charset encoding))))
-+ (list charset encoding)))))
+
+(defun ew-find-string-rule (string)
+ (let ((charset (detect-mime-charset-string string)))
@@ -149,6 +137,14 @@ sync to lexical-binding
+ (cdr (or (assq charset mime-header-charset-encoding-alist)
+ (cons nil mime-header-default-charset-encoding))))))
+-(defun ew-find-charset-rule (charsets)
+- (if charsets
+- (let* ((charset (find-mime-charset-by-charsets charsets))
+- (encoding
+- (cdr (or (assq charset mime-header-charset-encoding-alist)
+- (cons charset mime-header-default-charset-encoding)))))
+- (list charset encoding))))
+-
-;; [tomo:2002-11-05] The following code is a quick-fix for emacsen
-;; which is not depended on the Mule model. We should redesign
-;; `eword-encode-split-string' to avoid to depend on the Mule model.
@@ -207,7 +203,7 @@ sync to lexical-binding
(defun ew-space-process (seq)
(let (prev a ac b c cc)
-@@ -227,30 +176,19 @@
+@@ -227,30 +165,19 @@
(setq prev (cons
(cons (concat (car a)(car b)(car c))
(cdr a))
@@ -245,7 +241,7 @@ sync to lexical-binding
;;; @ length
-@@ -263,16 +201,13 @@
+@@ -263,16 +190,13 @@
ret)
(setq ret
(cond ((string-equal encoding "B")
@@ -267,7 +263,7 @@ sync to lexical-binding
;;; @ encode-string
-@@ -286,35 +221,27 @@
+@@ -286,35 +210,27 @@
(if (null ret)
(cond ((and (setq string (car rword))
(or (<= (setq len (+ (length string) column)) 76)
@@ -312,7 +308,7 @@ sync to lexical-binding
(t
(setq string (car rword))
(let* ((p 0) np
-@@ -325,12 +252,10 @@
+@@ -325,12 +241,10 @@
;;(setq np (char-next-index (sref string p) p))
(setq nstr (substring string 0 np))
(setq ret (tm-eword::encoded-word-length
@@ -327,7 +323,7 @@ sync to lexical-binding
(setq str nstr
p np))
(if (string-equal str "")
-@@ -346,12 +271,8 @@
+@@ -346,12 +260,8 @@
(ew-rword-encoding rword)
str
(ew-rword-type rword)))
@@ -342,7 +338,7 @@ sync to lexical-binding
(defun eword-encode-rword-list (column rwl)
(let (ret dest str ew-f pew-f folded-points)
-@@ -360,23 +281,20 @@
+@@ -360,23 +270,20 @@
(if (and pew-f ew-f)
(setq rwl (cons '(" ") rwl)
pew-f nil)
@@ -370,7 +366,7 @@ sync to lexical-binding
(setq i (1- i))))
(setq s (substring dest i)
r-column (length s)
-@@ -384,17 +302,13 @@
+@@ -384,17 +291,13 @@
(when (setq ret (ew-encode-rword-1 r-column rwl))
(setq dest r-dest
column r-column)
@@ -392,7 +388,7 @@ sync to lexical-binding
;;; @ converter
-@@ -410,65 +324,44 @@
+@@ -410,65 +313,44 @@
(setq dest
(append dest
(list
@@ -471,7 +467,7 @@ sync to lexical-binding
(t
(setq dest
(if (or (eq pname 'spaces)
-@@ -479,11 +372,9 @@
+@@ -479,11 +361,9 @@
(list
(list (concat (car (car (last dest)))
(cdr token))
@@ -485,7 +481,7 @@ sync to lexical-binding
dest))
(defun eword-encode-phrase-route-addr-to-rword-list (phrase-route-addr)
-@@ -496,36 +387,31 @@
+@@ -496,36 +376,31 @@
;; )
(setq dest (eword-encode-phrase-to-rword-list phrase))
(if dest
@@ -527,7 +523,7 @@ sync to lexical-binding
dest))
(defsubst eword-encode-mailboxes-to-rword-list (mboxes)
-@@ -577,8 +463,7 @@
+@@ -577,8 +452,7 @@
(let ((elt (car in-reply-to)))
(if (eq (car elt) 'phrase)
(eword-encode-phrase-to-rword-list (cdr elt))
@@ -537,7 +533,7 @@ sync to lexical-binding
(setq in-reply-to (cdr in-reply-to)))
dest))
-@@ -586,6 +471,9 @@
+@@ -586,6 +460,9 @@
;;; @ application interfaces
;;;
@@ -547,7 +543,7 @@ sync to lexical-binding
(defvar eword-encode-default-start-column 10
"Default start column if it is omitted.")
-@@ -604,8 +492,7 @@
+@@ -604,8 +481,7 @@
(car (eword-encode-rword-list
(or column eword-encode-default-start-column)
(eword-encode-addresses-to-rword-list
@@ -557,7 +553,7 @@ sync to lexical-binding
(defun eword-encode-in-reply-to (string &optional column)
"Encode header field STRING as In-Reply-To field, and return the result.
-@@ -620,8 +507,7 @@
+@@ -620,8 +496,7 @@
Optional argument COLUMN is start-position of the field."
(car (eword-encode-rword-list
(or column eword-encode-default-start-column)
@@ -567,7 +563,7 @@ sync to lexical-binding
(defun eword-encode-unstructured-field-body (string &optional column)
"Encode header field STRING as unstructured field, and return the result.
-@@ -630,6 +516,81 @@
+@@ -630,6 +505,81 @@
(or column eword-encode-default-start-column)
(eword-encode-split-string string 'text))))
@@ -649,7 +645,7 @@ sync to lexical-binding
;;;###autoload
(defun mime-encode-field-body (field-body field-name)
"Encode FIELD-BODY as FIELD-NAME, and return the result.
-@@ -655,13 +616,13 @@
+@@ -655,13 +605,13 @@
(setq method-alist (cdr method-alist)))
ret)))
(defalias 'eword-encode-field-body 'mime-encode-field-body)
@@ -665,7 +661,7 @@ sync to lexical-binding
(defsubst eword-find-field-encoding-method (field-name)
(setq field-name (downcase field-name))
-@@ -672,11 +633,9 @@
+@@ -672,11 +622,9 @@
(str (car pair)))
(if (and (stringp str)
(string= field-name (downcase str)))
@@ -679,7 +675,7 @@ sync to lexical-binding
;;;###autoload
(defun mime-encode-header-in-buffer (&optional code-conversion)
-@@ -715,7 +674,8 @@
+@@ -715,7 +663,8 @@
default-cs)))
(encode-coding-region bbeg end cs)))))))))))
(defalias 'eword-encode-header 'mime-encode-header-in-buffer)
diff --git a/flim/patches/patch-hmac-sha1.el b/flim/patches/patch-hmac-sha1.el
index 914f037c13..98e8a4cbc1 100644
--- a/flim/patches/patch-hmac-sha1.el
+++ b/flim/patches/patch-hmac-sha1.el
@@ -1,21 +1,21 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./hmac-sha1.el 2005-07-06 11:09:04.000000000 +0900
-+++ ././hmac-sha1.el 2020-09-05 16:02:39.899264499 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/hmac-sha1.el 2005-07-06 11:09:04.000000000 +0900
++++ ./hmac-sha1.el 2023-08-31 08:29:38.591676336 +0900
@@ -1,4 +1,4 @@
-;;; hmac-sha1.el --- Compute HMAC-SHA1.
+;;; hmac-sha1.el --- Compute HMAC-SHA1. -*- lexical-binding: t -*-
;; Copyright (C) 1999, 2001 Free Software Foundation, Inc.
-@@ -64,19 +64,11 @@
+@@ -64,19 +64,10 @@
;;; Code:
(eval-when-compile (require 'hmac-def))
-(require 'hex-util) ; (decode-hex-string STRING)
- (require 'sha1) ; expects (sha1 STRING)
+-(require 'sha1) ; expects (sha1 STRING)
-;; To share *.elc files between Emacs w/ and w/o DL patch,
-;; this check must be done at load-time.
diff --git a/flim/patches/patch-luna.el b/flim/patches/patch-luna.el
index 81d4ed6b35..d69dfe2975 100644
--- a/flim/patches/patch-luna.el
+++ b/flim/patches/patch-luna.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./luna.el 2005-07-06 11:09:04.000000000 +0900
-+++ ././luna.el 2020-09-05 16:02:39.899396201 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/luna.el 2005-07-06 11:09:04.000000000 +0900
++++ ./luna.el 2023-08-31 08:29:38.593059572 +0900
@@ -1,4 +1,4 @@
-;;; luna.el --- tiny OOP system kernel
+;;; luna.el --- tiny OOP system kernel -*- lexical-binding: t -*-
@@ -79,7 +79,17 @@ sync to lexical-binding
;; Return the index number of SLOT-NAME in CLASS.
-@@ -230,8 +228,8 @@
+@@ -220,6 +218,9 @@
+ ;;; @ instance (entity)
+ ;;;
+
++(defvar luna-next-methods nil)
++(defvar luna-current-method-arguments nil)
++
+ (defmacro luna-class-name (entity)
+ "Return class-name of the ENTITY."
+ `(aref ,entity 0))
+@@ -230,8 +231,8 @@
(defmacro luna-get-obarray (entity)
`(aref ,entity 1))
@@ -90,7 +100,7 @@ sync to lexical-binding
(defmacro luna-slot-index (entity slot-name)
`(luna-class-slot-index (luna-find-class (luna-class-name ,entity))
-@@ -249,12 +247,13 @@
+@@ -249,12 +250,13 @@
`(luna-class-find-functions (luna-find-class (luna-class-name ,entity))
,service))
@@ -107,7 +117,18 @@ sync to lexical-binding
luna-current-method
luna-previous-return-value)
(while (and luna-next-methods
-@@ -307,10 +306,11 @@
+@@ -269,10 +271,6 @@
+ t))))
+ luna-previous-return-value))
+
+-(eval-when-compile
+- (defvar luna-next-methods nil)
+- (defvar luna-current-method-arguments nil))
+-
+ (defun luna-call-next-method ()
+ "Call the next method in the current method function.
+ A method function that has :around qualifier should call this function
+@@ -307,10 +305,11 @@
;;;
;; Find a method of ENTITY that handles MESSAGE, and call it with
diff --git a/flim/patches/patch-lunit.el b/flim/patches/patch-lunit.el
index 22237b9406..640bd8e471 100644
--- a/flim/patches/patch-lunit.el
+++ b/flim/patches/patch-lunit.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./lunit.el 2005-07-06 11:09:04.000000000 +0900
-+++ ././lunit.el 2020-09-05 16:02:39.899503364 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/lunit.el 2005-07-06 11:09:04.000000000 +0900
++++ ./lunit.el 2023-08-31 08:29:38.593841638 +0900
@@ -1,4 +1,4 @@
-;;; lunit.el --- simple testing framework for luna
+;;; lunit.el --- simple testing framework for luna -*- lexical-binding: t -*-
diff --git a/flim/patches/patch-md5.el b/flim/patches/patch-md5.el
index 47acee4806..bb123895b5 100644
--- a/flim/patches/patch-md5.el
+++ b/flim/patches/patch-md5.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./md5.el 2005-07-06 11:09:04.000000000 +0900
-+++ ././md5.el 2020-09-05 16:02:39.899576592 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/md5.el 2005-07-06 11:09:04.000000000 +0900
++++ ./md5.el 2023-08-31 08:29:38.594519992 +0900
@@ -1,4 +1,4 @@
-;;; md5.el --- MD5 Message Digest Algorithm.
+;;; md5.el --- MD5 Message Digest Algorithm. -*- lexical-binding: t -*-
diff --git a/flim/patches/patch-mel-g.el b/flim/patches/patch-mel-g.el
index fb5f6e6b65..a1d8681dbc 100644
--- a/flim/patches/patch-mel-g.el
+++ b/flim/patches/patch-mel-g.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mel-g.el 2005-07-06 11:09:04.000000000 +0900
-+++ ././mel-g.el 2020-09-05 16:02:39.899646590 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mel-g.el 2005-07-06 11:09:04.000000000 +0900
++++ ./mel-g.el 2023-08-31 08:29:38.595813291 +0900
@@ -1,4 +1,4 @@
-;;; mel-g.el --- Gzip64 encoder/decoder.
+;;; mel-g.el --- Gzip64 encoder/decoder. -*- lexical-binding: t -*-
diff --git a/flim/patches/patch-mel-q-ccl.el b/flim/patches/patch-mel-q-ccl.el
index 2f714fb95d..7e4830a238 100644
--- a/flim/patches/patch-mel-q-ccl.el
+++ b/flim/patches/patch-mel-q-ccl.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mel-q-ccl.el 2006-06-13 00:10:02.000000000 +0900
-+++ ././mel-q-ccl.el 2020-09-05 16:02:39.899821151 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mel-q-ccl.el 2006-06-13 00:10:02.000000000 +0900
++++ ./mel-q-ccl.el 2023-08-31 08:29:38.597755481 +0900
@@ -1,4 +1,4 @@
-;;; mel-q-ccl.el --- Quoted-Printable encoder/decoder using CCL.
+;;; mel-q-ccl.el --- Quoted-Printable encoder/decoder using CCL. -*- lexical-binding: t -*-
@@ -19,7 +19,49 @@ sync to lexical-binding
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil
-@@ -133,9 +133,7 @@
+@@ -79,12 +79,12 @@
+ nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil nil))
+
+ (defconst mel-ccl-16-to-256-table
+- (mapcar 'char-int "0123456789ABCDEF"))
++ (string-to-list "0123456789ABCDEF"))
+
+ (defconst mel-ccl-high-table
+ (vconcat
+ (mapcar
+- (lambda (v) (nth (lsh v -4) mel-ccl-16-to-256-table))
++ (lambda (v) (nth (ash v -4) mel-ccl-16-to-256-table))
+ mel-ccl-256-table)))
+
+ (defconst mel-ccl-low-table
+@@ -95,23 +95,21 @@
+
+ (defconst mel-ccl-u-raw
+ (mapcar
+- 'char-int
++ 'identity
+ "0123456789\
+ ABCDEFGHIJKLMNOPQRSTUVWXYZ\
+ abcdefghijklmnopqrstuvwxyz\
+ !@#$%&'()*+,-./:;<>@[\\]^`{|}~"))
+
+ (defconst mel-ccl-c-raw
+- (mapcar
+- 'char-int
++ (string-to-list
+ "0123456789\
+ ABCDEFGHIJKLMNOPQRSTUVWXYZ\
+ abcdefghijklmnopqrstuvwxyz\
+ !@#$%&'*+,-./:;<>@[]^`{|}~"))
+
+ (defconst mel-ccl-p-raw
+- (mapcar
+- 'char-int
++ (string-to-list
+ "0123456789\
+ ABCDEFGHIJKLMNOPQRSTUVWXYZ\
+ abcdefghijklmnopqrstuvwxyz\
+@@ -133,9 +131,7 @@
enc enc enc enc enc enc enc enc enc enc enc enc enc enc enc enc
enc enc enc enc enc enc enc enc enc enc enc enc enc enc enc enc
enc enc enc enc enc enc enc enc enc enc enc enc enc enc enc enc
@@ -30,7 +72,7 @@ sync to lexical-binding
;;; @ CCL programs
-@@ -146,13 +144,14 @@
+@@ -146,14 +142,15 @@
(define-ccl-program mel-ccl-decode-q
`(1
((loop
@@ -42,13 +84,25 @@ sync to lexical-binding
,@(mapcar
(lambda (r0)
(cond
- ((= r0 (char-int ?_))
+- ((= r0 (char-int ?_))
- `(write-repeat ? ))
+- ((= r0 (char-int ?=))
++ ((= r0 ?_)
+ `(write-repeat ?\s))
- ((= r0 (char-int ?=))
++ ((= r0 ?=)
`((loop
(read-branch
-@@ -188,7 +187,9 @@
+ r1
+@@ -172,7 +169,7 @@
+ `((write r0 ,(vconcat
+ (mapcar
+ (lambda (r0)
+- (logior (lsh r0 4) v))
++ (logior (ash r0 4) v))
+ mel-ccl-16-table)))
+ (break))
+ '(repeat)))
+@@ -188,7 +185,9 @@
`(3
(loop
(loop
@@ -59,7 +113,7 @@ sync to lexical-binding
r0
,@(mapcar
(lambda (r0)
-@@ -214,9 +215,7 @@
+@@ -214,9 +213,7 @@
(if (or (= r1 32) (member r1 raw))
'((r0 += 1) (repeat))
'((r0 += 3) (repeat))))
@@ -70,7 +124,7 @@ sync to lexical-binding
(define-ccl-program mel-ccl-encode-uq
(mel-ccl-encode-q-generic mel-ccl-u-raw))
-@@ -243,9 +242,7 @@
+@@ -243,9 +240,7 @@
(unless p
(setq p (cons branch (length eof-block-branches))
eof-block-branches (cons p eof-block-branches)))
@@ -81,7 +135,7 @@ sync to lexical-binding
(eval-when-compile
-@@ -265,9 +262,7 @@
+@@ -265,9 +260,7 @@
`(,(mel-ccl-set-eof-block crlf-eof)
(read-if (,reg == ?\n)
,succ
@@ -92,7 +146,7 @@ sync to lexical-binding
(eval-when-compile
-@@ -281,12 +276,10 @@
+@@ -281,12 +274,10 @@
(after-wsp 'r5)
(column 'r6)
(type 'r3)
@@ -106,7 +160,7 @@ sync to lexical-binding
`(4
((,column = 0)
(,after-wsp = 0)
-@@ -295,6 +288,7 @@
+@@ -295,13 +286,14 @@
(loop ; invariant: column <= 75
(loop
(loop
@@ -114,7 +168,15 @@ sync to lexical-binding
(branch
r0
,@(mapcar
-@@ -310,7 +304,7 @@
+ (lambda (r0)
+ (let ((tmp (aref mel-ccl-qp-table r0)))
+ (cond
+- ((eq r0 (char-int ?F))
++ ((eq r0 ?F)
+ `(if (,column == 0)
+ (,(mel-ccl-set-eof-block '((write "F") (end)))
+ (read-if (r0 == ?r)
+@@ -310,7 +302,7 @@
(,(mel-ccl-set-eof-block '((write "Fro") (end)))
(read-if (r0 == ?m)
(,(mel-ccl-set-eof-block '((write "From") (end)))
@@ -123,7 +185,16 @@ sync to lexical-binding
((,column = 7)
(,after-wsp = 1)
,(mel-ccl-set-eof-block '((write "From=20") (end)))
-@@ -359,8 +353,7 @@
+@@ -326,7 +318,7 @@
+ (write-repeat "F"))))
+ ((,type = ,type-raw) (break)) ; RAW
+ ))
+- ((eq r0 (char-int ?.))
++ ((eq r0 ?.)
+ `(if (,column == 0)
+ ,(mel-ccl-try-to-read-crlf
+ input-crlf 'r0
+@@ -359,8 +351,7 @@
((eq tmp 'cr) `((,type = ,(if input-crlf type-brk type-enc))
(break)))
((eq tmp 'lf) `((,type = ,(if input-crlf type-enc type-brk))
@@ -133,7 +204,7 @@ sync to lexical-binding
mel-ccl-256-table)))
;; r0:type{raw,enc,wsp,brk}
(branch
-@@ -580,8 +573,7 @@
+@@ -580,8 +571,7 @@
(,column = 0)
,@(if output-crlf '((write ?\r)) '())
,(mel-ccl-set-eof-block `(end))
@@ -143,7 +214,7 @@ sync to lexical-binding
(branch
,eof-block-reg
,@(reverse (mapcar 'car eof-block-branches))))))
-@@ -591,13 +583,13 @@
+@@ -591,13 +581,13 @@
((read r0)
(loop
(branch
@@ -155,11 +226,17 @@ sync to lexical-binding
(cond
((eq tmp 'raw) `(write-read-repeat r0))
- ((eq tmp 'wsp) (if (eq r0 (char-int ? ))
-+ ((eq tmp 'wsp) (if (eq r0 (char-int ?\s))
++ ((eq tmp 'wsp) (if (eq r0 ?\s)
`(r1 = 1)
`(r1 = 0)))
((eq tmp 'cr)
-@@ -639,7 +631,7 @@
+@@ -634,12 +624,12 @@
+ '((write ?\r)
+ (write-read-repeat r0))
+ '(write-read-repeat r0))))
+- ((eq r0 (char-int ?=))
++ ((eq r0 ?=)
+ ;; r0='='
`((read r0)
;; '=' r0
(r1 = (r0 == ?\t))
@@ -168,7 +245,7 @@ sync to lexical-binding
;; '=' r0:[\t ]
;; Skip transport-padding.
;; It should check CR LF after
-@@ -647,7 +639,7 @@
+@@ -647,7 +637,7 @@
(loop
(read-if (r0 == ?\t)
(repeat)
@@ -177,7 +254,34 @@ sync to lexical-binding
(repeat)
(break)))))
;; '=' [\t ]* r0:[^\t ]
-@@ -729,9 +721,8 @@
+@@ -656,7 +646,7 @@
+ ,@(mapcar
+ (lambda (r0)
+ (cond
+- ((eq r0 (char-int ?\r))
++ ((eq r0 ?\r)
+ (if input-crlf
+ ;; '=' [\t ]* r0='\r'
+ `((read r0)
+@@ -677,7 +667,7 @@
+ `((write ?=)
+ (read r0)
+ (repeat))))
+- ((eq r0 (char-int ?\n))
++ ((eq r0 ?\n)
+ (if input-crlf
+ ;; '=' [\t ]* r0='\n'
+ ;; invalid input (bare LF found) ->
+@@ -713,7 +703,7 @@
+ ,(vconcat
+ (mapcar
+ (lambda (r0)
+- (logior (lsh r0 4) tmp))
++ (logior (ash r0 4) tmp))
+ mel-ccl-16-table)))
+ ;; '=' [\t ]* r1:r0:[0-9A-F] r2:[^0-9A-F]
+ ;; invalid input
+@@ -729,9 +719,8 @@
(t
;; r0:[^\t\r -~]
;; invalid character found.
@@ -189,7 +293,24 @@ sync to lexical-binding
mel-ccl-256-table))
;; r1[0]:[\t ]
(loop
-@@ -807,10 +798,7 @@
+@@ -756,7 +745,7 @@
+ (break))))))
+ `((read r0)
+ (if (r0 == ?\ )
+- (,reg |= ,(lsh 1 bit))
++ (,reg |= ,(ash 1 bit))
+ (if (r0 != ?\t)
+ ((r6 = ,(+ (* regnum 28) bit))
+ (break)))))))
+@@ -800,17 +789,14 @@
+ 'append
+ (mapcar
+ (lambda (bit)
+- `((if (,reg & ,(lsh 1 bit))
++ `((if (,reg & ,(ash 1 bit))
+ (write ?\ )
+ (write ?\t))
+ (if (r6 == ,(+ (* regnum 28) bit 1))
(repeat))))
mel-ccl-28-table))))
'(0 1 2 3 4)))
@@ -201,7 +322,7 @@ sync to lexical-binding
(define-ccl-program mel-ccl-encode-quoted-printable-crlf-crlf
(mel-ccl-encode-quoted-printable-generic t t))
-@@ -902,7 +890,7 @@
+@@ -902,7 +888,7 @@
(decode-coding-string
(with-temp-buffer
(set-buffer-multibyte nil)
@@ -210,7 +331,7 @@ sync to lexical-binding
(buffer-string))
'mel-ccl-quoted-printable-lf-lf-rev)))
-@@ -914,8 +902,7 @@
+@@ -914,8 +900,7 @@
'quoted-printable-ccl-encode-region)
(mel-define-method-function
(mime-insert-encoded-file filename (nil "quoted-printable"))
@@ -220,7 +341,7 @@ sync to lexical-binding
(defun quoted-printable-ccl-decode-string (string)
"Decode quoted-printable encoded STRING."
-@@ -932,7 +919,11 @@
+@@ -932,7 +917,11 @@
(defun quoted-printable-ccl-write-decoded-region (start end filename)
"Decode quoted-printable encoded current region and write out to FILENAME."
(interactive "*r\nFWrite decoded region to file: ")
@@ -233,7 +354,7 @@ sync to lexical-binding
jka-compr-compression-info-list jam-zcat-filename-list)
(write-region start end filename)))
-@@ -967,19 +958,17 @@
+@@ -967,19 +956,16 @@
string
'mel-ccl-uq-rev))
@@ -251,8 +372,7 @@ sync to lexical-binding
- (aref status 0)))
- )
+(defun q-encoding-ccl-encoded-length (string &optional mode)
-+ (let ((status [nil nil nil nil nil nil nil nil nil]))
-+ (fillarray status nil) ; XXX: Is this necessary?
++ (let ((status (make-vector 9 nil)))
+ (ccl-execute-on-string
+ (cond
+ ((eq mode 'text) 'mel-ccl-count-uq)
diff --git a/flim/patches/patch-mel-q.el b/flim/patches/patch-mel-q.el
index 6816d18966..32d588cbb1 100644
--- a/flim/patches/patch-mel-q.el
+++ b/flim/patches/patch-mel-q.el
@@ -1,25 +1,30 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mel-q.el 2005-07-06 11:09:04.000000000 +0900
-+++ ././mel-q.el 2020-09-05 16:02:39.899931560 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mel-q.el 2005-07-06 11:09:04.000000000 +0900
++++ ./mel-q.el 2023-08-31 08:29:38.599294148 +0900
@@ -1,4 +1,4 @@
-;;; mel-q.el --- Quoted-Printable encoder/decoder.
+;;; mel-q.el --- Quoted-Printable encoder/decoder. -*- lexical-binding: t -*-
;; Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
-@@ -31,7 +31,7 @@
- ;; XXX: should provide char-list instead of string-to-char-list.
- ;; XXx: and also the macro `as-binary-process' should be provided
- ;; XXx: by the module "pces" which will be loaded by way of "poem".
+@@ -26,12 +26,7 @@
+ ;;; Code:
+
+ (require 'mime-def)
+-(require 'path-util)
+-(eval-when-compile
+- ;; XXX: should provide char-list instead of string-to-char-list.
+- ;; XXx: and also the macro `as-binary-process' should be provided
+- ;; XXx: by the module "pces" which will be loaded by way of "poem".
- (require 'poem))
-+ (require 'pces))
++(require 'pces)
;;; @ Quoted-Printable encoder
-@@ -40,7 +40,8 @@
+@@ -40,7 +35,8 @@
(defsubst quoted-printable-quote-char (character)
(concat
"="
@@ -29,7 +34,7 @@ sync to lexical-binding
(char-to-string (aref quoted-printable-hex-chars (logand character 15)))))
(defun quoted-printable-internal-encode-region (start end)
-@@ -58,9 +59,9 @@
+@@ -58,9 +54,9 @@
(forward-char)
(setq col 0))
(t
@@ -41,7 +46,7 @@ sync to lexical-binding
(eq (char-after (1+ (point))) ?\n))
(forward-char)
(insert "=\n")
-@@ -71,7 +72,7 @@
+@@ -71,7 +67,7 @@
(eq (char-after (1+ (point))) ?r)
(eq (char-after (+ 2 (point))) ?o)
(eq (char-after (+ 3 (point))) ?m)
@@ -50,9 +55,13 @@ sync to lexical-binding
(delete-region (point)(1+ (point)))
(insert "=46") ; moved to ?r.
(forward-char 4) ; skip "rom ".
-@@ -113,8 +114,7 @@
+@@ -112,9 +108,11 @@
+ (replace-match "")))))
++(declare-function exec-installed-p "path-util"
++ (file &optional paths suffixes))
++
(defvar quoted-printable-internal-encoding-limit
- (if (and (featurep 'xemacs)(featurep 'mule))
- 0
@@ -60,7 +69,7 @@ sync to lexical-binding
(require 'path-util)
(if (exec-installed-p "mmencode")
1000
-@@ -173,8 +173,20 @@
+@@ -173,8 +171,20 @@
(defsubst quoted-printable-hex-char-to-num (chr)
(cond ((<= ?a chr) (+ (- chr ?a) 10))
((<= ?A chr) (+ (- chr ?A) 10))
@@ -83,7 +92,7 @@ sync to lexical-binding
(defun quoted-printable-internal-decode-region (start end)
(save-excursion
-@@ -186,20 +198,21 @@
+@@ -186,20 +196,21 @@
((eolp)
;; unfold soft line break.
(delete-region (1- (point))(1+ (point))))
@@ -111,7 +120,7 @@ sync to lexical-binding
(delete-region (1- (point))(+ 2 (point))))))
(t
;; invalid encoding.
-@@ -295,33 +308,33 @@
+@@ -295,33 +306,33 @@
`phrase'."
(let ((specials (cdr (or (assq mode q-encoding-special-chars-alist)
(assq 'phrase q-encoding-special-chars-alist)))))
diff --git a/flim/patches/patch-mel-u.el b/flim/patches/patch-mel-u.el
index b9a0491af1..0354c08a87 100644
--- a/flim/patches/patch-mel-u.el
+++ b/flim/patches/patch-mel-u.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mel-u.el 2005-07-06 11:09:04.000000000 +0900
-+++ ././mel-u.el 2020-09-05 16:02:39.900016173 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mel-u.el 2005-07-06 11:09:04.000000000 +0900
++++ ./mel-u.el 2023-08-31 08:29:38.600545058 +0900
@@ -1,4 +1,4 @@
-;;; mel-u.el --- uuencode encoder/decoder.
+;;; mel-u.el --- uuencode encoder/decoder. -*- lexical-binding: t -*-
diff --git a/flim/patches/patch-mel.el b/flim/patches/patch-mel.el
index 457b7221fc..10e908c4b3 100644
--- a/flim/patches/patch-mel.el
+++ b/flim/patches/patch-mel.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mel.el 2007-06-18 19:58:54.000000000 +0900
-+++ ././mel.el 2020-09-05 16:02:39.900137733 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mel.el 2007-06-18 19:58:54.000000000 +0900
++++ ./mel.el 2023-08-31 08:29:38.601973143 +0900
@@ -1,4 +1,4 @@
-;;; mel.el --- A MIME encoding/decoding library.
+;;; mel.el --- A MIME encoding/decoding library. -*- lexical-binding: t -*-
@@ -76,7 +76,7 @@ sync to lexical-binding
(let ((coding-system-for-write 'binary)
jka-compr-compression-info-list jam-zcat-filename-list)
(write-region start end filename)))
-@@ -142,86 +145,126 @@
+@@ -142,86 +145,134 @@
'identity)
(mel-define-method-function (mime-decode-string string (nil "binary"))
'identity)
@@ -100,7 +100,9 @@ sync to lexical-binding
+(defvar mel-b-builtin t)
+
+(defcustom mel-b-builtin-garbage-strategy 'asis
-+ "When non-nil, base64 decoder functions handle non-encoded garbage. When value is asis decoders keep garbage and when value is discard decoders delete garbage."
++"When non-nil, base64 decoder functions handle non-encoded
++garbage. When value is asis decoders keep garbage and when value
++is discard decoders delete garbage."
+ :group 'mime
+ :type '(choice (const :tag "Keep as is" asis)
+ (const :tag "Discard" discard)
@@ -146,7 +148,9 @@ sync to lexical-binding
- (concat "\\`" B-encoded-text-regexp "\\'"))
- string)
+(defun mel-b-builtin-decode-string (string)
-+ "Decode base64 encoded STRING with garbage handling. Garbage handling strategy is decided by `mel-b-builtin-garbage-strategy'. Return decoded string."
++ "Decode base64 encoded STRING with garbage handling.
++Garbage handling strategy is decided by `mel-b-builtin-garbage-strategy'.
++Return decoded string."
+ (if (null mel-b-builtin-garbage-strategy)
+ (base64-decode-string string)
+ (condition-case error
@@ -175,7 +179,8 @@ sync to lexical-binding
+(mel-define-method-function (mime-encode-region start end (nil "base64"))
+ 'base64-encode-region)
+(defun mel-b-builtin-decode-region (start end)
-+ "Decode base64 encoded region between START and END with garbage handling. Garbage handling strategy is decided by `mel-b-builtin-garbage-strategy'."
++ "Decode base64 encoded region between START and END with garbage handling.
++Garbage handling strategy is decided by `mel-b-builtin-garbage-strategy'."
+ (if (null mel-b-builtin-garbage-strategy)
+ (base64-decode-region start end)
+ (condition-case error
@@ -243,7 +248,9 @@ sync to lexical-binding
- (progn
- (require 'path-util)
- (module-installed-p 'mel-b-ccl))))
--
++(declare-function module-installed-p "path-util"
++ (module &optional paths))
+
(defvar mel-q-ccl-module
- (and (featurep 'mule)
- (progn
@@ -265,7 +272,7 @@ sync to lexical-binding
;;; @ region
;;;
-@@ -232,9 +275,7 @@
+@@ -232,9 +283,7 @@
ENCODING must be string."
(interactive
(list (region-beginning)(region-end)
@@ -276,7 +283,7 @@ sync to lexical-binding
(funcall (mel-find-function 'mime-encode-region encoding) start end))
-@@ -244,9 +285,7 @@
+@@ -244,9 +293,7 @@
ENCODING must be string."
(interactive
(list (region-beginning)(region-end)
@@ -287,7 +294,7 @@ sync to lexical-binding
(funcall (mel-find-function 'mime-decode-region encoding)
start end))
-@@ -299,7 +338,7 @@
+@@ -299,7 +346,7 @@
(while (< i len)
(setq chr (aref string i))
(if (or (Q-encoding-printable-char-p chr mode)
@@ -296,7 +303,7 @@ sync to lexical-binding
(setq l (+ l 1))
(setq l (+ l 3)))
(setq i (+ i 1)))
-@@ -314,9 +353,7 @@
+@@ -314,9 +361,7 @@
"Insert file FILENAME encoded by ENCODING format."
(interactive
(list (read-file-name "Insert encoded file: ")
@@ -307,7 +314,7 @@ sync to lexical-binding
(funcall (mel-find-function 'mime-insert-encoded-file encoding)
filename))
-@@ -328,9 +365,7 @@
+@@ -328,9 +373,7 @@
(interactive
(list (region-beginning)(region-end)
(read-file-name "Write decoded region to file: ")
diff --git a/flim/patches/patch-mime-conf.el b/flim/patches/patch-mime-conf.el
index a3d5e13e64..84c044250e 100644
--- a/flim/patches/patch-mime-conf.el
+++ b/flim/patches/patch-mime-conf.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mime-conf.el 2005-07-06 11:09:04.000000000 +0900
-+++ ././mime-conf.el 2020-09-05 16:02:39.900236870 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mime-conf.el 2005-07-06 11:09:04.000000000 +0900
++++ ./mime-conf.el 2023-08-31 08:29:38.602782237 +0900
@@ -1,4 +1,4 @@
-;;; mime-conf.el --- mailcap parser and MIME playback configuration
+;;; mime-conf.el --- mailcap parser and MIME playback configuration -*- lexical-binding: t -*-
@@ -141,6 +141,19 @@ sync to lexical-binding
;;;###autoload
+@@ -203,9 +190,9 @@
+ SITUATION is an association-list about information of entity. Its key
+ may be:
+
+- 'type primary media-type
+- 'subtype media-subtype
+- 'filename filename
++ \\='type primary media-type
++ \\='subtype media-subtype
++ \\='filename filename
+ STRING parameter of Content-Type field"
+ (let ((i 0)
+ (len (length mtext))
@@ -213,58 +200,52 @@
dest)
(while (< i len)
diff --git a/flim/patches/patch-mime-def.el b/flim/patches/patch-mime-def.el
index 75d004587b..e51f5dea89 100644
--- a/flim/patches/patch-mime-def.el
+++ b/flim/patches/patch-mime-def.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mime-def.el 2007-09-06 17:04:09.000000000 +0900
-+++ ././mime-def.el 2020-09-05 16:02:39.900365807 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mime-def.el 2007-09-06 17:04:09.000000000 +0900
++++ ./mime-def.el 2023-08-31 08:29:38.604422981 +0900
@@ -1,4 +1,4 @@
-;;; mime-def.el --- definition module about MIME -*- coding: iso-8859-4; -*-
+;;; mime-def.el --- definition module about MIME -*- lexical-binding: t -*-
@@ -29,7 +29,17 @@ sync to lexical-binding
"*Alist to specify field encoding method.
Its key is field-name, value is encoding method.
-@@ -142,8 +141,14 @@
+@@ -130,9 +129,6 @@
+ (defsubst regexp-or (&rest args)
+ (concat "\\(" (mapconcat (function identity) args "\\|") "\\)"))
+
+-(or (fboundp 'char-int)
+- (defalias 'char-int 'identity))
+-
+
+ ;;; @ MIME constants
+ ;;;
+@@ -142,8 +138,14 @@
(defconst mime-token-regexp
(concat "[^" mime-tspecial-char-list "\000-\040]+"))
(defconst mime-attribute-char-regexp
@@ -45,7 +55,7 @@ sync to lexical-binding
"]"))
(defconst mime-charset-regexp
-@@ -151,7 +156,8 @@
+@@ -151,7 +153,8 @@
"*'%" ; should not include "%"?
"]+"))
@@ -55,7 +65,7 @@ sync to lexical-binding
;; (defconst mime-language-regexp "[A-Za-z]+\\(-[A-Za-z]+\\)*")
(defconst mime-language-regexp "[-A-Za-z]+")
-@@ -275,7 +281,8 @@
+@@ -275,7 +278,8 @@
(make-variable-buffer-local 'mime-message-structure)
@@ -65,7 +75,7 @@ sync to lexical-binding
;;; @ for mel-backend
-@@ -294,9 +301,7 @@
+@@ -294,9 +298,7 @@
`((defun ,name ,args
,@rest
(funcall (mel-find-function ',name ,(car (last args)))
@@ -76,7 +86,7 @@ sync to lexical-binding
(put 'mel-define-service 'lisp-indent-function 'defun)
-@@ -310,10 +315,8 @@
+@@ -310,10 +312,8 @@
(while (and rest
(progn
(require (car rest))
@@ -89,7 +99,7 @@ sync to lexical-binding
f))))
(defsubst mel-copy-method (service src-backend dst-backend)
-@@ -323,8 +326,7 @@
+@@ -323,8 +323,7 @@
(when f
(setq sym (intern dst-backend oa))
(or (fboundp sym)
@@ -99,7 +109,7 @@ sync to lexical-binding
(defsubst mel-copy-backend (src-backend dst-backend)
(let ((services mel-service-list))
-@@ -338,8 +340,7 @@
+@@ -338,8 +337,7 @@
Each parent must be backend name (string)."
(cons 'progn
(mapcar (lambda (parent)
@@ -109,7 +119,7 @@ sync to lexical-binding
parents)))
(defmacro mel-define-method (name args &rest body)
-@@ -380,8 +381,7 @@
+@@ -380,19 +378,25 @@
(class (nth 1 specializer)))
`(progn
(define-function ,function
@@ -117,15 +127,16 @@ sync to lexical-binding
- )))
+ (intern ,class ,(intern (format "%s-obarray" name)))))))
- (defvar base64-dl-module
- (if (and (fboundp 'base64-encode-string)
-@@ -390,9 +390,23 @@
- (if (fboundp 'dynamic-link)
- (let ((path (expand-file-name "base64.so" exec-directory)))
- (and (file-exists-p path)
+-(defvar base64-dl-module
+- (if (and (fboundp 'base64-encode-string)
+- (subrp (symbol-function 'base64-encode-string)))
+- nil
+- (if (fboundp 'dynamic-link)
+- (let ((path (expand-file-name "base64.so" exec-directory)))
+- (and (file-exists-p path)
- path)
- ))))
-+ path)))))
++(defvar base64-dl-module nil)
+(defsubst mime-charset-decode-string (string charset &optional lbt)
+ "Decode the STRING as MIME CHARSET.
diff --git a/flim/patches/patch-mime-parse.el b/flim/patches/patch-mime-parse.el
index 0caed3ec0f..adfae13519 100644
--- a/flim/patches/patch-mime-parse.el
+++ b/flim/patches/patch-mime-parse.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mime-parse.el 2020-09-05 13:48:06.215015344 +0900
-+++ ././mime-parse.el 2020-09-05 16:02:39.901141091 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mime-parse.el 2023-09-02 12:45:03.684120507 +0900
++++ ./mime-parse.el 2023-08-31 08:29:38.610505135 +0900
@@ -1,4 +1,4 @@
-;;; mime-parse.el --- MIME message parser
+;;; mime-parse.el --- MIME message parser -*- lexical-binding: t -*-
@@ -25,7 +25,7 @@ sync to lexical-binding
(autoload 'mime-entity-body-buffer "mime")
(autoload 'mime-entity-body-start-point "mime")
-@@ -37,6 +41,131 @@
+@@ -37,6 +41,132 @@
;;; @ lexical analyzer
;;;
@@ -80,12 +80,12 @@ sync to lexical-binding
+ r0
+ ,@(let* ((count (1+ (max tag ?\\)))
+ (result (make-vector count '(write-repeat r0))))
-+ (aset result tag '(break))
+ (aset result ?\\ `((write "\\\\")
+ (read r0)
+ ,wrt
+ (repeat)))
+ (aset result ?\" '((write "\\\"") (repeat)))
++ (aset result tag '(break))
+ (mapcar 'identity result)))
+ (write-repeat r0))
+ (write "\")")
@@ -150,14 +150,15 @@ sync to lexical-binding
+ "Specify CCL-program symbol for `mime-lexical-analyze'.
+When nil, do not use CCL.
+See docstring of `std11-ccl-lexical-analyzer' for details of CCL-program.
-+If you modify `mime-lexical-analyzer', set this variable to nil or prepare corresponding CCL-program."
++If you modify `mime-lexical-analyzer', set this variable to nil
++or prepare corresponding CCL-program."
+ :group 'mime
+ :type '(choice symbol (const :tag "Do not use CCL." nil)))
+
(defcustom mime-lexical-analyzer
'(std11-analyze-quoted-string
std11-analyze-domain-literal
-@@ -70,22 +199,27 @@
+@@ -70,22 +200,27 @@
(defun mime-lexical-analyze (string)
"Analyze STRING as lexical tokens of MIME."
@@ -201,7 +202,7 @@ sync to lexical-binding
;;; @ field parser
-@@ -103,11 +237,7 @@
+@@ -103,11 +238,7 @@
(delete-region (point)(- (point) 3)))))
(setq text (buffer-string))
(when charset
@@ -214,16 +215,16 @@ sync to lexical-binding
(when language
(put-text-property 0 (length text) 'mime-language language text))
text))
-@@ -122,7 +252,7 @@
+@@ -122,7 +253,7 @@
(concat mime-attribute-char-regexp "+")))
(goto-char (match-end 0)))
(not (eobp)))
- (insert (prog1 (format "%%%02X" (char-int (char-after)))
-+ (insert (prog1 (format "%%%02X" (char-int (following-char)))
++ (insert (prog1 (format "%%%02X" (following-char))
(delete-region (point)(1+ (point))))))
(buffer-string)))
-@@ -237,7 +367,211 @@
+@@ -237,12 +368,216 @@
;;; for compatibility with flim-1_13-rfc2231 API.
(defalias 'mime-parse-parameters-from-list 'mime-decode-parameters)
@@ -436,7 +437,13 @@ sync to lexical-binding
(defun mime-parse-parameters (tokens)
"Parse TOKENS as MIME parameter values.
-@@ -294,8 +628,7 @@
+ Return a property list, which is a list of the form
+-\(PARAMETER-NAME1 VALUE1 PARAMETER-NAME2 VALUE2...)."
++(PARAMETER-NAME1 VALUE1 PARAMETER-NAME2 VALUE2...)."
+ (let (params attribute)
+ (while (and tokens
+ (eq (car (car tokens)) 'tspecials)
+@@ -294,8 +629,7 @@
If Content-Type field is not found, return nil."
(let ((field-body (std11-field-body "Content-Type")))
(if field-body
@@ -446,7 +453,7 @@ sync to lexical-binding
;;; @@ Content-Disposition
-@@ -321,8 +654,7 @@
+@@ -321,8 +655,7 @@
If Content-Disposition field is not found, return nil."
(let ((field-body (std11-field-body "Content-Disposition")))
(if field-body
@@ -456,7 +463,7 @@ sync to lexical-binding
;;; @@ Content-Transfer-Encoding
-@@ -345,8 +677,7 @@
+@@ -345,8 +678,7 @@
If Content-Transfer-Encoding field is not found, return nil."
(let ((field-body (std11-field-body "Content-Transfer-Encoding")))
(if field-body
@@ -466,7 +473,7 @@ sync to lexical-binding
;;; @@ Content-ID / Message-ID
-@@ -360,10 +691,13 @@
+@@ -360,10 +692,13 @@
;;;###autoload
(defun mime-uri-parse-cid (string)
"Parse STRING as cid URI."
@@ -484,7 +491,7 @@ sync to lexical-binding
;;; @ message parser
-@@ -470,12 +804,8 @@
+@@ -470,12 +805,8 @@
body-start (point-min)))
(save-restriction
(narrow-to-region header-start header-end)
@@ -499,7 +506,7 @@ sync to lexical-binding
(luna-make-entity representation-type
:location (current-buffer)
:content-type content-type
-@@ -485,8 +815,7 @@
+@@ -485,8 +816,7 @@
:header-start header-start
:header-end header-end
:body-start body-start
diff --git a/flim/patches/patch-mime.el b/flim/patches/patch-mime.el
index 9487f0a058..c06138f5e0 100644
--- a/flim/patches/patch-mime.el
+++ b/flim/patches/patch-mime.el
@@ -1,16 +1,24 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mime.el 2005-07-06 11:09:04.000000000 +0900
-+++ ././mime.el 2020-09-05 16:02:39.901261920 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mime.el 2005-07-06 11:09:04.000000000 +0900
++++ ./mime.el 2023-08-31 08:29:38.612092624 +0900
@@ -1,4 +1,4 @@
-;;; mime.el --- MIME library module
+;;; mime.el --- MIME library module -*- lexical-binding: t -*-
;; Copyright (C) 1998,1999,2000,2001,2003 Free Software Foundation, Inc.
-@@ -61,9 +61,7 @@
+@@ -25,6 +25,7 @@
+ ;;; Code:
+
+ (require 'alist)
++(require 'luna)
+ (require 'std11)
+ (require 'mime-def)
+ (require 'eword-decode)
+@@ -61,9 +62,7 @@
"Parse STRING as cid URI.")
(autoload 'mime-parse-buffer "mime-parse"
@@ -21,7 +29,7 @@ sync to lexical-binding
(autoload 'mime-encode-field-body "eword-encode"
"Encode FIELD-BODY as FIELD-NAME, and return the result.")
-@@ -110,9 +108,7 @@
+@@ -110,9 +109,7 @@
message
(let ((rc (nth sn (mime-entity-children message))))
(if rc
@@ -32,7 +40,7 @@ sync to lexical-binding
(defun mime-find-entity-from-node-id (entity-node-id message)
"Return entity from ENTITY-NODE-ID in MESSAGE."
-@@ -273,8 +269,7 @@
+@@ -273,8 +270,7 @@
(let ((ret (mime-entity-fetch-field entity "Content-Type")))
(if ret
(mime-entity-set-content-type-internal
@@ -42,7 +50,7 @@ sync to lexical-binding
(defun mime-entity-content-disposition (entity)
"Return content-disposition of ENTITY."
-@@ -282,8 +277,7 @@
+@@ -282,8 +278,7 @@
(let ((ret (mime-entity-fetch-field entity "Content-Disposition")))
(if ret
(mime-entity-set-content-disposition-internal
@@ -52,7 +60,7 @@ sync to lexical-binding
(defun mime-entity-encoding (entity &optional default-encoding)
"Return content-transfer-encoding of ENTITY.
-@@ -295,8 +289,7 @@
+@@ -295,8 +290,7 @@
(mime-entity-set-encoding-internal
entity
(or (and ret (mime-parse-Content-Transfer-Encoding ret))
@@ -62,7 +70,7 @@ sync to lexical-binding
(defvar mime-field-parser-alist
'((Return-Path . std11-parse-route-addr)
-@@ -324,8 +317,7 @@
+@@ -324,8 +318,7 @@
(In-Reply-To . std11-parse-msg-ids)
(References . std11-parse-msg-ids)
@@ -72,7 +80,7 @@ sync to lexical-binding
(defun mime-entity-read-field (entity field-name)
(let ((sym (if (symbolp field-name)
-@@ -334,14 +326,11 @@
+@@ -334,14 +327,11 @@
(setq field-name (symbol-name field-name)))
(intern (capitalize field-name)))))
(cond ((eq sym 'Content-Type)
@@ -90,7 +98,7 @@ sync to lexical-binding
(t
(let* ((header (mime-entity-parsed-header-internal entity))
(field (cdr (assq sym header))))
-@@ -355,8 +344,7 @@
+@@ -355,8 +345,7 @@
(if parser
(funcall parser
(eword-lexical-analyze field-body))
@@ -100,7 +108,7 @@ sync to lexical-binding
(mime-entity-set-parsed-header-internal
entity (put-alist sym field header))
field))))))))
-@@ -385,22 +373,20 @@
+@@ -385,22 +374,20 @@
(mime-insert-entity-body entity)
(if (re-search-forward "^begin [0-9]+ " nil t)
(if (looking-at ".+$")
diff --git a/flim/patches/patch-mmbuffer.el b/flim/patches/patch-mmbuffer.el
index a0b021788e..1912b348ff 100644
--- a/flim/patches/patch-mmbuffer.el
+++ b/flim/patches/patch-mmbuffer.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mmbuffer.el 2005-07-06 11:09:04.000000000 +0900
-+++ ././mmbuffer.el 2020-09-05 16:02:39.901364499 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mmbuffer.el 2005-07-06 11:09:04.000000000 +0900
++++ ./mmbuffer.el 2023-08-31 08:29:38.613469028 +0900
@@ -1,4 +1,4 @@
-;;; mmbuffer.el --- MIME entity module for binary buffer
+;;; mmbuffer.el --- MIME entity module for binary buffer -*- lexical-binding: t -*-
diff --git a/flim/patches/patch-mmcooked.el b/flim/patches/patch-mmcooked.el
index 9e6eb54720..1ff19e32de 100644
--- a/flim/patches/patch-mmcooked.el
+++ b/flim/patches/patch-mmcooked.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mmcooked.el 2005-07-06 11:09:05.000000000 +0900
-+++ ././mmcooked.el 2020-09-05 16:02:39.901426573 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mmcooked.el 2005-07-06 11:09:05.000000000 +0900
++++ ./mmcooked.el 2023-08-31 08:29:38.614742081 +0900
@@ -1,4 +1,4 @@
-;;; mmcooked.el --- MIME entity implementation for binary buffer
+;;; mmcooked.el --- MIME entity implementation for binary buffer -*- lexical-binding: t -*-
diff --git a/flim/patches/patch-mmexternal.el b/flim/patches/patch-mmexternal.el
index 2f24f84d53..ba6ef8886b 100644
--- a/flim/patches/patch-mmexternal.el
+++ b/flim/patches/patch-mmexternal.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mmexternal.el 2005-07-06 11:09:05.000000000 +0900
-+++ ././mmexternal.el 2020-09-05 16:02:39.901504841 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mmexternal.el 2005-07-06 11:09:05.000000000 +0900
++++ ./mmexternal.el 2023-08-31 08:29:38.615468807 +0900
@@ -1,4 +1,4 @@
-;;; mmexternal.el --- MIME entity module for external buffer
+;;; mmexternal.el --- MIME entity module for external buffer -*- lexical-binding: t -*-
diff --git a/flim/patches/patch-mmgeneric.el b/flim/patches/patch-mmgeneric.el
index 6079050e4a..6cc3d03c3c 100644
--- a/flim/patches/patch-mmgeneric.el
+++ b/flim/patches/patch-mmgeneric.el
@@ -1,16 +1,31 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./mmgeneric.el 2005-07-06 11:09:05.000000000 +0900
-+++ ././mmgeneric.el 2020-09-05 16:02:39.901580357 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/mmgeneric.el 2005-07-06 11:09:05.000000000 +0900
++++ ./mmgeneric.el 2023-08-31 08:29:38.616263525 +0900
@@ -1,4 +1,4 @@
-;;; mmgeneric.el --- MIME generic entity module
+;;; mmgeneric.el --- MIME generic entity module -*- lexical-binding: t -*-
;; Copyright (C) 1995,96,97,98,99,2000 Free Software Foundation, Inc.
-@@ -50,8 +50,7 @@
+@@ -24,11 +24,10 @@
+
+ ;;; Code:
+
++(require 'mcharset)
++(require 'std11)
+ (require 'luna)
+-
+-(eval-when-compile
+- (require 'eword-decode) ; mime-find-field-presentation-method
+- )
++(require 'eword-decode)
+
+
+ ;;; @ MIME entity
+@@ -50,8 +49,7 @@
;; for other fields
original-header parsed-header))
@@ -20,7 +35,7 @@ sync to lexical-binding
(defalias 'mime-entity-representation-type-internal 'luna-class-name)
(defalias 'mime-entity-set-representation-type-internal 'luna-set-class-name)
-@@ -70,8 +69,7 @@
+@@ -70,8 +68,7 @@
(mime-entity-content-type entity)
"charset")
default-mime-charset)
@@ -30,7 +45,7 @@ sync to lexical-binding
;;; @ for mm-backend
-@@ -83,8 +81,7 @@
+@@ -83,8 +80,7 @@
(defmacro mm-define-backend (type &optional parents)
`(luna-define-class ,(mm-expand-class-name type)
,(nconc (mapcar (lambda (parent)
@@ -40,7 +55,7 @@ sync to lexical-binding
parents)
'(mime-entity))))
-@@ -96,8 +93,7 @@
+@@ -96,8 +92,7 @@
(cons (list (car spec)
(mm-expand-class-name (nth 1 spec)))
(cdr args)))
@@ -50,7 +65,7 @@ sync to lexical-binding
(put 'mm-define-method 'lisp-indent-function 'defun)
-@@ -105,8 +101,7 @@
+@@ -105,8 +100,7 @@
(&define name ((arg symbolp)
[&rest arg]
[&optional ["&optional" arg &rest arg]]
@@ -60,46 +75,99 @@ sync to lexical-binding
def-body))
-@@ -121,18 +116,14 @@
- (while visible-fields
- (let ((regexp (car visible-fields)))
- (if (string-match regexp field-name)
+@@ -117,57 +111,48 @@
+ ;; mechanism. Please discuss in the emacs-mime mailing lists.
+
+ (defun mime-visible-field-p (field-name visible-fields invisible-fields)
+- (or (catch 'found
+- (while visible-fields
+- (let ((regexp (car visible-fields)))
+- (if (string-match regexp field-name)
- (throw 'found t)
- ))
- (setq visible-fields (cdr visible-fields))
- ))
-+ (throw 'found t)))
-+ (setq visible-fields (cdr visible-fields))))
- (catch 'found
- (while invisible-fields
- (let ((regexp (car invisible-fields)))
- (if (string-match regexp field-name)
+- (catch 'found
+- (while invisible-fields
+- (let ((regexp (car invisible-fields)))
+- (if (string-match regexp field-name)
- (throw 'found nil)
- ))
- (setq invisible-fields (cdr invisible-fields))
- )
-+ (throw 'found nil)))
-+ (setq invisible-fields (cdr invisible-fields)))
- t)))
+- t)))
++ (let ((case-fold-search t))
++ (catch 'found
++ (while visible-fields
++ (when (string-match (car visible-fields) field-name)
++ (throw 'found t))
++ (setq visible-fields (cdr visible-fields)))
++ (while invisible-fields
++ (when (string-match (car invisible-fields) field-name)
++ (throw 'found nil))
++ (setq invisible-fields (cdr invisible-fields)))
++ t)))
(defun mime-insert-header-from-buffer (buffer start end
-@@ -142,8 +133,7 @@
- (mode-obj (mime-find-field-presentation-method 'wide))
- field-decoder
- f-b p f-e field-name len field field-body)
+ &optional invisible-fields
+ visible-fields)
+- (let ((the-buf (current-buffer))
+- (mode-obj (mime-find-field-presentation-method 'wide))
+- field-decoder
+- f-b p f-e field-name len field field-body)
- (save-excursion
- (set-buffer buffer)
-+ (with-current-buffer buffer
- (save-restriction
- (narrow-to-region start end)
- (goto-char start)
-@@ -166,8 +156,7 @@
- (funcall field-decoder field-body len)
- ;; Don't decode
- field-body))
+- (save-restriction
+- (narrow-to-region start end)
+- (goto-char start)
+- (while (re-search-forward std11-field-head-regexp nil t)
+- (setq f-b (match-beginning 0)
+- p (match-end 0)
+- field-name (buffer-substring f-b p)
+- len (string-width field-name)
+- f-e (std11-field-end))
+- (when (mime-visible-field-p field-name
+- visible-fields invisible-fields)
+- (setq field (intern
+- (capitalize (buffer-substring f-b (1- p))))
+- field-body (buffer-substring p f-e)
+- field-decoder (inline (mime-find-field-decoder-internal
+- field mode-obj)))
+- (with-current-buffer the-buf
+- (insert field-name)
+- (insert (if field-decoder
+- (funcall field-decoder field-body len)
+- ;; Don't decode
+- field-body))
- (insert "\n")
- )))))))
-+ (insert "\n"))))))))
++ (let ((mode-obj (mime-find-field-presentation-method 'wide))
++ field-decoder f-b p field-name field-body result)
++ (with-current-buffer buffer
++ (goto-char start)
++ (while (re-search-forward std11-field-head-regexp end t)
++ (setq f-b (match-beginning 0)
++ p (match-end 0)
++ field-name (buffer-substring f-b p))
++ (when (mime-visible-field-p field-name
++ visible-fields invisible-fields)
++ (setq field-body (buffer-substring p (std11-field-end end))
++ field-decoder
++ (mime-find-field-decoder-internal
++ (intern (capitalize
++ (buffer-substring-no-properties f-b (1- p))))
++ mode-obj)
++ result
++ (cons "\n"
++ (cons (if field-decoder
++ (funcall field-decoder
++ field-body
++ (string-width field-name))
++ ;; Don't decode
++ field-body)
++ (cons field-name result)))))))
++ (when result
++ (apply #'insert (nreverse result)))))
;;; @ end
diff --git a/flim/patches/patch-qmtp.el b/flim/patches/patch-qmtp.el
index 5d050ce297..be18cc47e4 100644
--- a/flim/patches/patch-qmtp.el
+++ b/flim/patches/patch-qmtp.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./qmtp.el 2005-07-06 11:09:05.000000000 +0900
-+++ ././qmtp.el 2020-09-05 16:02:39.901653957 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/qmtp.el 2005-07-06 11:09:05.000000000 +0900
++++ ./qmtp.el 2023-08-31 08:29:38.616972354 +0900
@@ -1,4 +1,4 @@
-;;; qmtp.el --- basic functions to send mail with QMTP server
+;;; qmtp.el --- basic functions to send mail with QMTP server -*- lexical-binding: t -*-
diff --git a/flim/patches/patch-sasl-scram.el b/flim/patches/patch-sasl-scram.el
index 76cfee132b..f0452fe4e6 100644
--- a/flim/patches/patch-sasl-scram.el
+++ b/flim/patches/patch-sasl-scram.el
@@ -1,15 +1,27 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./sasl-scram.el 2005-07-06 11:09:05.000000000 +0900
-+++ ././sasl-scram.el 2020-09-05 16:02:39.901895077 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/sasl-scram.el 2005-07-06 11:09:05.000000000 +0900
++++ ./sasl-scram.el 2023-08-31 08:29:38.617749986 +0900
@@ -1,4 +1,4 @@
-;;; sasl-scram.el --- Compute SCRAM-MD5.
+;;; sasl-scram.el --- Compute SCRAM-MD5. -*- lexical-binding: t -*-
;; Copyright (C) 1999 Shuhei KOBAYASHI
+@@ -88,9 +88,9 @@
+ (if no-security-layer
+ (aset csecinfo 0 (logior (aref csecinfo 0) 1))
+ (aset csecinfo 1
+- (lsh (logand buffer-size (lsh 255 16)) -16))
++ (ash (logand buffer-size (ash 255 16)) -16))
+ (aset csecinfo 2
+- (lsh (logand buffer-size (lsh 255 8)) -8))
++ (ash (logand buffer-size (ash 255 8)) -8))
+ (aset csecinfo 3 (logand buffer-size 255)))
+ csecinfo))
+
@@ -204,7 +204,7 @@
(fillarray server-salt 0)
(fillarray buff 0))))
diff --git a/flim/patches/patch-sasl.el b/flim/patches/patch-sasl.el
index 1d9a3a2d0d..1a6cade2ed 100644
--- a/flim/patches/patch-sasl.el
+++ b/flim/patches/patch-sasl.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./sasl.el 2005-07-06 11:09:05.000000000 +0900
-+++ ././sasl.el 2020-09-05 16:02:39.902101886 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/sasl.el 2005-07-06 11:09:05.000000000 +0900
++++ ./sasl.el 2023-08-31 08:29:38.619410439 +0900
@@ -1,4 +1,4 @@
-;;; sasl.el --- SASL client framework
+;;; sasl.el --- SASL client framework -*- lexical-binding: t -*-
@@ -51,6 +51,31 @@ sync to lexical-binding
(defvar sasl-unique-id-function #'sasl-unique-id-function)
+@@ -185,18 +197,18 @@
+ ;; Don't use microseconds from (current-time), they may be unsupported.
+ ;; Instead we use this randomly inited counter.
+ (setq sasl-unique-id-char
+- (% (1+ (or sasl-unique-id-char (logand (random t) (1- (lsh 1 20)))))
++ (% (1+ (or sasl-unique-id-char (logand (random t) (1- (ash 1 20)))))
+ ;; (current-time) returns 16-bit ints,
+ ;; and 2^16*25 just fits into 4 digits i base 36.
+ (* 25 25)))
+- (let ((tm (current-time)))
++ (let ((tm (floor (float-time))))
+ (concat
+ (sasl-unique-id-number-base36
+- (+ (car tm)
+- (lsh (% sasl-unique-id-char 25) 16)) 4)
++ (+ (/ tm 65536)
++ (ash (% sasl-unique-id-char 25) 16)) 4)
+ (sasl-unique-id-number-base36
+- (+ (nth 1 tm)
+- (lsh (/ sasl-unique-id-char 25) 16)) 4))))
++ (+ (% tm 65536)
++ (ash (/ sasl-unique-id-char 25) 16)) 4))))
+
+ (defun sasl-unique-id-number-base36 (num len)
+ (if (if (< len 0)
@@ -204,14 +216,13 @@
(= len 0))
""
diff --git a/flim/patches/patch-sha1.el b/flim/patches/patch-sha1.el
index c4c160e36e..e7df22fbcf 100644
--- a/flim/patches/patch-sha1.el
+++ b/flim/patches/patch-sha1.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./sha1.el 2005-07-06 11:09:05.000000000 +0900
-+++ ././sha1.el 2020-09-05 16:02:39.902173976 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/sha1.el 2005-07-06 11:09:05.000000000 +0900
++++ ./sha1.el 2023-08-31 08:29:38.620927012 +0900
@@ -1,4 +1,4 @@
-;;; sha1.el --- SHA1 Secure Hash Algorithm.
+;;; sha1.el --- SHA1 Secure Hash Algorithm. -*- lexical-binding: t -*-
diff --git a/flim/patches/patch-smtp.el b/flim/patches/patch-smtp.el
index c6fc811944..ab1531adbf 100644
--- a/flim/patches/patch-smtp.el
+++ b/flim/patches/patch-smtp.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./smtp.el 2006-09-24 09:40:58.000000000 +0900
-+++ ././smtp.el 2020-09-05 16:02:39.902356053 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/smtp.el 2006-09-24 09:40:58.000000000 +0900
++++ ./smtp.el 2023-08-31 08:29:38.622738962 +0900
@@ -1,4 +1,4 @@
-;;; smtp.el --- basic functions to send mail with SMTP server
+;;; smtp.el --- basic functions to send mail with SMTP server -*- lexical-binding: t -*-
@@ -19,14 +19,13 @@ sync to lexical-binding
:type '(choice (const nil) string)
:group 'smtp)
-@@ -98,17 +98,15 @@
+@@ -98,17 +98,14 @@
:type 'boolean
:group 'smtp-extensions)
-(defcustom smtp-use-starttls-ignore-error nil
- "If non-nil, do not use STARTTLS if STARTTLS is not available."
-+(defcustom smtp-use-gnutls (and (fboundp 'gnutls-available-p)
-+ (gnutls-available-p))
++(defcustom smtp-use-gnutls (gnutls-available-p)
+ "If non-nil, use built-in GnuTLS for STARTTLS."
:type 'boolean
:group 'smtp-extensions)
@@ -43,7 +42,18 @@ sync to lexical-binding
:group 'smtp-extensions)
(defcustom smtp-use-sasl nil
-@@ -186,8 +184,7 @@
+@@ -145,8 +142,8 @@
+ `open-network-stream' and should return a process object.
+ Here is an example:
+
+-\(setq smtp-open-connection-function
+- #'(lambda (name buffer host service)
++(setq smtp-open-connection-function
++ #\\='(lambda (name buffer host service)
+ (let ((process-connection-type nil))
+ (start-process name buffer \"ssh\" \"-C\" host
+ \"nc\" host service))))
+@@ -186,8 +183,7 @@
(defun smtp-package-buffer-internal-size (package)
"Return the size of PACKAGE, an integer."
@@ -53,7 +63,7 @@ sync to lexical-binding
(let ((size
(+ (buffer-size)
;; Add one byte for each change-of-line
-@@ -245,14 +242,14 @@
+@@ -245,14 +241,14 @@
"Return user's fully qualified domain name."
(if smtp-fqdn
smtp-fqdn
@@ -73,7 +83,7 @@ sync to lexical-binding
(defun smtp-find-connection (buffer)
"Find the connection delivering to BUFFER."
-@@ -268,7 +265,8 @@
+@@ -268,7 +264,8 @@
(eval-and-compile
(autoload 'starttls-open-stream "starttls")
@@ -83,7 +93,7 @@ sync to lexical-binding
(defun smtp-open-connection (buffer server service)
"Open a SMTP connection for a service to a host.
-@@ -276,9 +274,18 @@
+@@ -276,9 +273,18 @@
BUFFER is the buffer to associate with the connection. SERVER is name
of the host to connect to. SERVICE is name of the service desired."
(let ((process
@@ -104,7 +114,7 @@ sync to lexical-binding
(when process
(setq connection (smtp-make-connection process server service))
(set-process-filter process 'smtp-process-filter)
-@@ -341,7 +348,7 @@
+@@ -341,7 +347,7 @@
t)
(smtp-error)))
@@ -113,7 +123,7 @@ sync to lexical-binding
;;;###autoload
(defun smtp-send-buffer (sender recipients buffer)
-@@ -357,24 +364,22 @@
+@@ -357,24 +363,22 @@
(or smtp-server
(error "`smtp-server' not defined"))))
(package
@@ -150,7 +160,7 @@ sync to lexical-binding
(defun smtp-submit-package (package)
(unwind-protect
-@@ -399,7 +404,7 @@
+@@ -399,7 +403,7 @@
(smtp-primitive-rcptto package)
(smtp-primitive-data package))
(let ((connection (smtp-find-connection (current-buffer))))
@@ -159,7 +169,7 @@ sync to lexical-binding
(condition-case nil
(smtp-primitive-quit package)
(smtp-error))
-@@ -412,10 +417,6 @@
+@@ -412,10 +416,6 @@
BUFFER may be a buffer or a buffer name which contains mail message."
(let ((servers
(smtp-find-server recipients))
@@ -170,7 +180,7 @@ sync to lexical-binding
server package)
(while (car servers)
(setq server (caar servers))
-@@ -426,25 +427,29 @@
+@@ -426,25 +426,29 @@
(mapconcat 'concat recipients ">,<"))))
(setq package
(smtp-make-package sender recipients buffer))
@@ -208,7 +218,7 @@ sync to lexical-binding
(let* ((connection
(smtp-find-connection (current-buffer)))
(response
-@@ -452,7 +457,7 @@
+@@ -452,7 +456,7 @@
(if (/= (car response) 220)
(smtp-response-error response))))
@@ -217,7 +227,7 @@ sync to lexical-binding
(let* ((connection
(smtp-find-connection (current-buffer)))
response)
-@@ -471,7 +476,7 @@
+@@ -471,7 +475,7 @@
extensions))
(cdr response)))))
@@ -226,7 +236,7 @@ sync to lexical-binding
(let* ((connection
(smtp-find-connection (current-buffer)))
response)
-@@ -480,7 +485,7 @@
+@@ -480,7 +484,7 @@
(if (/= (car response) 250)
(smtp-response-error response))))
@@ -235,7 +245,7 @@ sync to lexical-binding
(let* ((connection
(smtp-find-connection (current-buffer)))
(mechanisms
-@@ -518,7 +523,11 @@
+@@ -518,7 +522,11 @@
(smtp-response-error response)) ;Bogus server?
(if (/= (car response) 334)
(smtp-response-error response))
@@ -248,7 +258,7 @@ sync to lexical-binding
(setq step (sasl-next-step client step))
(smtp-send-command
connection
-@@ -531,16 +540,21 @@
+@@ -531,16 +539,21 @@
;;; connection (sasl-client-decoder client))
))
@@ -272,7 +282,7 @@ sync to lexical-binding
(defun smtp-primitive-mailfrom (package)
(let* ((connection
-@@ -555,7 +569,7 @@
+@@ -555,7 +568,7 @@
;; SIZE --- Message Size Declaration (RFC1870)
(if (and smtp-use-size
(assq 'size extensions))
@@ -281,7 +291,7 @@ sync to lexical-binding
;; 8BITMIME --- 8bit-MIMEtransport (RFC1652)
(if (and smtp-use-8bitmime
(assq '8bitmime extensions))
-@@ -563,7 +577,7 @@
+@@ -563,7 +576,7 @@
(smtp-send-command
connection
(if extension
@@ -290,7 +300,7 @@ sync to lexical-binding
(format "MAIL FROM:<%s>" sender)))
(setq response (smtp-read-response connection))
(if (/= (car response) 250)
-@@ -590,8 +604,7 @@
+@@ -590,8 +603,7 @@
(setq response (smtp-read-response connection))
(if (/= (car response) 354)
(smtp-response-error response))
@@ -300,7 +310,7 @@ sync to lexical-binding
(goto-char (point-min))
(while (not (eobp))
(smtp-send-data
-@@ -602,7 +615,7 @@
+@@ -602,7 +614,7 @@
(if (/= (car response) 250)
(smtp-response-error response))))
@@ -309,7 +319,7 @@ sync to lexical-binding
(let* ((connection
(smtp-find-connection (current-buffer)))
response)
-@@ -614,8 +627,7 @@
+@@ -614,8 +626,7 @@
;;; @ low level process manipulating function
;;;
(defun smtp-process-filter (process output)
@@ -319,7 +329,7 @@ sync to lexical-binding
(goto-char (point-max))
(insert output)))
-@@ -663,12 +675,11 @@
+@@ -663,12 +674,11 @@
response))
(defun smtp-send-command (connection command)
@@ -337,7 +347,7 @@ sync to lexical-binding
(goto-char (point-max))
(setq command (concat command "\r\n"))
(insert command)
-@@ -683,9 +694,7 @@
+@@ -683,9 +693,7 @@
(encoder
(smtp-connection-encoder-internal connection)))
;; Escape "." at start of a line.
@@ -348,7 +358,7 @@ sync to lexical-binding
(if encoder
(setq data (funcall encoder data)))
(process-send-string process data)))
-@@ -698,13 +707,10 @@
+@@ -698,13 +706,10 @@
addr-regexp
(smtp-address-buffer (generate-new-buffer " *smtp-mail*")))
(unwind-protect
@@ -364,7 +374,7 @@ sync to lexical-binding
(buffer-substring-no-properties header-start header-end)))
(goto-char (point-min))
;; RESENT-* fields should stop processing of regular fields.
-@@ -729,11 +735,11 @@
+@@ -729,11 +734,11 @@
(erase-buffer)
(insert " " simple-address-list "\n")
;; newline --> blank
diff --git a/flim/patches/patch-std11.el b/flim/patches/patch-std11.el
index 8b9a91b294..449b84a2c2 100644
--- a/flim/patches/patch-std11.el
+++ b/flim/patches/patch-std11.el
@@ -1,9 +1,9 @@
$NetBSD$
-sync to lexical-binding
+ flim-1_14-wl branch at 2023-08-08
---- /tmp/wip/flim/work/flim-1.14.9/./std11.el 2005-11-13 10:04:36.000000000 +0900
-+++ ././std11.el 2020-09-05 16:02:39.902584770 +0900
+--- /tmp/W/devel/flim/work/flim-1.14.9/std11.el 2005-11-13 10:04:36.000000000 +0900
++++ ./std11.el 2023-08-31 08:29:38.624627921 +0900
@@ -1,4 +1,4 @@
-;;; std11.el --- STD 11 functions for GNU Emacs
+;;; std11.el --- STD 11 functions for GNU Emacs -*- lexical-binding: t -*-
@@ -21,7 +21,7 @@ sync to lexical-binding
;;; @ fetch
;;;
-@@ -54,8 +54,7 @@
+@@ -54,21 +54,18 @@
(goto-char (point-min))
(let ((case-fold-search t))
(if (re-search-forward (concat "^" name ":[ \t]*") nil t)
@@ -31,23 +31,27 @@ sync to lexical-binding
;;;###autoload
(defun std11-narrow-to-header (&optional boundary)
-@@ -64,11 +63,12 @@
- (narrow-to-region
- (goto-char (point-min))
- (if (re-search-forward
+- "Narrow to the message header.
++ "Narrow to the message header when needed.
+ If BOUNDARY is not nil, it is used as message header separator."
+- (narrow-to-region
+- (goto-char (point-min))
+- (if (re-search-forward
- (concat "^\\(" (regexp-quote (or boundary "")) "\\)?$")
-+ (if boundary
-+ (concat "^\\(" (regexp-quote boundary) "\\)?$")
-+ "^$")
- nil t)
- (match-beginning 0)
+- nil t)
+- (match-beginning 0)
- (point-max)
- )))
-+ (point-max))))
++ (goto-char (point-min))
++ (when (re-search-forward
++ (if boundary (concat "^\\(" (regexp-quote boundary) "\\)?$")
++ "^$")
++ nil t)
++ (narrow-to-region (point-min) (match-beginning 0))))
;;;###autoload
(defun std11-field-body (name &optional boundary)
-@@ -77,8 +77,7 @@
+@@ -77,8 +74,7 @@
(save-excursion
(save-restriction
(inline (std11-narrow-to-header boundary)
@@ -57,7 +61,7 @@ sync to lexical-binding
(defun std11-find-field-body (field-names &optional boundary)
"Return the first found field-body specified by FIELD-NAMES
-@@ -90,15 +89,13 @@
+@@ -90,15 +86,13 @@
(let ((case-fold-search t)
field-name)
(catch 'tag
@@ -76,7 +80,7 @@ sync to lexical-binding
(defun std11-field-bodies (field-names &optional default-value boundary)
"Return list of each field-bodies of FIELD-NAMES of the message header
-@@ -117,11 +114,9 @@
+@@ -117,11 +111,9 @@
(if (re-search-forward (concat "^" field-name ":[ \t]*") nil t)
(setcar d-rest
(buffer-substring-no-properties
@@ -90,7 +94,7 @@ sync to lexical-binding
dest))))
(defun std11-header-string (regexp &optional boundary)
-@@ -136,11 +131,9 @@
+@@ -136,11 +128,9 @@
(while (re-search-forward std11-field-head-regexp nil t)
(setq field
(buffer-substring (match-beginning 0) (std11-field-end)))
@@ -105,7 +109,7 @@ sync to lexical-binding
(defun std11-header-string-except (regexp &optional boundary)
"Return string of message header fields not matched by REGEXP.
-@@ -155,10 +148,8 @@
+@@ -155,10 +145,8 @@
(setq field
(buffer-substring (match-beginning 0) (std11-field-end)))
(if (not (string-match regexp field))
@@ -118,7 +122,7 @@ sync to lexical-binding
(defun std11-collect-field-names (&optional boundary)
"Return list of all field-names of the message header in current buffer.
-@@ -172,30 +163,33 @@
+@@ -172,30 +160,34 @@
(setq name (buffer-substring-no-properties
(match-beginning 0)(1- (match-end 0))))
(or (member name dest)
@@ -133,7 +137,8 @@ sync to lexical-binding
;;;
+(defcustom std11-unfold-strip-leading-tab t
-+ "When non-nil, `std11-unfold-string' strips leading TAB, which is mainly added by incorrect folding."
++ "When non-nil, `std11-unfold-string' strips leading TAB, which is
++mainly added by incorrect folding."
+ :group 'news
+ :group 'mail
+ :type 'boolean)
@@ -166,7 +171,7 @@ sync to lexical-binding
;;; @ quoted-string
-@@ -205,18 +199,13 @@
+@@ -205,18 +197,13 @@
(let (dest
(i 0)
(b 0)
@@ -191,7 +196,7 @@ sync to lexical-binding
(defconst std11-non-qtext-char-list '(?\" ?\\ ?\r ?\n))
-@@ -231,18 +220,14 @@
+@@ -231,18 +218,14 @@
(let (dest
(b 0)
(i 0)
@@ -217,7 +222,7 @@ sync to lexical-binding
(defun std11-strip-quoted-string (string)
"Strip quoted-string STRING."
-@@ -251,14 +236,142 @@
+@@ -251,14 +234,144 @@
(let ((max (1- len)))
(and (eq (aref string 0) ?\")
(eq (aref string max) ?\")
@@ -274,13 +279,13 @@ sync to lexical-binding
+ r0
+ ,@(let* ((count (1+ (max tag ?\\)))
+ (result (make-vector count '(write-repeat r0))))
-+ (aset result tag '(break))
+ (aset result ?\\ `((write "\\\\")
+ (read r0)
+ ,wrt
+ (repeat)))
+ (aset result ?\" '((write "\\\"")
+ (repeat)))
++ (aset result tag '(break))
+ (mapcar 'identity result)))
+ (write-repeat r0))
+ (write "\")")
@@ -351,10 +356,12 @@ sync to lexical-binding
+ 'std11-default-ccl-lexical-analyzer)
+ "Specify CCL-program symbol for `std11-lexical-analyze'.
+When nil, do not use CCL.
-+CCL-program returns a string which expresses a cons.
-+When cons's cdr is non-nil, CCL-program succeeds in analyzing and car is analyzed result.
-+When cdr is nil,CCL-program fails in analyzing.
-+If you modify `std11-lexical-analyzer', set this variable to nil or prepare corresponding CCL-program."
++
++CCL-program returns a string which expresses a cons. When cons's
++cdr is non-nil, CCL-program succeeds in analyzing and car is
++analyzed result. When cdr is nil, CCL-program fails in analyzing.
++If you modify `std11-lexical-analyzer', set this variable to nil
++or prepare corresponding CCL-program."
+ :group 'news
+ :group 'mail
+ :type '(choice symbol (const :tag "Do not use CCL." nil)))
diff --git a/flim/patches/patch-tests_test-rfc2231.el b/flim/patches/patch-tests_test-rfc2231.el
deleted file mode 100644
index 358191571d..0000000000
--- a/flim/patches/patch-tests_test-rfc2231.el
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-sync to lexical-binding
-
---- /tmp/wip/flim/work/flim-1.14.9/./tests/test-rfc2231.el 2001-05-31 11:38:29.000000000 +0900
-+++ ././tests/test-rfc2231.el 2018-07-29 22:48:22.287997569 +0900
-@@ -151,13 +151,13 @@
- (luna-define-method test-rfc2231-encoded-word-1 ((case test-rfc2231))
- (lunit-assert
- (string=
-- (eword-decode-encoded-word "=?US-ASCII?Q?Keith_Moore?=")
-+ (eword-decode-string "=?US-ASCII?Q?Keith_Moore?=")
- "Keith Moore")))
-
- (luna-define-method test-rfc2231-encoded-word-2 ((case test-rfc2231))
- (lunit-assert
- (string=
-- (eword-decode-encoded-word "=?US-ASCII*EN?Q?Keith_Moore?=")
-+ (eword-decode-string "=?US-ASCII*EN?Q?Keith_Moore?=")
- "Keith Moore")))
-
- (luna-define-method test-rfc2231-encoded-word-3 ((case test-rfc2231))
-@@ -165,7 +165,7 @@
- (eq
- (get-text-property
- 0 'mime-language
-- (eword-decode-encoded-word "=?US-ASCII*EN?Q?Keith_Moore?="))
-+ (eword-decode-string "=?US-ASCII*EN?Q?Keith_Moore?="))
- 'en)))
-
- ;;;
Home |
Main Index |
Thread Index |
Old Index