From: Rob Browning Date: Tue, 10 Sep 2019 00:54:47 +0000 (-0500) Subject: Merge upstream version 26.3 X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~143 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=facbad3e29b8f3a2f7502aef97e3ed6a2211559f;p=emacs.git Merge upstream version 26.3 Closes: 939737 --- facbad3e29b8f3a2f7502aef97e3ed6a2211559f diff --cc debian/.git-dpm index 73b9dc1fe7a,00000000000..21a8f65a901 mode 100644,000000..100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@@ -1,8 -1,0 +1,8 @@@ +# see git-dpm(1) from git-dpm package - 3cd4b72717032b17e596fce6f475f4a4029fa236 - 3cd4b72717032b17e596fce6f475f4a4029fa236 - 511a2cebd6df0f71ec24b5939564fb58726ead84 ++ea69030e0a64234bd6e459bfdbc737e744b42762 ++ea69030e0a64234bd6e459bfdbc737e744b42762 ++b820e6781829e25468113a01b4310907740ffe06 +b820e6781829e25468113a01b4310907740ffe06 +emacs_26.3+1.orig.tar.xz +0cd09244355fe10f8db19707cceeaa75e8dde3b2 +24346116 diff --cc debian/patches/0001-Prefer-usr-share-info-emacs.patch index ad7cba36886,00000000000..112ff12c33b mode 100644,000000..100644 --- a/debian/patches/0001-Prefer-usr-share-info-emacs.patch +++ b/debian/patches/0001-Prefer-usr-share-info-emacs.patch @@@ -1,27 -1,0 +1,27 @@@ - From 888dd6f8381aea7c01ea578b3357b9edb9bf988d Mon Sep 17 00:00:00 2001 ++From b5e23aef8d95f3a028312f12c983df6075483463 Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Sun, 7 Apr 2013 15:03:05 -0500 +Subject: Prefer /usr/share/info/emacs/ + +Emacs prefers /usr/share/info/emacs to /usr/share/info. + +The value of Info-default-directory-list has been augmented via +lisp/info.el to include /usr/share/info/emacs before /usr/share/info. +--- + lisp/info.el | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lisp/info.el b/lisp/info.el - index 8743b449976..14d62f7f1cb 100644 ++index 94b0ef6ce75..785f92ab57f 100644 +--- a/lisp/info.el ++++ b/lisp/info.el - @@ -213,7 +213,8 @@ A header-line does not scroll with the rest of the buffer." ++@@ -222,7 +222,8 @@ Info-default-directory-list + (nconc standard-info-dirs (list config-dir)) + (cons config-dir standard-info-dirs)))) + (if (not (eq system-type 'windows-nt)) +- dirs ++ ;; Debian: add flavor info directory in front ++ (cons "/usr/share/info/emacs" dirs) + ;; Include the info directory near where Emacs executable was installed. + (let* ((instdir (file-name-directory invocation-directory)) + (dir1 (expand-file-name "../info/" instdir)) diff --cc debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch index af3a3450d5f,00000000000..bda0375aa9c mode 100644,000000..100644 --- a/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch +++ b/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch @@@ -1,56 -1,0 +1,56 @@@ - From 381dc48e4f31a00726f44f3723b913aea4485cca Mon Sep 17 00:00:00 2001 ++From 1626a4d516125deca5eb8d0f7a63b6d48d6ab63d Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Mon, 4 Apr 2011 22:46:22 -0500 +Subject: Run debian-startup and set debian-emacs-flavor + +Emacs runs debian-startup and sets debian-emacs-flavor. + +* Emacs runs debian-startup during the startup process unless + site-run-file is false. + +* The global variable debian-emacs-flavor is bound to 'emacs. + +Author: Rob Browning +--- + lisp/startup.el | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) + +diff --git a/lisp/startup.el b/lisp/startup.el - index 9d16b59defd..d20431492a7 100644 ++index 32051c232ca..6ee20ccf597 100644 +--- a/lisp/startup.el ++++ b/lisp/startup.el - @@ -434,6 +434,10 @@ Warning Warning!!! Pure space overflow !!!Warning Warning ++@@ -434,6 +434,10 @@ tutorial-directory + :type 'directory + :initialize #'custom-initialize-delay) + ++(defconst debian-emacs-flavor 'emacs ++ "A symbol representing the particular debian flavor of emacs running. ++Something like 'emacs, 'xemacs21, etc.") ++ + (defun normal-top-level-add-subdirs-to-load-path () + "Recursively add all subdirectories of `default-directory' to `load-path'. + More precisely, this uses only the subdirectories whose names - @@ -1121,8 +1125,21 @@ please check its value") ++@@ -1129,8 +1133,21 @@ command-line + ;; be loaded from site-run-file and wants to test if -q was given + ;; should check init-file-user instead, since that is already set. + ;; See cus-edit.el for an example. +- (if site-run-file +- (load site-run-file t t)) ++ ++ ;; Original upstream startup ++ ;; (if site-run-file ++ ;; (load site-run-file t t)) ++ ;; ++ ++ ;; Debian startup ++ (if site-run-file ++ (progn ++ ;; Load all the debian package snippets. ++ ;; It's in here because we want -q to kill it too. ++ (if (load "debian-startup" t t nil) ++ (debian-startup debian-emacs-flavor)) ++ ;; Now the normal site file... ++ (load site-run-file t t))) + + ;; Sites should not disable this. Only individuals should disable + ;; the startup screen. diff --cc debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch index c24bd8b098f,00000000000..23bc6188f6c mode 100644,000000..100644 --- a/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch +++ b/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch @@@ -1,270 -1,0 +1,270 @@@ - From d641a7c62e38661b1d786adc846b73b2e40595d1 Mon Sep 17 00:00:00 2001 ++From ab940f42b7ca0208b7c734fe3a9bce4209add168 Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Mon, 4 Apr 2011 22:46:24 -0500 +Subject: Remove files that appear to be incompatible with the DFSG + +Files that appear to be incompatible with the DFSG have been removed. + +A number of files have been removed from this package because their +licenses are not compatible with the Debian Free Software Guidelines +(DFSG), or because it wasn't completely clear that their licenses are +compatible. + +In particular, all of the files which are covered under the GFDL and +have invariant sections have been removed in accordance with this +General Resolution: http://www.debian.org/vote/2006/vote_001. + +The files that have been removed, but still appear to be +distributable, have been moved to packages in Debian's non-free +section. + +Author: Rob Browning +Added-by: Rob Browning +Status: new +--- + Makefile.in | 44 +++++++++++++++++--------------------------- + admin/update_autogen | 3 +-- + configure.ac | 15 ++++++--------- + doc/misc/Makefile.in | 43 +++++-------------------------------------- + lisp/help.el | 8 ++++++++ + 5 files changed, 37 insertions(+), 76 deletions(-) + +diff --git a/Makefile.in b/Makefile.in - index 238df40ded8..baed5771863 100644 ++index 364deeae226..0e0931bd626 100644 +--- a/Makefile.in ++++ b/Makefile.in - @@ -159,7 +159,9 @@ man1dir=$(mandir)/man1 ++@@ -162,7 +162,9 @@ man1dir=$(mandir)/man1 + # Where to install and expect the info files describing Emacs. + infodir=@infodir@ + # Info files not in the doc/misc directory (we get those via make echo-info). +-INFO_NONMISC=emacs.info eintr.info elisp.info ++# Debian: moved DFSG incompatible files to emacs*-common-non-dfsg ++# package (see /usr/share/doc/emacs*-common/copyright). ++INFO_NONMISC= + + # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes". + HAVE_MAKEINFO=@HAVE_MAKEINFO@ - @@ -814,8 +816,7 @@ endef ++@@ -820,8 +822,7 @@ endef + ### normally don't want to recompile. For example, the 'mostlyclean' + ### target for GCC does not delete 'libgcc.a', because recompiling it + ### is rarely necessary and takes a lot of time. +-mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/emacs doc/misc \ +- doc/lispref doc/lispintro ++mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/misc + + $(foreach dir,$(mostlyclean_dirs),$(eval $(call submake_template,$(dir),mostlyclean))) + - @@ -947,11 +948,11 @@ check check-maybe check-expensive check-all: have-tests all ++@@ -953,11 +954,11 @@ check check-maybe check-expensive check-all: have-tests all + dist: + cd ${srcdir}; ./make-dist + +-DVIS = lispref-dvi lispintro-dvi emacs-dvi misc-dvi +-HTMLS = lispref-html lispintro-html emacs-html misc-html +-INFOS = lispref-info lispintro-info emacs-info misc-info +-PDFS = lispref-pdf lispintro-pdf emacs-pdf misc-pdf +-PSS = lispref-ps lispintro-ps emacs-ps misc-ps ++DVIS = misc-dvi ++HTMLS = misc-html ++INFOS = misc-info ++PDFS = misc-pdf ++PSS = misc-ps + + DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS) + $(DOCS): - @@ -972,9 +973,6 @@ info-dir: ${srcdir}/info/dir ++@@ -978,9 +979,6 @@ info-dir: ${srcdir}/info/dir + + ## Hopefully doc/misc/*.texi is not too long for some systems? + srcdir_doc_info_dir_inputs = \ +- ${srcdir}/doc/emacs/emacs.texi \ +- ${srcdir}/doc/lispintro/emacs-lisp-intro.texi \ +- ${srcdir}/doc/lispref/elisp.texi \ + $(sort $(wildcard ${srcdir}/doc/misc/*.texi)) + info_dir_inputs = \ + ../build-aux/dir_top \ - @@ -996,14 +994,10 @@ ${srcdir}/info/dir: ${info_dir_deps} ++@@ -1002,14 +1000,10 @@ ${srcdir}/info/dir: ${info_dir_deps} + AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \ + ) >$@.tmp && mv $@.tmp $@ + +-INSTALL_DVI = install-emacs-dvi install-lispref-dvi \ +- install-lispintro-dvi install-misc-dvi +-INSTALL_HTML = install-emacs-html install-lispref-html \ +- install-lispintro-html install-misc-html +-INSTALL_PDF = install-emacs-pdf install-lispref-pdf \ +- install-lispintro-pdf install-misc-pdf +-INSTALL_PS = install-emacs-ps install-lispref-ps \ +- install-lispintro-ps install-misc-ps ++INSTALL_DVI = install-misc-dvi ++INSTALL_HTML = install-misc-html ++INSTALL_PDF = install-misc-pdf ++INSTALL_PS = install-misc-ps + INSTALL_DOC = $(INSTALL_DVI) $(INSTALL_HTML) $(INSTALL_PDF) $(INSTALL_PS) + + ## Install non .info forms of the documentation. - @@ -1021,14 +1015,10 @@ install-pdf: $(INSTALL_PDF) ++@@ -1027,14 +1021,10 @@ install-pdf: $(INSTALL_PDF) + install-ps: $(INSTALL_PS) + + +-UNINSTALL_DVI = uninstall-emacs-dvi uninstall-lispref-dvi \ +- uninstall-lispintro-dvi uninstall-misc-dvi +-UNINSTALL_HTML = uninstall-emacs-html uninstall-lispref-html \ +- uninstall-lispintro-html uninstall-misc-html +-UNINSTALL_PDF = uninstall-emacs-pdf uninstall-lispref-pdf \ +- uninstall-lispintro-pdf uninstall-misc-pdf +-UNINSTALL_PS = uninstall-emacs-ps uninstall-lispref-ps \ +- uninstall-lispintro-ps uninstall-misc-ps ++UNINSTALL_DVI = uninstall-misc-dvi ++UNINSTALL_HTML = uninstall-misc-html ++UNINSTALL_PDF = uninstall-misc-pdf ++UNINSTALL_PS = uninstall-misc-ps + UNINSTALL_DOC = $(UNINSTALL_DVI) $(UNINSTALL_HTML) $(UNINSTALL_PDF) $(UNINSTALL_PS) + + $(UNINSTALL_DOC): +diff --git a/admin/update_autogen b/admin/update_autogen - index d2118674792..7708b3fa03c 100755 ++index 651d35beafb..a767b541fc7 100755 +--- a/admin/update_autogen ++++ b/admin/update_autogen +@@ -259,8 +259,7 @@ info_dir () + $topic + EOF + ## Bit faster than doc/*/*.texi. +- for file in doc/emacs/emacs.texi doc/lispintro/*.texi \ +- doc/lispref/elisp.texi doc/misc/*.texi; do ++ for file in doc/misc/*.texi; do + + ## FIXME do not ignore w32 if OS is w32. + case $file in +diff --git a/configure.ac b/configure.ac - index 256b954a89c..976667caf32 100644 ++index ebf24c8657e..4561ef7f868 100644 +--- a/configure.ac ++++ b/configure.ac - @@ -5480,7 +5480,7 @@ dnl config.status treats $srcdir specially, so I think this is ok... ++@@ -5487,7 +5487,7 @@ dnl config.status treats $srcdir specially, so I think this is ok... + AC_CONFIG_FILES([$srcdir/doc/man/emacs.1]) + + m4_define([subdir_makefiles], +- [lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile]) ++ [lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/misc/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile]) + SUBDIR_MAKEFILES="subdir_makefiles" + AC_CONFIG_FILES(subdir_makefiles) + - @@ -5533,14 +5533,11 @@ if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then ++@@ -5540,14 +5540,11 @@ if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then + fi + ]) + +-dnl Perhaps this would be better named doc-emacs-emacsver.texi? +-dnl See comments for etc-refcards-emacsver.tex. +-dnl Since we get a doc/emacs directory generated anyway, for the Makefile, +-dnl it is not quite the same. But we are generating in $srcdir. +-AC_CONFIG_COMMANDS([doc/emacs/emacsver.texi], [ +-${MAKE-make} -s --no-print-directory -C doc/emacs doc-emacsver || \ +-AC_MSG_ERROR(['doc/emacs/emacsver.texi' could not be made.]) +-]) ++# This file is normally generated indirectly via ++# doc/emacs/Makefile.in, but since we've removed the other doc/emacs ++# files for the DFSG split, and we don't have any prebuilt info files, ++# generate it directly here. ++AC_CONFIG_FILES([doc/emacs/emacsver.texi]) + + dnl If we give this the more natural name, etc/refcards/emacsver.texi, + dnl then a directory etc/refcards is created in the build directory, +diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in - index 11086b33037..76fca3ff416 100644 ++index d02f42bbeb9..b5447f6ba10 100644 +--- a/doc/misc/Makefile.in ++++ b/doc/misc/Makefile.in +@@ -61,18 +61,14 @@ INSTALL_DATA = @INSTALL_DATA@ + MAKEINFO = @MAKEINFO@ + MAKEINFO_OPTS = --force -I$(emacsdir) + ++# Debian: moved DFSG incompatible files to emacs*-common-non-dfsg ++# package (see /usr/share/doc/emacs*-common/copyright). ++ + ## On MS Windows, efaq-w32; otherwise blank. + DOCMISC_W32 = @DOCMISC_W32@ + + ## Info files to build and install on all platforms. +-INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \ +- dbus dired-x ebrowse ede ediff edt eieio \ +- emacs-mime epa erc ert eshell eudc efaq eww \ +- flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \ +- mairix-el message mh-e newsticker nxml-mode octave-mode \ +- org pcl-cvs pgg rcirc remember reftex sasl \ +- sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp \ +- url vhdl-mode vip viper widget wisent woman ++INFO_COMMON = efaq + + ## Info files to install on current platform. + INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32) +@@ -150,9 +146,6 @@ define info_template + $(1): $$(buildinfodir)/$(1).info + endef + +-## "info" is already taken. +-info.info: $(buildinfodir)/info.info +- + $(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_template,$(ifile)))) + + +@@ -174,20 +167,11 @@ $(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_templ + + ## Extra dependencies. + +-need_emacsver = calc cl dired-x efaq efaq-w32 erc ido reftex woman ++need_emacsver = efaq efaq-w32 + need_emacsver_prefix = $(addprefix ${buildinfodir}/,${need_emacsver}) + + $(need_emacsver_prefix:=.info) $(need_emacsver:=.dvi) $(need_emacsver:=.pdf) $(need_emacsver:=.html) : ${emacsdir}/emacsver.texi + +-$(buildinfodir)/gnus.info gnus.html: ${srcdir}/gnus-faq.texi +- +-$(buildinfodir)/semantic.info semantic.dvi semantic.pdf semantic.html: ${srcdir}/sem-user.texi +- +- +-## Please can we just rename cc-mode.texi to ccmode.texi... +-${buildinfodir}/ccmode.info: \ +- ${srcdir}/cc-mode.texi ${gfdl} ${style} | ${buildinfodir} +- $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + + ## efaq, efaq_w32 do not depend on gfdl. + ## Maybe we can use .SECONDEXPANSION for this. +@@ -203,23 +187,6 @@ efaq%.pdf: ${srcdir}/efaq%.texi + efaq%.html: ${srcdir}/efaq%.texi + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + +-${buildinfodir}/emacs-mime.info emacs-mime.html: EXTRA_OPTS = --enable-encoding +- +-gnus_deps = ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl} ${style} +-gnus.dvi: $(gnus_deps) +- sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmpdvi.texi +- $(ENVADD) $(TEXI2DVI) gnustmpdvi.texi +- cp gnustmpdvi.dvi $@ +- rm gnustmpdvi.* +- +-gnus.pdf: $(gnus_deps) +- sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmppdf.texi +- $(ENVADD) $(TEXI2PDF) gnustmppdf.texi +- cp gnustmppdf.pdf $@ +- rm gnustmppdf.* +- +-${buildinfodir}/tramp.info tramp.html: ${srcdir}/trampver.texi +- + + .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean + +diff --git a/lisp/help.el b/lisp/help.el - index 77e32848318..22516310692 100644 ++index c23d4d8fe54..a081d13f5d0 100644 +--- a/lisp/help.el ++++ b/lisp/help.el - @@ -292,6 +292,14 @@ If that doesn't give a function, return nil." ++@@ -292,6 +292,14 @@ view-help-file + (goto-address-mode 1) + (goto-char (point-min))) + ++(defun debian-expand-file-name-dfsg (filename) ++ "Apply expand-file-name to FILENAME. ++If expand-file-name does not find a file, append `.dfsg' and try again." ++ (let ((file (expand-file-name filename data-directory))) ++ (if (file-exists-p file) ++ file ++ (expand-file-name (concat file ".dfsg") data-directory)))) ++ + (defun describe-distribution () + "Display info on how to obtain the latest version of GNU Emacs." + (interactive) diff --cc debian/patches/0004-Adjust-documentation-references-for-Debian.patch index 7c403534802,00000000000..b8593e586b1 mode 100644,000000..100644 --- a/debian/patches/0004-Adjust-documentation-references-for-Debian.patch +++ b/debian/patches/0004-Adjust-documentation-references-for-Debian.patch @@@ -1,29 -1,0 +1,29 @@@ - From 2ea6063c2c43ae7816e387548dbb3ba1800293ad Mon Sep 17 00:00:00 2001 ++From 8aa3059b73a8704207dc6d75a186c3bbb96005a6 Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Mon, 4 Apr 2011 22:46:25 -0500 +Subject: Adjust documentation references for Debian + +Various documentation references have been adjusted for Debian. + +References to /usr/local/... have been changed to /usr/... as +appropriate, etc. +--- + etc/NEWS | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/etc/NEWS b/etc/NEWS - index 10afb7b4202..a866194bfea 100644 ++index d672d057bb3..fc63a563d28 100644 +--- a/etc/NEWS ++++ b/etc/NEWS - @@ -15,6 +15,11 @@ in older Emacs versions. - You can narrow news to a specific version by calling 'view-emacs-news' - with a prefix argument or by typing C-u C-h C-n. ++@@ -192,6 +192,11 @@ build-time. See nextstep/INSTALL for details. ++ (This change was actually made in Emacs 26.1, but was undocumented and ++ not called out in its NEWS.) + ++ ++* Debian specific changes to Emacs ++ ++Please see /usr/share/doc/emacs-common/README.Debian.gz. ++ + + * Installation Changes in Emacs 26.1 + diff --cc debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch index dde0a278813,00000000000..53299a1e8a7 mode 100644,000000..100644 --- a/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch +++ b/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch @@@ -1,26 -1,0 +1,26 @@@ - From d69466776a75671d6d818b3b4a0be73c54876c3d Mon Sep 17 00:00:00 2001 ++From 580b54df0b8bb5d3076830d7ea0b3cbe03bc2065 Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Mon, 4 Apr 2011 22:46:28 -0500 +Subject: Modify the output of (version) to indicate Debian modifications + +The output of (version) has been modified to indicate Debian modifications. + +Author: Rob Browning +Added-by: Rob Browning +--- + lisp/version.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lisp/version.el b/lisp/version.el - index 3a38b1d83c8..5d1248ac581 100644 ++index cb9d0442ccf..11ce4e475db 100644 +--- a/lisp/version.el ++++ b/lisp/version.el - @@ -62,7 +62,7 @@ Don't use this function in programs to choose actions according ++@@ -62,7 +62,7 @@ emacs-version + to the system configuration; look at `system-configuration' instead." + (interactive "P") + (let ((version-string +- (format "GNU Emacs %s (build %s, %s%s%s%s)%s" ++ (format "GNU Emacs %s (build %s, %s%s%s%s)%s, modified by Debian" + emacs-version + emacs-build-number + system-configuration diff --cc debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch index aff85120f63,00000000000..d5df1e19fff mode 100644,000000..100644 --- a/debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch +++ b/debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch @@@ -1,31 -1,0 +1,31 @@@ - From 598ff07f7cee81ffe382d37a3d134599a63d5a90 Mon Sep 17 00:00:00 2001 ++From a7b79cf9cbb2cb4c8a84935231106ffe07274f33 Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Tue, 21 Oct 2014 19:10:17 -0500 +Subject: Don't try to build src/macuvs.h (via IVD_Sequences.txt) + +These are OS X specific, and were removed for now, due to uncertainty +over the licensing. +--- + admin/unidata/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in - index 818404f8baf..bb1223248b9 100644 ++index 31efba0227a..3a23f796f70 100644 +--- a/admin/unidata/Makefile.in ++++ b/admin/unidata/Makefile.in +@@ -56,7 +56,7 @@ am__v_at_1 = + + .PHONY: all + +-all: ${top_srcdir}/src/macuvs.h ${unifiles} ${unidir}/charscript.el \ ++all: ${unifiles} ${unidir}/charscript.el \ + ${unidir}/charprop.el + + ## Specify .elc as an order-only prereq so as to not needlessly rebuild +@@ -117,5 +117,5 @@ maintainer-clean: distclean + ## change and it slows down bootstrap (a tiny bit). + ## Cf leim/ja-dic (which is much slower). + extraclean: +- rm -f ${top_srcdir}/src/macuvs.h ${unidir}/charscript.el* ++ rm -f ${unidir}/charscript.el* + rm -f ${unifiles} ${unidir}/charprop.el diff --cc debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch index a51d19803c7,00000000000..0d9b3a038ed mode 100644,000000..100644 --- a/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch +++ b/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch @@@ -1,41 -1,0 +1,41 @@@ - From 106dcf98d829f04606674df728bb95f99f5298c0 Mon Sep 17 00:00:00 2001 ++From cf13a10435f407dc71e2d82558794a0e1a6748ae Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Mon, 10 Oct 2016 17:35:56 -0500 +Subject: Kill gpg agent in package-test.el to avoid a race + +package-test.el should no longer fail during clean up. + +* Previously a delete-directories call raced with the gpg agent's own + cleanup process (presumably triggered by the first deletion of one of + the agent's sockets). As a result, it looks like the agent might + delete one of its sockets after delete-directories had decided to + delete the socket, but before it made the attempt, causing an + exception. + +* To fix the problem, explicitly ask gpg-connect-agent to kill the agent + before attempting to delete the gnupg home directory, and then delete + via "rm -rf" to ignore any vanishing files. +--- + test/lisp/emacs-lisp/package-tests.el | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el - index 62fba58919f..e4aa519a4c6 100644 ++index 212e73f4726..c28c8077ac7 100644 +--- a/test/lisp/emacs-lisp/package-tests.el ++++ b/test/lisp/emacs-lisp/package-tests.el - @@ -150,7 +150,14 @@ ++@@ -150,7 +150,14 @@ package-test-fake-contents-file + ,@body))) + + (when (file-directory-p package-test-user-dir) +- (delete-directory package-test-user-dir t)) ++ (call-process "gpg-connect-agent" nil nil nil ++ "--homedir" (concat package-test-user-dir "/gnupg") ++ "--no-autostart" ++ "killagent" "/bye") ++ ;; Call "rm -rf" instead of delete-directory so that it won't ++ ;; choke if the gpg-agent sockets disappear during the ++ ;; recursive traversal. ++ (call-process "rm" nil nil nil "-r" package-test-user-dir)) + + (when (and (boundp 'package-test-archive-upload-base) + (file-directory-p package-test-archive-upload-base)) diff --cc debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch index df237f798a8,00000000000..76719bcab48 mode 100644,000000..100644 --- a/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch +++ b/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch @@@ -1,44 -1,0 +1,44 @@@ - From bda90e2ab5203feb938188cbd8e029c9b2a467db Mon Sep 17 00:00:00 2001 ++From 411e4cc35d58d3b02dffa6fa83a350666d17f6d9 Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Sat, 29 Jul 2017 11:50:27 -0500 +Subject: Don't downcase real xref in elisp-mode-tests + +The elisp-mode-tests should no longer fail on case sensitive +filesystems when the build path contains uppercase characters. + +Previously the code was downcasing the path for both comparison and +lookups. +--- + test/lisp/progmodes/elisp-mode-tests.el | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el - index 941e85bc890..faf45b88ff7 100644 ++index bc2d14b9498..26db1cbc102 100644 +--- a/test/lisp/progmodes/elisp-mode-tests.el ++++ b/test/lisp/progmodes/elisp-mode-tests.el - @@ -301,11 +301,15 @@ ++@@ -311,11 +311,15 @@ xref--case-insensitive + (defun xref-elisp-test-run (xrefs expected-xrefs) + (should (= (length xrefs) (length expected-xrefs))) + (while xrefs +- (let* ((xref (pop xrefs)) ++ (let* ((real-xref (pop xrefs)) ++ (xref (clone real-xref)) + (expected (pop expected-xrefs)) + (expected-xref (or (when (consp expected) (car expected)) expected)) + (expected-source (when (consp expected) (cdr expected)))) + ++ (setf (oref xref location) ++ (copy-xref-elisp-location (oref xref location))) ++ + ;; Downcase the filenames for case-insensitive file systems. - (setf (xref-elisp-location-file (oref xref location)) - (downcase (xref-elisp-location-file (oref xref location)))) - @@ -315,7 +319,7 @@ ++ (when xref--case-insensitive ++ (setf (xref-elisp-location-file (oref xref location)) ++@@ -327,7 +331,7 @@ xref-elisp-test-run + + (should (equal xref expected-xref)) + +- (xref--goto-location (xref-item-location xref)) ++ (xref--goto-location (xref-item-location real-xref)) + (back-to-indentation) + (should (looking-at (or expected-source + (xref-elisp-test-descr-to-target expected))))) diff --cc debian/patches/0009-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch index 00000000000,00000000000..76b84e8f412 new file mode 100644 --- /dev/null +++ b/debian/patches/0009-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch @@@ -1,0 -1,0 +1,74 @@@ ++From dea7c2e140df4e0aa87f7e557cca7057885632ff Mon Sep 17 00:00:00 2001 ++From: Rob Browning ++Date: Sun, 16 Dec 2018 17:13:36 -0600 ++Subject: Mark vc-bzr-test-fauilt-bzr-autoloads as unstable for now ++ ++Currently the test fails like this: ++ ++ Running 3 tests (2018-12-17 12:17:43-0600) ++ passed 1/3 vc-bzr-test-bug9726 ++ Mark set ++ Press C-c C-c when you are done editing. ++ Enter a change comment. Type C-c C-c when done ++ passed 2/3 vc-bzr-test-bug9781 ++ Falling back on "slow" status detection ((file-missing "Opening input file" "No such file or directory" "/tmp/vc-bzr-testVlgmsb/bzr/.bzr/checkout/dirstate")) ++ Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)") ++ Warnings in `bzr' output: bzr: ERROR: invalid header line: '' ++ ++ Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)") ++ Warnings in `bzr' output: bzr: ERROR: invalid header line: '' ++ ++ Test vc-bzr-test-faulty-bzr-autoloads backtrace: ++ logand(nil 128) ++ vc-mode-line("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el" Bzr) ++ vc-refresh-state() ++ run-hooks(find-file-hook) ++ after-find-file(t t) ++ find-file-noselect-1(# "/tmp/vc-bzr-testVlgmsb/b ++ find-file-noselect("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el") ++ autoload-find-generated-file() ++ update-directory-autoloads("/tmp/vc-bzr-testVlgmsb/bzr/") ++ (progn (update-directory-autoloads default-directory) t) ++ (setq value-35 (progn (update-directory-autoloads default-directory) ++ (unwind-protect (setq value-35 (progn (update-directory-autoloads de ++ (if (unwind-protect (setq value-35 (progn (update-directory-autoload ++ (let (form-description-36) (if (unwind-protect (setq value-35 (progn ++ (let ((value-35 (gensym "ert-form-evaluation-aborted-"))) (let (form ++ (progn (call-process vc-bzr-program nil nil nil "init") (let ((temp- ++ (unwind-protect (progn (call-process vc-bzr-program nil nil nil "ini ++ (let* ((homedir (make-temp-file "vc-bzr-test" t)) (bzrdir (expand-fi ++ (lambda nil (let* ((fn-30 (function executable-find)) (args-31 (cond ++ ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test ++ ert-run-test(#s(ert-test :name vc-bzr-test-faulty-bzr-autoloads :doc ++ ert-run-or-rerun-test(#s(ert--stats :selector (not (or (tag :expensi ++ ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co ++ ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable))) ++ ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un ++ eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) ( ++ command-line-1(("-L" ":/home/locke/tmp/main-26.1/debian/build-src/te ++ command-line() ++ normal-top-level() ++ Test vc-bzr-test-faulty-bzr-autoloads condition: ++ (wrong-type-argument number-or-marker-p nil) ++ FAILED 3/3 vc-bzr-test-faulty-bzr-autoloads ++ ++ Ran 3 tests, 2 results as expected, 1 unexpected (2018-12-17 12:17:46-0600) ++ ++ 1 unexpected results: ++ FAILED vc-bzr-test-faulty-bzr-autoloads ++--- ++ test/lisp/vc/vc-bzr-tests.el | 1 + ++ 1 file changed, 1 insertion(+) ++ ++diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el ++index af65cd1c205..96282e0f7ad 100644 ++--- a/test/lisp/vc/vc-bzr-tests.el +++++ b/test/lisp/vc/vc-bzr-tests.el ++@@ -111,6 +111,7 @@ ++ ;; https://lists.gnu.org/r/help-gnu-emacs/2012-04/msg00145.html ++ (ert-deftest vc-bzr-test-faulty-bzr-autoloads () ++ "Test we can generate autoloads in a bzr directory when bzr is faulty." +++ :tags '(:unstable) ++ (skip-unless (executable-find vc-bzr-program)) ++ ;; Avoid vc-mode-line bug; ++ ;; http://lists.gnu.org/r/emacs-devel/2018-12/msg00368.html diff --cc debian/patches/0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch index 00000000000,00000000000..68121292fec new file mode 100644 --- /dev/null +++ b/debian/patches/0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch @@@ -1,0 -1,0 +1,22 @@@ ++From 2ad9737023c999e593dba4a98b6b8e394317d960 Mon Sep 17 00:00:00 2001 ++From: Rob Browning ++Date: Mon, 17 Dec 2018 15:27:30 -0600 ++Subject: Mark echo-server-with-dns test as :unstable for now ++ ++It fails inside a Debian sbuild chroot. ++--- ++ test/lisp/net/network-stream-tests.el | 1 + ++ 1 file changed, 1 insertion(+) ++ ++diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el ++index 29b92da3de0..478b1bb823f 100644 ++--- a/test/lisp/net/network-stream-tests.el +++++ b/test/lisp/net/network-stream-tests.el ++@@ -100,6 +100,7 @@ server-process-filter ++ )))) ++ ++ (ert-deftest echo-server-with-dns () +++ :tags '(:unstable) ;; This doesn't work in an sbuild chroot (at least) ++ (let* ((server (make-server (system-name))) ++ (port (aref (process-contact server :local) 4)) ++ (proc (make-network-process :name "foo" diff --cc debian/patches/0011-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch index 00000000000,00000000000..851e274a75d new file mode 100644 --- /dev/null +++ b/debian/patches/0011-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch @@@ -1,0 -1,0 +1,31 @@@ ++From ea69030e0a64234bd6e459bfdbc737e744b42762 Mon Sep 17 00:00:00 2001 ++From: Glenn Morris ++Date: Sat, 15 Dec 2018 14:49:46 -0800 ++Subject: Fix an eshell ls dired test for non-recent files ++ ++* test/lisp/eshell/em-ls-tests.el (em-ls-test-bug27844): ++Work around an eshell issue with non-recent files. (Bug#33734) ++--- ++ test/lisp/eshell/em-ls-tests.el | 9 ++++++++- ++ 1 file changed, 8 insertions(+), 1 deletion(-) ++ ++diff --git a/test/lisp/eshell/em-ls-tests.el b/test/lisp/eshell/em-ls-tests.el ++index a2072d6b392..4ee51b4f4c2 100644 ++--- a/test/lisp/eshell/em-ls-tests.el +++++ b/test/lisp/eshell/em-ls-tests.el ++@@ -87,7 +87,14 @@ ++ (dired-toggle-marks) ++ (should (cdr (dired-get-marked-files))) ++ (kill-buffer buf) ++- (setq buf (dired (expand-file-name "lisp/subr.el" source-directory))) +++ ;; Eshell's default format duplicates the year for non-recent files, +++ ;; eg "2015-05-06 2015", which doesn't make a lot of sense, +++ ;; and causes this portion of the test to fail if subr.el +++ ;; is non-recent (eg if building from a tarfile unpacked +++ ;; with a fixed early timestamp for reproducibility). Bug#33734. +++ (let ((eshell-ls-date-format "%b %e")) +++ (setq buf (dired (expand-file-name "lisp/subr.el" +++ source-directory)))) ++ (should (looking-at "subr\\.el"))) ++ (customize-set-variable 'eshell-ls-use-in-dired orig) ++ (and (buffer-live-p buf) (kill-buffer))))) diff --cc debian/patches/series index f79969df122,00000000000..db84ba5b7a4 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,16 -1,0 +1,11 @@@ +0001-Prefer-usr-share-info-emacs.patch +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch +0004-Adjust-documentation-references-for-Debian.patch +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch +0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch - 0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch - 0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch - 0011-tramp-test42-remote-load-path-regexp-quote-directory.patch - 0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch - 0013-Mark-echo-server-with-dns-test-as-unstable-for-now.patch - 0014-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch - 0015-Ignore-color-fonts-when-using-Xft.patch - 0016-Port-FC_COLOR-change-to-older-fontconfig.patch ++0009-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch ++0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch ++0011-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch