diff -Nru semi-1.14.7~0.20120428/debian/changelog semi-1.14.7~0.20120428/debian/changelog --- semi-1.14.7~0.20120428/debian/changelog 2019-07-07 15:03:33.000000000 +0000 +++ semi-1.14.7~0.20120428/debian/changelog 2019-07-16 13:13:17.000000000 +0000 @@ -1,3 +1,14 @@ +semi (1.14.7~0.20120428-26) unstable; urgency=medium + + * Update 010_semi-epg.patch to 2019-07-08 + * Drop 020_nomule.patch + * Skip old flavors xemacs20 and xemacs19 + * Update debhelper-compat to 12 + * Update Standards-Version to 4.4.0 + * Recompile w3m-el + + -- Tatsuya Kinoshita Tue, 16 Jul 2019 22:13:17 +0900 + semi (1.14.7~0.20120428-25) unstable; urgency=medium [ Ondřej Nový ] diff -Nru semi-1.14.7~0.20120428/debian/control semi-1.14.7~0.20120428/debian/control --- semi-1.14.7~0.20120428/debian/control 2019-07-07 13:50:13.000000000 +0000 +++ semi-1.14.7~0.20120428/debian/control 2019-07-15 13:47:42.000000000 +0000 @@ -2,9 +2,9 @@ Section: lisp Priority: optional Maintainer: Tatsuya Kinoshita -Build-Depends: debhelper-compat (= 11) +Build-Depends: debhelper-compat (= 12) Build-Depends-Indep: emacs-nox | emacs | emacs25 | emacs24 | emacs23 | emacs22 -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Vcs-Browser: https://salsa.debian.org/debian/semi Vcs-Git: https://salsa.debian.org/debian/semi.git Homepage: http://git.chise.org/elisp/semi/ diff -Nru semi-1.14.7~0.20120428/debian/emacsen-install semi-1.14.7~0.20120428/debian/emacsen-install --- semi-1.14.7~0.20120428/debian/emacsen-install 2018-08-19 14:16:49.000000000 +0000 +++ semi-1.14.7~0.20120428/debian/emacsen-install 2019-07-16 13:12:58.000000000 +0000 @@ -10,7 +10,7 @@ ELCSTAMP=$ELCDIR/compile-stamp case $FLAVOR in - emacs19|mule2) + emacs19|mule2|xemacs20|xemacs19) exit 0 ;; *xemacs*) @@ -139,7 +139,7 @@ echo "install/$PACKAGE: byte-compiling for reverse dependency" pkgs= -for p in wl:wl wl-beta:wl cmail t-gnus; do +for p in wl:wl wl-beta:wl w3m-el:w3m w3m-el-snapshot:w3m cmail t-gnus; do pkg=`echo $p | cut -d : -f 1` sname=`echo $p | cut -d : -f 2` dir=/usr/share/$FLAVOR/site-lisp/$sname diff -Nru semi-1.14.7~0.20120428/debian/emacsen-remove semi-1.14.7~0.20120428/debian/emacsen-remove --- semi-1.14.7~0.20120428/debian/emacsen-remove 2018-08-19 14:16:49.000000000 +0000 +++ semi-1.14.7~0.20120428/debian/emacsen-remove 2019-07-15 13:45:28.000000000 +0000 @@ -6,7 +6,7 @@ PACKAGE=semi case $FLAVOR in - emacs19|mule2) + emacs19|mule2|xemacs20|xemacs19) exit 0 ;; esac diff -Nru semi-1.14.7~0.20120428/debian/patches/010_semi-epg.patch semi-1.14.7~0.20120428/debian/patches/010_semi-epg.patch --- semi-1.14.7~0.20120428/debian/patches/010_semi-epg.patch 2019-07-07 13:47:40.000000000 +0000 +++ semi-1.14.7~0.20120428/debian/patches/010_semi-epg.patch 2019-07-15 13:39:46.000000000 +0000 @@ -2,10 +2,15 @@ Origin: https://github.com/wanderlust/semi/commits/semi-1_14-wl diff --git a/ChangeLog b/ChangeLog -index bf149860..1f0daec5 100644 +index bf149860..effa6ded 100644 --- a/ChangeLog +++ b/ChangeLog -@@ -1,3 +1,739 @@ +@@ -1,3 +1,744 @@ ++2019-07-07 Tatsuya Kinoshita ++ ++ * mime-view.el (mime-display-multipart/multilingual-prefered-languages): ++ Check for `get-language-info' existence. ++ +2019-06-26 Kazuhiro Ito + + * mime-image.el (mime-image-create): Update native image scaling @@ -745,7 +750,7 @@ 2012-04-28 MORIOKA Tomohiko * README.en: Add coding cookie to specify UTF-8. -@@ -31,6 +767,196 @@ +@@ -31,6 +772,196 @@ * semi-def.el (mime-user-interface-product): Update to 1.14.7. @@ -942,7 +947,7 @@ 2010-10-24 Vitaly Mayatskikh * mime-view.el (mime-save-situation-examples): Don't fail when -@@ -521,7 +1447,7 @@ +@@ -521,7 +1452,7 @@ 2000-12-25 MORIOKA Tomohiko @@ -951,7 +956,7 @@ * README.en (Required environment): Update to FLIM 1.14.2. -@@ -756,7 +1682,7 @@ +@@ -756,7 +1687,7 @@ 2000-07-12 MORIOKA Tomohiko @@ -960,7 +965,7 @@ * README.en (Required environment): Modify for FLIM-Chao 1.14.1. -@@ -804,7 +1730,7 @@ +@@ -804,7 +1735,7 @@ 2000-03-01 MORIOKA Tomohiko @@ -969,7 +974,7 @@ 2000-03-01 MORIOKA Tomohiko -@@ -1888,7 +2814,7 @@ +@@ -1888,7 +2819,7 @@ 1999-08-18 MORIOKA Tomohiko @@ -978,7 +983,7 @@ 1999-08-17 Katsumi Yamaoka -@@ -1959,7 +2885,7 @@ +@@ -1959,7 +2890,7 @@ 1999-07-27 MORIOKA Tomohiko @@ -987,7 +992,7 @@ 1999-07-27 MORIOKA Tomohiko -@@ -2262,7 +3188,7 @@ +@@ -2262,7 +3193,7 @@ 1999-01-21 MORIOKA Tomohiko @@ -996,7 +1001,7 @@ 1999-01-21 MORIOKA Tomohiko -@@ -2760,7 +3686,7 @@ +@@ -2760,7 +3691,7 @@ 1998-07-08 MORIOKA Tomohiko @@ -1005,7 +1010,7 @@ * mime-play.el (mime-delq-null-situation): Add new optional argument `ignored-value'. -@@ -2789,7 +3715,7 @@ +@@ -2789,7 +3720,7 @@ 1998-07-08 MORIOKA Tomohiko @@ -1014,7 +1019,7 @@ 1998-07-07 MORIOKA Tomohiko -@@ -2908,7 +3834,7 @@ +@@ -2908,7 +3839,7 @@ 1998-06-28 MORIOKA Tomohiko @@ -1023,7 +1028,7 @@ 1998-06-26 MORIOKA Tomohiko -@@ -3744,7 +4670,7 @@ +@@ -3744,7 +4675,7 @@ 1998-06-04 MORIOKA Tomohiko @@ -1032,7 +1037,7 @@ * README.en (Required environment): Modify for FLIM 1.3.0. -@@ -3796,7 +4722,7 @@ +@@ -3796,7 +4727,7 @@ 1998-06-01 MORIOKA Tomohiko @@ -1041,7 +1046,7 @@ 1998-05-28 MORIOKA Tomohiko -@@ -4009,7 +4935,7 @@ +@@ -4009,7 +4940,7 @@ 1998-05-15 MORIOKA Tomohiko @@ -1050,7 +1055,7 @@ * mime-play.el (mime-mailcap-method-filename-alist): New variable. (mime-mailcap-method-sentinel): New function. -@@ -4135,7 +5061,7 @@ +@@ -4135,7 +5066,7 @@ 1998-05-06 MORIOKA Tomohiko @@ -1059,7 +1064,7 @@ * README.en (Required environment): Modify for FLIM 1.2.0. -@@ -4295,7 +5221,7 @@ +@@ -4295,7 +5226,7 @@ 1998-04-25 MORIOKA Tomohiko @@ -1068,7 +1073,7 @@ * mime-edit.el (mime-edit-mode-entity-prefix): New variable. (mime-edit-mode-entity-map): New variable. -@@ -4950,7 +5876,7 @@ +@@ -4950,7 +5881,7 @@ 1998-03-13 MORIOKA Tomohiko @@ -1077,7 +1082,7 @@ 1998-03-12 MORIOKA Tomohiko -@@ -5033,7 +5959,7 @@ +@@ -5033,7 +5964,7 @@ * mime-file.el: Rename `mime-article/extract-file' -> `mime-extract-current-entity'. @@ -1086,7 +1091,7 @@ * mime-edit.el (mime-edit-insert-signature): Function `mime-edit-insert-tag' is sometimes called with more arguments -@@ -5062,7 +5988,7 @@ +@@ -5062,7 +5993,7 @@ 1998-02-25 MORIOKA Tomohiko @@ -1095,7 +1100,7 @@ * SEMI-ELS: Remove mime-tar.el. -@@ -5199,14 +6125,14 @@ +@@ -5199,14 +6130,14 @@ 1997-11-16 MORIOKA Tomohiko @@ -7338,7 +7343,7 @@ + +;;; mime-vcard.el ends here diff --git a/mime-view.el b/mime-view.el -index 66c8a7b7..0f2bef8c 100644 +index 66c8a7b7..a3a0c114 100644 --- a/mime-view.el +++ b/mime-view.el @@ -32,6 +32,7 @@ @@ -7361,7 +7366,7 @@ "List of mailcap files." :group 'mime-view :type '(repeat file)) -@@ -82,6 +80,100 @@ buttom. Nil means don't scroll at all." +@@ -82,6 +80,102 @@ buttom. Nil means don't scroll at all." :group 'mime-view :type 'boolean) @@ -7382,8 +7387,10 @@ +(defcustom mime-display-multipart/multilingual-prefered-languages + (mapcar (lambda (lang) + (format "^%s\\(-.+\\)?" (regexp-quote (symbol-name lang)))) -+ (let ((result (get-language-info -+ current-language-environment 'iso639-language))) ++ (let ((result (if (fboundp 'get-language-info) ++ (get-language-info ++ current-language-environment 'iso639-language) ++ 'en))) + (if (eq result 'en) + (list result) + (cons result '(en))))) @@ -7462,7 +7469,7 @@ ;;; @ in raw-buffer (representation space) ;;; -@@ -124,8 +216,7 @@ If optional argument RECURSIVE is non-nil and current buffer has +@@ -124,8 +218,7 @@ If optional argument RECURSIVE is non-nil and current buffer has mime-mother-buffer, it returns original major-mode of the mother-buffer." (if (and recursive mime-mother-buffer) @@ -7472,7 +7479,7 @@ (mime-preview-original-major-mode recursive) ) (cdr (assq 'major-mode -@@ -349,8 +440,8 @@ mother-buffer." +@@ -349,8 +442,8 @@ mother-buffer." (defun mime-view-entity-title (entity) (or (mime-entity-read-field entity 'Content-Description) @@ -7482,7 +7489,7 @@ "")) (defvar mime-preview-situation-example-list nil) -@@ -606,9 +697,14 @@ mother-buffer." +@@ -606,9 +699,14 @@ mother-buffer." (t (let* ((charset (cdr (assoc "charset" params))) (encoding (mime-entity-encoding entity)) @@ -7498,7 +7505,7 @@ (if charset (concat "; " charset) "") -@@ -743,6 +839,12 @@ Each elements are regexp of field-name.") +@@ -743,6 +841,12 @@ Each elements are regexp of field-name.") (body . visible) (body-presentation-method . mime-display-text/richtext))) @@ -7511,7 +7518,7 @@ (autoload 'mime-display-application/x-postpet "postpet") (ctree-set-calist-strictly -@@ -769,6 +871,12 @@ Each elements are regexp of field-name.") +@@ -769,6 +873,12 @@ Each elements are regexp of field-name.") (body . visible) (body-presentation-method . mime-display-multipart/related))) @@ -7524,7 +7531,7 @@ (ctree-set-calist-strictly 'mime-preview-condition '((type . multipart)(subtype . t) -@@ -785,59 +893,160 @@ Each elements are regexp of field-name.") +@@ -785,59 +895,160 @@ Each elements are regexp of field-name.") 'mime-preview-condition '((type . message)(subtype . rfc822) (body . visible) @@ -7713,7 +7720,7 @@ (defvar mime-view-announcement-for-message/partial (if (and (>= emacs-major-version 19) window-system) -@@ -863,6 +1072,19 @@ Each elements are regexp of field-name.") +@@ -863,6 +1074,19 @@ Each elements are regexp of field-name.") #'mime-preview-play-current-entity) )) @@ -7733,7 +7740,7 @@ (defun mime-display-multipart/mixed (entity situation) (let ((children (mime-entity-children entity)) (original-major-mode-cell (assq 'major-mode situation)) -@@ -876,13 +1098,19 @@ Each elements are regexp of field-name.") +@@ -876,13 +1100,19 @@ Each elements are regexp of field-name.") (setq children (cdr children)) ))) @@ -7755,7 +7762,7 @@ :group 'mime-view :type '(repeat (cons (choice :tag "Media-Type" (cons :tag "Type/Subtype" -@@ -890,60 +1118,99 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." +@@ -890,60 +1120,99 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." (symbol :tag "Subtype")) (symbol :tag "Type") (const :tag "Default" t)) @@ -7907,7 +7914,7 @@ (defun mime-display-multipart/related (entity situation) (let* ((param-start (mime-parse-msg-id -@@ -957,11 +1224,130 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." +@@ -957,11 +1226,130 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." (car (mime-entity-children entity)))) (original-major-mode-cell (assq 'major-mode situation)) (default-situation (cdr (assq 'childrens-situation situation)))) @@ -8043,7 +8050,7 @@ ;;; @ acting-condition ;;; -@@ -971,7 +1357,11 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." +@@ -971,7 +1359,11 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." (defun mime-view-read-mailcap-files (&optional files) (or files @@ -8056,7 +8063,7 @@ (let (entries file) (while files (setq file (car files)) -@@ -1086,65 +1476,78 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." +@@ -1086,65 +1478,78 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." ;;; @ buffer setup ;;; @@ -8165,7 +8172,7 @@ (widen) (put-text-property nb ne 'mime-view-entity entity) (put-text-property nb ne 'mime-view-situation situation) -@@ -1307,13 +1710,13 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." +@@ -1307,13 +1712,13 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." (define-key mime-view-mode-map [menu-bar mime-view] (cons mime-view-menu-title (make-sparse-keymap mime-view-menu-title))) @@ -8186,7 +8193,7 @@ )) ;; (run-hooks 'mime-view-define-keymap-hook) mime-view-mode-map)) -@@ -1325,8 +1728,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." +@@ -1325,8 +1730,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t. t means default." "Clear mime-echo buffer and delete window for it." (let ((buf (get-buffer mime-echo-buffer-name))) (if buf @@ -8196,7 +8203,7 @@ (erase-buffer) (let ((win (get-buffer-window buf))) (if win -@@ -1375,11 +1777,16 @@ non-nil, DEFAULT-KEYMAP-OR-FUNCTION is ignored. If it is nil, +@@ -1375,11 +1779,16 @@ non-nil, DEFAULT-KEYMAP-OR-FUNCTION is ignored. If it is nil, (setq mime-preview-original-window-configuration win-conf) (setq major-mode 'mime-view-mode) (setq mode-name "MIME-View") @@ -8218,7 +8225,7 @@ (use-local-map (or keymap (if default-keymap-or-function -@@ -1415,6 +1822,8 @@ message. It must be nil, `binary' or `cooked'. If it is nil, +@@ -1415,6 +1824,8 @@ message. It must be nil, `binary' or `cooked'. If it is nil, (setq raw-buffer (current-buffer))) (or representation-type (setq representation-type @@ -8227,7 +8234,7 @@ (save-excursion (set-buffer raw-buffer) (cdr (or (assq major-mode mime-raw-representation-type-alist) -@@ -1595,6 +2004,8 @@ It calls following-method selected from variable +@@ -1595,6 +2006,8 @@ It calls following-method selected from variable new-buf (the-buf (current-buffer)) fields) @@ -8236,7 +8243,7 @@ (save-excursion (set-buffer (setq new-buf (get-buffer-create new-name))) (erase-buffer) -@@ -1624,8 +2035,7 @@ It calls following-method selected from variable +@@ -1624,8 +2037,7 @@ It calls following-method selected from variable (setq field-name (car rest)) (or (std11-field-body field-name) (progn @@ -8246,7 +8253,7 @@ (let ((entity (when mime-mother-buffer (set-buffer mime-mother-buffer) (get-text-property (point) -@@ -1635,7 +2045,7 @@ It calls following-method selected from variable +@@ -1635,7 +2047,7 @@ It calls following-method selected from variable entity field-name)))) (setq entity (mime-entity-parent entity))))) (if ret @@ -8255,7 +8262,7 @@ ))) (setq rest (cdr rest)) )) -@@ -1901,11 +2311,6 @@ It calls function registered in variable +@@ -1901,11 +2313,6 @@ It calls function registered in variable (provide 'mime-view) diff -Nru semi-1.14.7~0.20120428/debian/patches/020_nomule.patch semi-1.14.7~0.20120428/debian/patches/020_nomule.patch --- semi-1.14.7~0.20120428/debian/patches/020_nomule.patch 2019-07-07 14:59:27.000000000 +0000 +++ semi-1.14.7~0.20120428/debian/patches/020_nomule.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Subject: Don't fail when XEmacs without MULE -Author: Tatsuya Kinoshita - -2019-07-07 Tatsuya Kinoshita - - * mime-view.el (mime-display-multipart/multilingual-prefered-languages) - Check for `get-language-info' existence. - ---- a/mime-view.el -+++ b/mime-view.el -@@ -97,8 +97,10 @@ multipart/alternative entities." - (defcustom mime-display-multipart/multilingual-prefered-languages - (mapcar (lambda (lang) - (format "^%s\\(-.+\\)?" (regexp-quote (symbol-name lang)))) -- (let ((result (get-language-info -- current-language-environment 'iso639-language))) -+ (let ((result (if (fboundp 'get-language-info) -+ (get-language-info -+ current-language-environment 'iso639-language) -+ 'en))) - (if (eq result 'en) - (list result) - (cons result '(en))))) diff -Nru semi-1.14.7~0.20120428/debian/patches/series semi-1.14.7~0.20120428/debian/patches/series --- semi-1.14.7~0.20120428/debian/patches/series 2019-07-07 14:59:34.000000000 +0000 +++ semi-1.14.7~0.20120428/debian/patches/series 2019-07-15 13:41:52.000000000 +0000 @@ -1,2 +1 @@ 010_semi-epg.patch -020_nomule.patch