--- /dev/null
- accdeeadcb023c681e52dfacc07c58b455707d23
- accdeeadcb023c681e52dfacc07c58b455707d23
- b820e6781829e25468113a01b4310907740ffe06
+# see git-dpm(1) from git-dpm package
++dab3621bbfd8ef6361f4b0ef904c0f5256556a53
++dab3621bbfd8ef6361f4b0ef904c0f5256556a53
++d429af9a70839a40bba83ebeaa33ad8d7219fbcd
+d429af9a70839a40bba83ebeaa33ad8d7219fbcd
+emacs_27.1+1.orig.tar.xz
+fa38330a1a57cf7a01ee8128f0faf2dd0117f703
+25483548
--- /dev/null
- From b5e23aef8d95f3a028312f12c983df6075483463 Mon Sep 17 00:00:00 2001
++From 288adb6d0d598bbc4bbdfeae3d7bafe794261be3 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+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 94b0ef6ce75..785f92ab57f 100644
++index 033a7a5cbb5..3bed743b9a6 100644
+--- a/lisp/info.el
++++ b/lisp/info.el
+@@ -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))
--- /dev/null
- From 1626a4d516125deca5eb8d0f7a63b6d48d6ab63d Mon Sep 17 00:00:00 2001
++From f52e6bd94fab618e69d38332756e5321ed131f4e Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+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 <rlb@defaultvalue.org>
+---
- lisp/startup.el | 21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
++ lisp/startup.el | 13 ++++++++++++-
++ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lisp/startup.el b/lisp/startup.el
- index 32051c232ca..6ee20ccf597 100644
++index bff10003f84..78cd8dd0e3a 100644
+--- a/lisp/startup.el
++++ b/lisp/startup.el
- @@ -434,6 +434,10 @@ tutorial-directory
++@@ -436,6 +436,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
- @@ -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)))
++@@ -1361,7 +1365,14 @@ command-line
++ ;; Sites should not disable the startup screen.
++ ;; Only individuals should disable the startup screen.
++ (let ((inhibit-startup-screen inhibit-startup-screen))
++- (load site-run-file t t)))
+++ (progn
+++ ;; This form has been added by Debian to load all the
+++ ;; debian package snippets (dh-elpa, etc.). It's in here
+++ ;; because we want -q to kill it too.
+++ (if (load "debian-startup" t t nil)
+++ (debian-startup debian-emacs-flavor))
+++ ;; This is the normal upstream behavior
+++ (load site-run-file t t))))
+
- ;; Sites should not disable this. Only individuals should disable
- ;; the startup screen.
++ ;; Load that user's init file, or the default one, or none.
++ (startup--load-user-init-file
--- /dev/null
- From ab940f42b7ca0208b7c734fe3a9bce4209add168 Mon Sep 17 00:00:00 2001
++From 8ba31a5b9c413f0efca428f979fbff7a03cf156f Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+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 <rlb@defaultvalue.org>
+Added-by: Rob Browning <rlb@defaultvalue.org>
+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 364deeae226..0e0931bd626 100644
++index 67e15cfecd2..05bfedcd17c 100644
+--- a/Makefile.in
++++ b/Makefile.in
- @@ -162,7 +162,9 @@ man1dir=$(mandir)/man1
++@@ -164,7 +164,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@
- @@ -820,8 +822,7 @@ endef
++@@ -830,8 +832,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)))
+
- @@ -953,11 +954,11 @@ check check-maybe check-expensive check-all: have-tests all
++@@ -965,11 +966,11 @@ endif
+ 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):
- @@ -978,9 +979,6 @@ info-dir: ${srcdir}/info/dir
++@@ -990,9 +991,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 \
- @@ -1002,14 +1000,10 @@ ${srcdir}/info/dir: ${info_dir_deps}
++@@ -1014,14 +1012,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.
- @@ -1027,14 +1021,10 @@ install-pdf: $(INSTALL_PDF)
++@@ -1039,14 +1033,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 651d35beafb..a767b541fc7 100755
++index af339a9e7ec..4864d89011b 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 ebf24c8657e..4561ef7f868 100644
++index 40bc610f9bf..3b10c855afc 100644
+--- a/configure.ac
++++ b/configure.ac
- @@ -5487,7 +5487,7 @@ dnl config.status treats $srcdir specially, so I think this is ok...
++@@ -5798,7 +5798,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)
+
- @@ -5540,14 +5540,11 @@ if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then
++@@ -5850,14 +5850,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 d02f42bbeb9..b5447f6ba10 100644
++index 7f536ad9529..6b56f47aab8 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 \
++-INFO_COMMON = 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 c23d4d8fe54..a081d13f5d0 100644
++index 0f1991e3185..775dd35cbb1 100644
+--- a/lisp/help.el
++++ b/lisp/help.el
- @@ -292,6 +292,14 @@ view-help-file
++@@ -296,6 +296,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)
--- /dev/null
- From 8aa3059b73a8704207dc6d75a186c3bbb96005a6 Mon Sep 17 00:00:00 2001
++From 1d1ddc9136ece2df262fbd004d186ee55db6e22e Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+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 d672d057bb3..fc63a563d28 100644
++index d0a24c23f3a..8a2cb6d7bce 100644
+--- a/etc/NEWS
++++ b/etc/NEWS
- @@ -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.)
++@@ -21,6 +21,11 @@ Temporary note:
++ When you add a new item, use the appropriate mark if you are sure it
++ applies, and please also update docstrings as needed.
+
- + \f
+++\f
++* Debian specific changes to Emacs
++
++Please see /usr/share/doc/emacs-common/README.Debian.gz.
++
+ \f
- * Installation Changes in Emacs 26.1
++ * Installation Changes in Emacs 27.1
+
--- /dev/null
- From 580b54df0b8bb5d3076830d7ea0b3cbe03bc2065 Mon Sep 17 00:00:00 2001
++From 4afaf1ec23fba60929cfaabe9f924d8e22188dd7 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+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 <rlb@defaultvalue.org>
+Added-by: Rob Browning <rlb@defaultvalue.org>
+---
+ lisp/version.el | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lisp/version.el b/lisp/version.el
- index cb9d0442ccf..11ce4e475db 100644
++index bf666cbff99..2c8f26de9e6 100644
+--- a/lisp/version.el
++++ b/lisp/version.el
+@@ -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
--- /dev/null
- From a7b79cf9cbb2cb4c8a84935231106ffe07274f33 Mon Sep 17 00:00:00 2001
++From 473683ab8f34fcf255b57f964d12e9cccc98e568 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+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(-)
++ admin/unidata/Makefile.in | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
- index 31efba0227a..3a23f796f70 100644
++index f3e1c786114..71d391d6c4f 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
--- /dev/null
- From cf13a10435f407dc71e2d82558794a0e1a6748ae Mon Sep 17 00:00:00 2001
++From c76c4d5aa5ee8b344fefa1076de880ea96247e0e Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+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 212e73f4726..c28c8077ac7 100644
++index 4fcaf0e84c2..4cf49752605 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
++@@ -155,7 +155,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))
--- /dev/null
- From 411e4cc35d58d3b02dffa6fa83a350666d17f6d9 Mon Sep 17 00:00:00 2001
++From 53edda63b17b1f468d957ca67506b2b2c2ddef1e Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+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 bc2d14b9498..26db1cbc102 100644
++index 2ba00656862..f4076574a72 100644
+--- a/test/lisp/progmodes/elisp-mode-tests.el
++++ b/test/lisp/progmodes/elisp-mode-tests.el
+@@ -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.
+ (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)))))
--- /dev/null
- From dea7c2e140df4e0aa87f7e557cca7057885632ff Mon Sep 17 00:00:00 2001
++From 4670db77e9a8c8c0fce8094b716af531e45f6a8f Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+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(#<buffer loaddefs.el> "/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
++index f738da7f41f..161a415f715 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
++ (let* ((homedir (make-temp-file "vc-bzr-test" t))
++ (bzrdir (expand-file-name "bzr" homedir))
--- /dev/null
- From 2ad9737023c999e593dba4a98b6b8e394317d960 Mon Sep 17 00:00:00 2001
++From dab3621bbfd8ef6361f4b0ef904c0f5256556a53 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+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
++index 28686547a44..a0df0a26672 100644
+--- a/test/lisp/net/network-stream-tests.el
++++ b/test/lisp/net/network-stream-tests.el
- @@ -100,6 +100,7 @@ server-process-filter
++@@ -137,6 +137,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"
--- /dev/null
- 0011-Fix-an-eshell-ls-dired-test-for-non-recent-files.patch
- 0012-The-Emacs-process-tests-should-no-longer-fail-interm.patch
+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-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
+0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch
projects / emacs.git / commitdiff