Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package emacs-w3m for openSUSE:Factory checked in at 2022-04-11 23:49:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs-w3m (Old) and /work/SRC/openSUSE:Factory/.emacs-w3m.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs-w3m" Mon Apr 11 23:49:35 2022 rev:6 rq:969236 version:1.4.632+512+gc3a3a947 Changes: -------- --- /work/SRC/openSUSE:Factory/emacs-w3m/emacs-w3m.changes 2021-10-23 00:52:40.709166465 +0200 +++ /work/SRC/openSUSE:Factory/.emacs-w3m.new.1900/emacs-w3m.changes 2022-04-11 23:50:58.749882396 +0200 @@ -1,0 +2,16 @@ +Sat Apr 09 06:42:51 UTC 2022 - sch...@linux-m68k.org + +- Update to version 1.4.632+512+gc3a3a947: + * * Makefile.in (configure): Replace configure.in with configure.ac + * Make the builder work for autoconf 2.70 and up as well + * Drop Emacs 26 support + * * shimbun/ChangeLog: Remove cancelled entry + * * sb-kyoko-np.el (shimbun-clear-contents): Revert + * * sb-kyoko-np.el (shimbun-clear-contents): Make date header precision + * * mime-w3m.el: Fix last change + * Typo fix + * Conceal warnings for the case SEMI is absent (issue #108) + * * sb-sankei.el (w3m-cookie-setup): Autoload it + * * w3m.el (w3m-image-type-alist): Update docstring + +------------------------------------------------------------------- Old: ---- emacs-w3m-1.4.632+501+gc088fe62.obscpio New: ---- emacs-w3m-1.4.632+512+gc3a3a947.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs-w3m.spec ++++++ --- /var/tmp/diff_new_pack.4eQk33/_old 2022-04-11 23:50:59.493873907 +0200 +++ /var/tmp/diff_new_pack.4eQk33/_new 2022-04-11 23:50:59.497873863 +0200 @@ -1,7 +1,7 @@ # # spec file for package emacs-w3m # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,9 +21,9 @@ License: GPL-2.0-or-later Group: Productivity/Networking/Web/Browsers # Summary(ja): w3m ??? Emacs ????????????????????????????????????????????? -Version: 1.4.632+501+gc088fe62 +Version: 1.4.632+512+gc3a3a947 Release: 0 -Url: http://emacs-w3m.namazu.org/ +URL: http://emacs-w3m.namazu.org/ Source0: emacs-w3m-%{version}.tar.xz Source1: suse-start.el Patch1: w3m-el-1.3-map.patch ++++++ _service ++++++ --- /var/tmp/diff_new_pack.4eQk33/_old 2022-04-11 23:50:59.525873543 +0200 +++ /var/tmp/diff_new_pack.4eQk33/_new 2022-04-11 23:50:59.529873497 +0200 @@ -1,6 +1,6 @@ <services> <service name="obs_scm" mode="disabled"> - <param name="url">https://github.com/emacs-w3m/emacs-w3m.git</param> + <param name="url">https://github.com/emacs-w3m/emacs-w3m</param> <param name="scm">git</param> <param name="versionformat">1.4.632+@TAG_OFFSET@+g%h</param> <param name="parent-tag">7a81b230</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.4eQk33/_old 2022-04-11 23:50:59.545873315 +0200 +++ /var/tmp/diff_new_pack.4eQk33/_new 2022-04-11 23:50:59.549873269 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/emacs-w3m/emacs-w3m.git</param> - <param name="changesrevision">c088fe627f12597726dfc2062454e2e7bd99798a</param></service></servicedata> + <param name="changesrevision">c3a3a947fb267df1f03287be2eab4f7119707e90</param></service></servicedata> (No newline at EOF) ++++++ emacs-w3m-1.4.632+501+gc088fe62.obscpio -> emacs-w3m-1.4.632+512+gc3a3a947.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/ChangeLog new/emacs-w3m-1.4.632+512+gc3a3a947/ChangeLog --- old/emacs-w3m-1.4.632+501+gc088fe62/ChangeLog 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/ChangeLog 2022-04-05 03:41:57.000000000 +0200 @@ -1,3 +1,24 @@ +2022-04-05 Katsumi Yamaoka <yama...@jpl.org> + + Make the builder work for autoconf 2.70 and up as well + + * aclocal.m4 (AC_CACHE_VAL): Replace AC_FD_CC with AS_MESSAGE_LOG_FD. + * configure.ac: Rename from configure.in; run autoupdate. + * Makefile.in (configure): Replace configure.in with configure.ac. + +2022-04-05 Katsumi Yamaoka <yama...@jpl.org> + + Drop Emacs 26 support + + * aclocal.m4, mime-w3m.el, w3m-util.el, w3m.el, shimbun/shimbun.el + Drop Emacs 26 support because of Emacs 28.1 having been released. + +2021-11-22 Katsumi Yamaoka <yama...@jpl.org> + + Conceal warnings for the case SEMI is absent (issue #108) + + * mime-w3m.el: Silence the byte compiler. + 2021-10-09 Katsumi Yamaoka <yama...@jpl.org> Use rfc6068.el if possible instead of rfc2368.el (issue #109) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/Makefile.in new/emacs-w3m-1.4.632+512+gc3a3a947/Makefile.in --- old/emacs-w3m-1.4.632+501+gc088fe62/Makefile.in 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/Makefile.in 2022-04-05 03:41:57.000000000 +0200 @@ -141,7 +141,7 @@ config.status: configure $(srcdir)/config.status --recheck -configure: configure.in aclocal.m4 +configure: configure.ac aclocal.m4 autoconf dist: Makefile w3m.elc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/NEWS new/emacs-w3m-1.4.632+512+gc3a3a947/NEWS --- old/emacs-w3m-1.4.632+501+gc088fe62/NEWS 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/NEWS 2022-04-05 03:41:57.000000000 +0200 @@ -1,18 +1,18 @@ Emacs-w3m NEWS -- history of user-visible changes. -Copyright (C) 2020 TSUCHIYA Masatoshi +Copyright (C) 2020-2022 TSUCHIYA Masatoshi See the end of the file for license conditions. Please send bug reports to emacs-...@namazu.org. If possible, use M-x report-emacs-w3m-bug. -This file is about emacs-w3m as of August 2020. +This file is about emacs-w3m as of April 2022. * Required Emacs version changes ** Emacs-w3m no longer works with old Emacs versions. -Now emacs-w3m will work with Emacs 26, 27, and hopefully 28 (not +Now emacs-w3m will work with Emacs 27, 28, and hopefully 29 (not released yet, though). XEmacs support has been dropped. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/NEWS.ja new/emacs-w3m-1.4.632+512+gc3a3a947/NEWS.ja --- old/emacs-w3m-1.4.632+501+gc088fe62/NEWS.ja 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/NEWS.ja 2022-04-05 03:41:57.000000000 +0200 @@ -1,18 +1,18 @@ Emacs-w3m ???????????? -- ???????????????????????????????????????????????? -Copyright (C) 2020 ???????????? +Copyright (C) 2020-2022 ???????????? ?????????????????????????????????????????????????????????????????????????????????????????? ????????????????????? emacs-...@namazu.org ??????????????????????????? ?????????????????? M-x report-emacs-w3m-bug ??????????????????????????? -????????????????????? 2020???8???????????? emacs-w3m ??????????????????????????? +????????????????????? 2022???4???????????? emacs-w3m ??????????????????????????? * ????????? Emacs ???????????????????????????????????? ** Emacs-w3m ???????????????????????????????????? Emacs ??????????????????????????? -?????? emacs-w3m ??? Emacs 26???27?????????????????????????????? 28 (????????????????????? +?????? emacs-w3m ??? Emacs 27???28?????????????????????????????? 29 (????????????????????? ?????????????????????) ??????????????????????????????XEmacs ???????????????????????????????????? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/README new/emacs-w3m-1.4.632+512+gc3a3a947/README --- old/emacs-w3m-1.4.632+501+gc088fe62/README 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/README 2022-04-05 03:41:57.000000000 +0200 @@ -31,7 +31,7 @@ Check whether your system meets the following requirements before installing emacs-w3m. - Now emacs-w3m will work with Emacs 26, 27, and hopefully 28 (not + Now emacs-w3m will work with Emacs 27, 28, and hopefully 29 (not released yet, though). XEmacs support has been dropped. Emacs-w3m requires the latest version of w3m (version 0.3.1 and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/README.ja new/emacs-w3m-1.4.632+512+gc3a3a947/README.ja --- old/emacs-w3m-1.4.632+501+gc088fe62/README.ja 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/README.ja 2022-04-05 03:41:57.000000000 +0200 @@ -32,7 +32,7 @@ emacs-w3m ??????????????????????????????????????????????????????????????????????????????????????? ????????? - ?????? emacs-w3m ??? Emacs 26???27?????????????????????????????? 28 (????????????????????? + ?????? emacs-w3m ??? Emacs 27???28?????????????????????????????? 29 (????????????????????? ?????????????????????) ??????????????????????????????XEmacs ???????????????????????????????????? emacs-w3m ??????????????????????????? w3m (??????????????? 0.3.1 ??????) ?????????????????? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/aclocal.m4 new/emacs-w3m-1.4.632+512+gc3a3a947/aclocal.m4 --- old/emacs-w3m-1.4.632+501+gc088fe62/aclocal.m4 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/aclocal.m4 2022-04-05 03:41:57.000000000 +0200 @@ -12,10 +12,10 @@ OUTPUT=./conftest-$$ EL=./conftest-$$.el echo "(let ((x ${elisp})) (write-region (format \"%s\" x) nil \"${OUTPUT}\") (delete-file \"${EL}\"))" > ${EL} - eval "'${EMACS}' ${VANILLA_FLAG} -batch -l ${EL}" >& AC_FD_CC 2>&1 + eval "'${EMACS}' ${VANILLA_FLAG} -batch -l ${EL}" >& AS_MESSAGE_LOG_FD 2>&1 if test -f ${OUTPUT}; then retval="`cat ${OUTPUT}`" - echo "=> ${retval}" >& AC_FD_CC 2>&1 + echo "=> ${retval}" >& AS_MESSAGE_LOG_FD 2>&1 rm -f ${OUTPUT} EMACS_cv_SYS_$1="${retval}" fi]) @@ -62,7 +62,7 @@ case "${flavor}" in "") flavor=unknown;; - Emacs\ 2[[6-9]]\.*) + Emacs\ 2[[7-9]]\.*) EMACS_FLAVOR=emacs;; *) EMACS_FLAVOR=unsupported;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/configure.ac new/emacs-w3m-1.4.632+512+gc3a3a947/configure.ac --- old/emacs-w3m-1.4.632+501+gc088fe62/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/configure.ac 2022-04-05 03:41:57.000000000 +0200 @@ -0,0 +1,17 @@ +AC_INIT +AC_CONFIG_SRCDIR([w3m.el]) +AC_PROG_MAKE_SET +AC_PROG_INSTALL +AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, no) +AC_CHECK_TEXINFO($MAKEINFO) +AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, no) +AC_CHECK_TEXINFO($TEXI2PDF) +AC_CHECK_PROGS(EGREP, egrep grep, ) +AC_CHECK_PROG(CYGPATH, cygpath, cygpath, no) +AC_PATH_EMACS +AC_PATH_LISPDIR +AC_PATH_ICONDIR +AC_ADD_LOAD_PATH +AC_COMPRESS_INSTALL +AC_CONFIG_FILES([Makefile doc/Makefile]) +AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/configure.in new/emacs-w3m-1.4.632+512+gc3a3a947/configure.in --- old/emacs-w3m-1.4.632+501+gc088fe62/configure.in 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -AC_INIT(w3m.el) -AC_SET_MAKE -AC_PROG_INSTALL -AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, no) -AC_CHECK_TEXINFO($MAKEINFO) -AC_CHECK_PROG(TEXI2PDF, texi2pdf, texi2pdf, no) -AC_CHECK_TEXINFO($TEXI2PDF) -AC_CHECK_PROGS(EGREP, egrep grep, ) -AC_CHECK_PROG(CYGPATH, cygpath, cygpath, no) -AC_PATH_EMACS -AC_PATH_LISPDIR -AC_PATH_ICONDIR -AC_ADD_LOAD_PATH -AC_COMPRESS_INSTALL -AC_OUTPUT(Makefile doc/Makefile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/mime-w3m.el new/emacs-w3m-1.4.632+512+gc3a3a947/mime-w3m.el --- old/emacs-w3m-1.4.632+501+gc088fe62/mime-w3m.el 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/mime-w3m.el 2022-04-05 03:41:57.000000000 +0200 @@ -1,6 +1,6 @@ ;;; mime-w3m.el --- mime-view content filter for text -;; Copyright (C) 2001-2005, 2009, 2010, 2012, 2013, 2017, 2019 +;; Copyright (C) 2001-2005, 2009, 2010, 2012, 2013, 2017, 2019, 2021, 2022 ;; TSUCHIYA Masatoshi <tsuch...@namazu.org> ;; Author: TSUCHIYA Masatoshi <tsuch...@namazu.org>, @@ -34,7 +34,34 @@ ;;; Code: (eval-when-compile (require 'cl-lib)) ;; cl-labels -(require 'mime-view) +(require 'mime-view nil t) +(eval-and-compile + (unless (featurep 'mime-view) + ;; Conceal the warnings that will be issued unless the SEMI package + ;; and its requirements have been installed. + (defvar mime-view-text/html-previewer nil) + (if (= emacs-major-version 27) + (progn + (autoload 'ctree-set-calist-strictly "calist") + (autoload 'mime-content-type-parameter "mime-def") + (dolist (fn '(mime-entity-content + mime-entity-content-type mime-entity-fetch-field + mime-entity-type/subtype + mime-find-entity-from-content-id mime-find-root-entity + mime-insert-text-content mime-uri-parse-cid)) + (autoload fn "mime")) + (autoload 'set-alist "alist")) + (declare-function ctree-set-calist-strictly "calist") + (declare-function mime-content-type-parameter "mime-def") + (declare-function mime-entity-content "mime") + (declare-function mime-entity-content-type "mime") + (declare-function mime-entity-fetch-field "mime") + (declare-function mime-entity-type/subtype "mime") + (declare-function mime-find-entity-from-content-id "mime") + (declare-function mime-find-root-entity "mime") + (declare-function mime-insert-text-content "mime") + (declare-function mime-uri-parse-cid "mime") + (declare-function set-alist "alist")))) (require 'w3m) (defcustom mime-w3m-display-inline-images 'default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/shimbun/ChangeLog new/emacs-w3m-1.4.632+512+gc3a3a947/shimbun/ChangeLog --- old/emacs-w3m-1.4.632+501+gc088fe62/shimbun/ChangeLog 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/shimbun/ChangeLog 2022-04-05 03:41:57.000000000 +0200 @@ -1,5 +1,9 @@ 2021-09-24 Katsumi Yamaoka <yama...@jpl.org> + * sb-sankei.el (w3m-cookie-setup): Autoload it. + +2021-09-24 Katsumi Yamaoka <yama...@jpl.org> + * sb-sankei.el (shimbun-sankei-keep-login): Consult akamai cookie instead of local timer for expiry period. (shimbun-sankei-logout): Remove login/out cookies first and save last. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/shimbun/sb-sankei.el new/emacs-w3m-1.4.632+512+gc3a3a947/shimbun/sb-sankei.el --- old/emacs-w3m-1.4.632+501+gc088fe62/shimbun/sb-sankei.el 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/shimbun/sb-sankei.el 2022-04-05 03:41:57.000000000 +0200 @@ -539,7 +539,7 @@ (require 'w3m-form)) (declare-function w3m-cookie-save "w3m-cookie" (&optional domain)) -(declare-function w3m-cookie-setup "w3m-cookie") +(autoload 'w3m-cookie-setup "w3m-cookie") (autoload 'password-cache-add "password-cache") (autoload 'password-read-from-cache "password-cache") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/shimbun/shimbun.el new/emacs-w3m-1.4.632+512+gc3a3a947/shimbun/shimbun.el --- old/emacs-w3m-1.4.632+501+gc088fe62/shimbun/shimbun.el 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/shimbun/shimbun.el 2022-04-05 03:41:57.000000000 +0200 @@ -1,6 +1,6 @@ ;;; shimbun.el --- interfacing with web newspapers -;; Copyright (C) 2001-2014, 2017-2019, 2021 +;; Copyright (C) 2001-2014, 2017-2019, 2021, 2022 ;; Yuuichi Teranishi <teran...@gohome.org> ;; Author: TSUCHIYA Masatoshi <tsuch...@namazu.org>, @@ -1765,8 +1765,7 @@ (not (looking-at xml-entity-or-char-ref-re))) (delete-char 1) (insert "???"))))) - (if (or (and (fboundp 'libxml-available-p) (libxml-available-p)) ;; Emacs >=27 - (fboundp 'libxml-parse-xml-region)) ;; Emacs <= 26 + (if (libxml-available-p) (save-excursion (goto-char (point-min)) (let ((xml (when (search-forward "<" nil t) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/w3m-util.el new/emacs-w3m-1.4.632+512+gc3a3a947/w3m-util.el --- old/emacs-w3m-1.4.632+501+gc088fe62/w3m-util.el 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/w3m-util.el 2022-04-05 03:41:57.000000000 +0200 @@ -1,6 +1,6 @@ ;;; w3m-util.el --- Utility macros and functions for emacs-w3m -;; Copyright (C) 2001-2014, 2016-2021 TSUCHIYA Masatoshi <tsuch...@namazu.org> +;; Copyright (C) 2001-2014, 2016-2022 TSUCHIYA Masatoshi <tsuch...@namazu.org> ;; Authors: TSUCHIYA Masatoshi <tsuch...@namazu.org>, ;; Shun-ichi GOTO <go...@taiyo.co.jp>, @@ -1401,8 +1401,8 @@ (eval (car (widget-get widget :args)))))) (defmacro w3m-easy-menu-add (menu &optional map) - "Run `easy-menu-add' (obsolete since 28.1) on Emacs 27 and earlier." - (if (<= emacs-major-version 27) + "Run `easy-menu-add' (obsolete since 28.1) on Emacs 27." + (if (= emacs-major-version 27) `(easy-menu-add ,menu ,map))) ;;; Punycode RFC 3492: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/emacs-w3m-1.4.632+501+gc088fe62/w3m.el new/emacs-w3m-1.4.632+512+gc3a3a947/w3m.el --- old/emacs-w3m-1.4.632+501+gc088fe62/w3m.el 2021-10-09 04:52:39.000000000 +0200 +++ new/emacs-w3m-1.4.632+512+gc3a3a947/w3m.el 2022-04-05 03:41:57.000000000 +0200 @@ -1,6 +1,6 @@ ;;; w3m.el --- an Emacs interface to w3m -*- lexical-binding: t -*- -;; Copyright (C) 2000-2021 TSUCHIYA Masatoshi <tsuch...@namazu.org> +;; Copyright (C) 2000-2022 TSUCHIYA Masatoshi <tsuch...@namazu.org> ;; Authors: TSUCHIYA Masatoshi <tsuch...@namazu.org>, ;; Shun-ichi GOTO <go...@taiyo.co.jp>, @@ -245,7 +245,7 @@ (declare-function image-scroll-down "image-mode" (&optional n)) (declare-function image-scroll-up "image-mode" (&optional n)) (declare-function quit-window "window" (&optional kill window)) -(declare-function rfc2368-parse-mailto-url "rfc2368" (mailto-url)) ;; Emacs<=27 +(declare-function rfc2368-parse-mailto-url "rfc2368" (mailto-url)) ;; Emacs=27 (declare-function rfc6068-parse-mailto-url "rfc6068" (mailto-url)) ;; Emacs>=28 (declare-function w3m-search-escape-query-string "w3m-search" (str &optional coding)) @@ -2428,9 +2428,10 @@ (when (memq 'xbm types) '(("image/x-xbm" . xbm))) (when (memq 'xpm types) '(("image/x-xpm" . xpm))))))) "Alist of content types and image types defined as the Emacs features. -The content types not listed in this variable, like image/webp, might -be able to display if image-converter.el and some converter program are -available, or ImageMagick is built-in in Emacs or installed.") +The content types not listed in this variable, like image/webp on Emacs +28 and olders, might be able to display if image-converter.el and some +converter program are available, or ImageMagick is built-in in Emacs or +installed.") (defconst w3m-toolbar-buttons '("back" "parent" "forward" "reload" "open" "home" "search" "image" @@ -3484,17 +3485,16 @@ (if (fboundp 'imagemagick-types) (imagemagick-types) (cons 'WEBP imagemagick-enabled-types))))) - (setq type (if (memq 'imagemagick image-types) - 'imagemagick ;; ImageMagick has been built-in - (if (boundp 'image-use-external-converter) - ;; Emacs >=27; to make it work, some - ;; converter program is required to have - ;; been installed; see image-converter.el. - 'image-convert - (if (w3m-which-command "convert") - 'convert)))) - (push (cons content-type type) w3m-image-type-alist) - type))))) + (progn + (setq type (if (memq 'imagemagick image-types) + ;; ImageMagick has been built-in + 'imagemagick + ;; To make it work, some converter + ;; program is required to have been + ;; installed; see image-converter.el. + 'image-convert)) + (push (cons content-type type) w3m-image-type-alist) + type)))))) (defun w3m-handle-non-anchor-buttons () "Return a boolean value corresponding to the variable of the same name." @@ -8692,10 +8692,7 @@ (w3m-fb-delete-frame-buffers) (display-buffer-same-window (other-buffer) nil)) (remove-hook 'window-configuration-change-hook - #'w3m-redisplay-pages-automatically) - (when (= emacs-major-version 26) - (remove-hook 'window-size-change-functions - #'w3m-redisplay-pages-automatically)))) + #'w3m-redisplay-pages-automatically))) (defun w3m-close-window () "Bury emacs-w3m buffers and close windows and frames. @@ -9122,10 +9119,7 @@ (setq w3m-last-window-width (window-width)) (when w3m-redisplay-pages-automatically-p (add-hook 'window-configuration-change-hook - #'w3m-redisplay-pages-automatically) - (when (= emacs-major-version 26) - (add-hook 'window-size-change-functions - #'w3m-redisplay-pages-automatically))) + #'w3m-redisplay-pages-automatically)) (w3m-setup-toolbar) (w3m-setup-menu) (run-hooks 'w3m-mode-setup-functions) ++++++ emacs-w3m.obsinfo ++++++ --- /var/tmp/diff_new_pack.4eQk33/_old 2022-04-11 23:50:59.729871216 +0200 +++ /var/tmp/diff_new_pack.4eQk33/_new 2022-04-11 23:50:59.733871170 +0200 @@ -1,6 +1,6 @@ name: emacs-w3m -version: 1.4.632+501+gc088fe62 -mtime: 1633747959 -commit: c088fe627f12597726dfc2062454e2e7bd99798a +version: 1.4.632+512+gc3a3a947 +mtime: 1649122917 +commit: c3a3a947fb267df1f03287be2eab4f7119707e90
