From: Rob Browning Date: Sun, 16 Dec 2018 19:10:28 +0000 (-0600) Subject: Merge upstream version 26.1 X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~185 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6d2fd261bb7cbea7a9621a137b11919bfb9eeb9a;p=emacs.git Merge upstream version 26.1 --- 6d2fd261bb7cbea7a9621a137b11919bfb9eeb9a diff --cc debian/.git-dpm index bebdd40c77a,00000000000..f9da0b0a3b6 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 - bc952e642091959638f819a1e4617deccfef97d0 - bc952e642091959638f819a1e4617deccfef97d0 - 09a20fd582947ca08f0e80bc5353ae8abfe1e5ed ++bda90e2ab5203feb938188cbd8e029c9b2a467db ++bda90e2ab5203feb938188cbd8e029c9b2a467db ++511a2cebd6df0f71ec24b5939564fb58726ead84 +511a2cebd6df0f71ec24b5939564fb58726ead84 +emacs_26.1+1.orig.tar.xz +9318da32923e8a4a17ee23113302ff509c0d4056 +24259708 diff --cc debian/patches/0001-Prefer-usr-share-info-emacs.patch index ee3502efbf8,00000000000..e79cd626886 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 f395622508301666a356a84e003d987888229804 Mon Sep 17 00:00:00 2001 ++From 888dd6f8381aea7c01ea578b3357b9edb9bf988d 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 40b2f90ebd6..0cd9c480a67 100644 ++index 8743b449976..14d62f7f1cb 100644 +--- a/lisp/info.el ++++ b/lisp/info.el - @@ -218,7 +218,8 @@ Info-default-directory-list ++@@ -213,7 +213,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 e17680ca25f,00000000000..814284525e2 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 276ba4620041b4d7e2e90d190bbfa7c005885b6f Mon Sep 17 00:00:00 2001 ++From 381dc48e4f31a00726f44f3723b913aea4485cca 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 2855e7c31ca..79c5119420e 100644 ++index 9d16b59defd..d20431492a7 100644 +--- a/lisp/startup.el ++++ b/lisp/startup.el - @@ -438,6 +438,10 @@ tutorial-directory ++@@ -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 - @@ -1124,8 +1128,21 @@ command-line ++@@ -1121,8 +1125,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 8ed8fbfbfca,00000000000..64f95092e73 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,277 -1,0 +1,270 @@@ - From 53dad1e8f5cd98546a215217b1f6dcd74fe03981 Mon Sep 17 00:00:00 2001 ++From d641a7c62e38661b1d786adc846b73b2e40595d1 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 | 19 ++++++++----------- - doc/misc/Makefile.in | 44 +++++--------------------------------------- ++ configure.ac | 15 ++++++--------- ++ doc/misc/Makefile.in | 43 +++++-------------------------------------- + lisp/help.el | 8 ++++++++ - 5 files changed, 39 insertions(+), 79 deletions(-) ++ 5 files changed, 37 insertions(+), 76 deletions(-) + +diff --git a/Makefile.in b/Makefile.in - index bba9bb158cc..da42196bd7b 100644 ++index 238df40ded8..baed5771863 100644 +--- a/Makefile.in ++++ b/Makefile.in - @@ -161,7 +161,9 @@ man1dir=$(mandir)/man1 ++@@ -159,7 +159,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@ - @@ -808,8 +810,7 @@ endef ++@@ -814,8 +816,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))) + - @@ -936,11 +937,11 @@ check check-expensive: all ++@@ -947,11 +948,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): - @@ -961,9 +962,6 @@ info-dir: ${srcdir}/info/dir ++@@ -972,9 +973,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 \ - @@ -988,14 +986,10 @@ ${srcdir}/info/dir: ${info_dir_deps} - ) >$$tempfile && \ - ${srcdir}/build-aux/move-if-change $${tempfile} ${srcdir}/info/dir ++@@ -996,14 +994,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. - @@ -1013,14 +1007,10 @@ install-pdf: $(INSTALL_PDF) ++@@ -1021,14 +1015,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 86054aef9fd..5bc8aeafd45 100755 ++index d2118674792..7708b3fa03c 100755 +--- a/admin/update_autogen ++++ b/admin/update_autogen - @@ -269,8 +269,7 @@ info_dir () ++@@ -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 5853cbbac85..7278ef64cb6 100644 ++index 256b954a89c..976667caf32 100644 +--- a/configure.ac ++++ b/configure.ac - @@ -5387,11 +5387,11 @@ dnl This will work, but you get a config.status that is not quite right - dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html). - dnl That doesn't have any obvious consequences for Emacs, but on the whole - dnl it seems better to just live with the duplication. - -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" - +SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/misc/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile" ++@@ -5480,7 +5480,7 @@ dnl config.status treats $srcdir specially, so I think this is ok... ++ AC_CONFIG_FILES([$srcdir/doc/man/emacs.1]) + - AC_CONFIG_FILES([Makefile 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 \ - + doc/misc/Makefile \ - + src/Makefile lwlib/Makefile lisp/Makefile \ - leim/Makefile nextstep/Makefile nt/Makefile]) ++ 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) + - dnl test/ is not present in release tarfiles. - @@ -5443,14 +5443,11 @@ if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then ++@@ -5533,14 +5533,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 741d56cd207..39d09abeed7 100644 ++index 11086b33037..76fca3ff416 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,24 +187,6 @@ efaq%.pdf: ${srcdir}/efaq%.texi ++@@ -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: EXTRA_OPTS = -D emacs +-${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 68e8890ee1b..13a80cfa604 100644 ++index 77e32848318..22516310692 100644 +--- a/lisp/help.el ++++ b/lisp/help.el +@@ -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 bd3e4ed46f5,00000000000..7c403534802 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 f73a994589db30a6b11a77a2a2656d7600ec209f Mon Sep 17 00:00:00 2001 ++From 2ea6063c2c43ae7816e387548dbb3ba1800293ad 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 539e56e42a0..1d8a47b6549 100644 ++index 10afb7b4202..a866194bfea 100644 +--- a/etc/NEWS ++++ b/etc/NEWS - @@ -15,6 +15,11 @@ and NEWS.1-17 for changes in older Emacs versions. ++@@ -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. + ++ ++* Debian specific changes to Emacs ++ - +Please see /usr/share/doc/emacs25-common/README.Debian.gz. +++Please see /usr/share/doc/emacs-common/README.Debian.gz. ++ + - * Changes in Emacs 25.2 ++ * Installation Changes in Emacs 26.1 + diff --cc debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch index 607f5fc0b8c,00000000000..bcc8d1cd009 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,28 -1,0 +1,26 @@@ - From d33f56378cb4ead76c7c89b6dcde66d4ddbe482c Mon Sep 17 00:00:00 2001 ++From d69466776a75671d6d818b3b4a0be73c54876c3d 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 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) ++ lisp/version.el | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lisp/version.el b/lisp/version.el - index 0e21ab2cad6..518cd4fb850 100644 ++index 3a38b1d83c8..5d1248ac581 100644 +--- a/lisp/version.el ++++ b/lisp/version.el - @@ -59,8 +59,8 @@ emacs-version ++@@ -62,7 +62,7 @@ emacs-version ++ to the system configuration; look at `system-configuration' instead." + (interactive "P") + (let ((version-string - (format (if (not (called-interactively-p 'interactive)) - - "GNU Emacs %s (%s%s%s%s)\n of %s" - - "GNU Emacs %s (%s%s%s%s) of %s") - + "GNU Emacs %s (%s%s%s%s)\n of %s, modified by Debian" - + "GNU Emacs %s (%s%s%s%s) of %s, modified by Debian") ++- (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 - (cond ((featurep 'motif) diff --cc debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch index 36cff679ab0,00000000000..aff85120f63 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,42 -1,0 +1,31 @@@ - From 6676f1cb9a837dc0cdcc3a36588c4e3a43287d0b Mon Sep 17 00:00:00 2001 ++From 598ff07f7cee81ffe382d37a3d134599a63d5a90 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 | 13 ++----------- - 1 file changed, 2 insertions(+), 11 deletions(-) ++ 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 f58303b6d76..408a4cd5a0d 100644 ++index 818404f8baf..bb1223248b9 100644 +--- a/admin/unidata/Makefile.in ++++ b/admin/unidata/Makefile.in - @@ -53,16 +53,7 @@ am__v_at_1 = ++@@ -56,7 +56,7 @@ am__v_at_1 = + - .PHONY: all unifiles ++ .PHONY: all + - -all: ${top_srcdir}/src/macuvs.h unifiles ${unidir}/charscript.el - - - -## Specify .elc as an order-only prereq so as to not needlessly rebuild - -## target just because the .elc is missing. - -## Same with charprop.el below. - -${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \ - - ${srcdir}/uvs.elc - - $(AM_V_GEN)${emacs} -L ${srcdir} -l uvs \ - - --eval '(uvs-print-table-ivd (unmsys--file-name "${srcdir}/IVD_Sequences.txt") "Adobe-Japan1")' \ - - > $@ - +all: unifiles ${unidir}/charscript.el ++-all: ${top_srcdir}/src/macuvs.h ${unifiles} ${unidir}/charscript.el \ +++all: ${unifiles} ${unidir}/charscript.el \ ++ ${unidir}/charprop.el + - %.elc: %.el - $(AM_V_ELC)${emacs} -f batch-byte-compile $< - @@ -122,7 +113,7 @@ maintainer-clean: distclean ++ ## 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* - ifneq (,$(wildcard $(unidir)/charprop.el)) - cd $(unidir) && \ - rm -f `sed -n 's/^;; FILE: //p' < charprop.el` charprop.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 703c886a7b3,00000000000..d992aaf5ebc 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 bf56e978684eeebc859fc70983a8805d8210b149 Mon Sep 17 00:00:00 2001 ++From 106dcf98d829f04606674df728bb95f99f5298c0 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/automated/package-test.el | 9 ++++++++- ++ test/lisp/emacs-lisp/package-tests.el | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + - diff --git a/test/automated/package-test.el b/test/automated/package-test.el - index 637a94bb330..05272736881 100644 - --- a/test/automated/package-test.el - +++ b/test/automated/package-test.el - @@ -149,7 +149,14 @@ package-test-fake-contents-file ++diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el ++index 62fba58919f..e4aa519a4c6 100644 ++--- a/test/lisp/emacs-lisp/package-tests.el +++++ b/test/lisp/emacs-lisp/package-tests.el ++@@ -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 00000000000,00000000000..2a50d3b2e0b new file mode 100644 --- /dev/null +++ b/debian/patches/0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch @@@ -1,0 -1,0 +1,44 @@@ ++From bda90e2ab5203feb938188cbd8e029c9b2a467db 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 ++--- a/test/lisp/progmodes/elisp-mode-tests.el +++++ b/test/lisp/progmodes/elisp-mode-tests.el ++@@ -301,11 +301,15 @@ xref-elisp-test-descr-to-target ++ (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 @@ 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/series index 9feb202b135,00000000000..81a8bab0f43 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,14 -1,0 +1,8 @@@ +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-provide-openssl-s_client-as-an-option-for-ssl-.patch - 0009-A-memory-alignment-problem-causing-m68k-failures-has.patch - 0010-Don-t-downcase-real-xref-in-elisp-mode-tests.patch - 0011-Disable-eieio-test-method-order-list-6.patch - 0012-A-remote-execution-exploit-via-enriched-text-has-bee.patch - 0013-Disable-eieio-test-37-obsolete-name-in-constructor.patch - 0014-Emacs-should-no-longer-unexpectedly-alter-the-byte-o.patch ++0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch