commit aa354dd55b213b86ee8e3aa0365a6ad915838458 (HEAD, refs/remotes/origin/master) Author: Glenn Morris Date: Sun May 9 18:46:11 2021 -0700 * lib-src/Makefile.in (clean): Tidy up seccomp-filter files. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 1beafafe0c..7af89eb380 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -343,6 +343,7 @@ mostlyclean: rm -f core ./*.o ./*.res clean: mostlyclean + -rm -f seccomp-filter.bpf seccomp-filter.pfc seccomp-filter-exec.bpf seccomp-filter-exec.pfc rm -f ${EXE_FILES} distclean: clean commit fddc1a537788c00a22e8c3a6161879ca8e39ad9f Author: Glenn Morris Date: Sun May 9 18:33:44 2021 -0700 * test/Makefile.in (SUBDIRS, subdir_template): Fix out-of-tree. diff --git a/test/Makefile.in b/test/Makefile.in index 84ab4e70ae..4bcfee7bad 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -245,13 +245,13 @@ endef $(foreach test,${TESTS},$(eval $(call test_template,${test}))) ## Get the tests for only a specific directory. -SUBDIRS = $(sort $(shell find lib-src lisp misc src -type d ! -path "*resources*" -print)) +SUBDIRS = $(sort $(shell cd ${srcdir} && find lib-src lisp misc src -type d ! -path "*resources*" -print)) define subdir_template .PHONY: check-$(subst /,-,$(1)) check-$(subst /,-,$(1)): @${MAKE} check LOGFILES="$(patsubst %.el,%.log, \ - $(patsubst $(srcdir)/%,%,$(wildcard $(1)/*.el)))" + $(patsubst $(srcdir)/%,%,$(wildcard ${srcdir}/$(1)/*.el)))" endef $(foreach subdir, $(SUBDIRS), $(eval $(call subdir_template,$(subdir)))) commit aa2625b36a09b74bbd92d260c5045c7d95a63db6 Author: Glenn Morris Date: Sun May 9 18:27:04 2021 -0700 Small fixes for out-of-tree clean rules. * Makefile.in (top_maintainer_clean, extraclean): Fix out-of-tree. diff --git a/Makefile.in b/Makefile.in index 8419c824a4..6bde5e5f05 100644 --- a/Makefile.in +++ b/Makefile.in @@ -919,7 +919,7 @@ bootstrap-clean: $(distclean_dirs:=_bootstrap-clean) ### begin to build the program. top_maintainer_clean=\ ${top_distclean}; \ - rm -fr autom4te.cache + rm -fr ${srcdir}/autom4te.cache maintainer_clean_dirs = src leim lisp admin/charsets admin/grammars \ admin/unidata @@ -937,7 +937,8 @@ maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean) ### the coding standards seem to come from. It's like distclean, but ### it deletes backup and autosave files too. extraclean: maintainer-clean - -rm -f config-tmp-* aclocal.m4 configure src/config.in + -rm -f config-tmp-* ${srcdir}/aclocal.m4 ${srcdir}/configure \ + ${srcdir}/src/config.in -[ "${srcdir}" = "." ] || \ find ${srcdir} '(' -name '*~' -o -name '#*' ')' ${FIND_DELETE} -find . '(' -name '*~' -o -name '#*' ')' ${FIND_DELETE} commit 988c891aa6b961ca1778746226da8979152987c5 Author: Glenn Morris Date: Sun May 9 18:22:49 2021 -0700 Small fixes for Makefile clean rules * Makefile.in (maintainer-clean): Move some items from extraclean. (extraclean): doc/emacs already deletes emacsver.texi. diff --git a/Makefile.in b/Makefile.in index 6a5513124f..8419c824a4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -928,6 +928,8 @@ $(foreach dir,$(maintainer_clean_dirs),$(eval $(call submake_template,$(dir),mai maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean) [ ! -d test ] || $(MAKE) -C test $@ + rm -rf ${srcdir}/info + rm -f ${srcdir}/etc/refcards/emacsver.tex ${top_maintainer_clean} ### This doesn't actually appear in the coding standards, but Karl @@ -936,9 +938,6 @@ maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean) ### it deletes backup and autosave files too. extraclean: maintainer-clean -rm -f config-tmp-* aclocal.m4 configure src/config.in - -rm -f etc/refcards/emacsver.tex doc/emacs/emacsver.texi - -rm -f info/*.info info/dir - -rmdir info 2>/dev/null -[ "${srcdir}" = "." ] || \ find ${srcdir} '(' -name '*~' -o -name '#*' ')' ${FIND_DELETE} -find . '(' -name '*~' -o -name '#*' ')' ${FIND_DELETE} commit 305e4807a42075dca2447c82499cbc2584700fe2 Author: Glenn Morris Date: Sun May 9 18:14:12 2021 -0700 Base the "extraclean" Make rule on "maintainer-clean" * Makefile.in (FIND_DELETE): New, set by configure. (extraclean_dirs): Remove. (extraclean): Make it just a small variation on maintainer-clean. * admin/charsets/Makefile.in (extraclean): * admin/grammars/Makefile.in (extraclean): * admin/unidata/Makefile.in (extraclean): * leim/Makefile.in (extraclean): * lib-src/Makefile.in (extraclean): * lisp/Makefile.in (extraclean): * lwlib/Makefile.in (extraclean): * nt/Makefile.in (extraclean): * src/Makefile.in (extraclean): Remove target. * lib/Makefile.in (extraclean): Merge into maintainer-clean. diff --git a/Makefile.in b/Makefile.in index 8d52cb5857..6a5513124f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,6 +96,8 @@ NTDIR=@NTDIR@ top_builddir = @top_builddir@ -include ${top_builddir}/src/verbose.mk +FIND_DELETE = @FIND_DELETE@ + HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@ # ==================== Where To Install Things ==================== @@ -932,19 +934,14 @@ maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:=_maintainer-clean) ### says GCC supports it, and that's where the configuration part of ### the coding standards seem to come from. It's like distclean, but ### it deletes backup and autosave files too. -### Note that we abuse this in some subdirectories (eg leim), -### to delete some generated files that are slow to rebuild. -extraclean_dirs = ${NTDIR} lib-src src leim \ - admin/charsets admin/grammars admin/unidata lisp lib lwlib - -$(foreach dir,$(extraclean_dirs),$(eval $(call submake_template,$(dir),extraclean))) - -extraclean: $(extraclean_dirs:=_extraclean) - ${top_maintainer_clean} - -rm -f config-tmp-* aclocal.m4 configure - -rm -f ./*~ \#* etc/refcards/emacsver.tex doc/emacs/emacsver.texi +extraclean: maintainer-clean + -rm -f config-tmp-* aclocal.m4 configure src/config.in + -rm -f etc/refcards/emacsver.tex doc/emacs/emacsver.texi -rm -f info/*.info info/dir -rmdir info 2>/dev/null + -[ "${srcdir}" = "." ] || \ + find ${srcdir} '(' -name '*~' -o -name '#*' ')' ${FIND_DELETE} + -find . '(' -name '*~' -o -name '#*' ')' ${FIND_DELETE} # The src subdir knows how to do the right thing # even when the build directory and source dir are different. diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in index 00424843bc..f043077e31 100644 --- a/admin/charsets/Makefile.in +++ b/admin/charsets/Makefile.in @@ -297,7 +297,7 @@ ${charsetdir}/%.map: ${GLIBC_CHARMAPS}/%.gz ${mapconv} ${compact} ${AM_V_GEN}${run_mapconv} $< '/^<.*[ ]\/x/' GLIBC-1 ${compact} > $@ -.PHONY: clean bootstrap-clean distclean maintainer-clean extraclean gen-clean +.PHONY: clean bootstrap-clean distclean maintainer-clean gen-clean clean: @@ -312,4 +312,3 @@ gen-clean: maintainer-clean: gen-clean distclean -extraclean: maintainer-clean diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index 4172411e03..aaf95c0897 100644 --- a/admin/grammars/Makefile.in +++ b/admin/grammars/Makefile.in @@ -95,7 +95,7 @@ ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy ${grammar_wisent} $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@" $(AM_V_at)${make_wisent} -o "$@" $< -.PHONY: distclean bootstrap-clean maintainer-clean extraclean gen-clean +.PHONY: distclean bootstrap-clean maintainer-clean gen-clean distclean: rm -f Makefile @@ -108,7 +108,6 @@ gen-clean: maintainer-clean: gen-clean distclean -extraclean: maintainer-clean # Makefile.in ends here diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in index b7a927d191..357b812678 100644 --- a/admin/unidata/Makefile.in +++ b/admin/unidata/Makefile.in @@ -85,7 +85,7 @@ ${unidir}/charscript.el: ${srcdir}/Blocks.txt ${blocks} $(AM_V_GEN)$(AWK) -f ${blocks} < $< > $@ -.PHONY: clean bootstrap-clean distclean maintainer-clean extraclean gen-clean +.PHONY: clean bootstrap-clean distclean maintainer-clean gen-clean clean: rm -f ${srcdir}/*.elc unidata.txt @@ -107,4 +107,3 @@ gen-clean: maintainer-clean: gen-clean distclean -extraclean: maintainer-clean diff --git a/leim/Makefile.in b/leim/Makefile.in index 2646abcfff..ce1029abcf 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -137,7 +137,7 @@ ${srcdir}/../lisp/language/pinyin.el: ${srcdir}/MISC-DIC/pinyin.map $(AM_V_GEN)${RUN_EMACS} -l titdic-cnv -f pinyin-convert $< $@ -.PHONY: bootstrap-clean distclean maintainer-clean extraclean gen-clean +.PHONY: bootstrap-clean distclean maintainer-clean gen-clean ## Perhaps this should run gen-clean. bootstrap-clean: @@ -154,6 +154,4 @@ gen-clean: rm -f ${TIT_MISC} ${leimdir}/leim-list.el rm -rf ${leimdir}/ja-dic -extraclean: maintainer-clean - ### Makefile.in ends here diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 923d0cf5e7..1beafafe0c 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -315,7 +315,7 @@ $(DESTDIR)${archlibdir}: all fi .PHONY: install uninstall mostlyclean clean distclean maintainer-clean -.PHONY: bootstrap-clean extraclean check tags +.PHONY: bootstrap-clean check tags install: $(DESTDIR)${archlibdir} @echo @@ -350,8 +350,6 @@ distclean: clean bootstrap-clean maintainer-clean: distclean -extraclean: maintainer-clean - rm -f ./*~ \#* ## Test the contents of the directory. check: diff --git a/lib/Makefile.in b/lib/Makefile.in index 68a0247e9c..825b3131d5 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -113,7 +113,6 @@ distclean bootstrap-clean: mostlyclean rm -fr $(DEPDIR) maintainer-clean: distclean rm -f TAGS gnulib.mk -extraclean: distclean -rmdir malloc sys 2>/dev/null .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 052de266dc..8e0d9c4e5b 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -467,7 +467,7 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ -f batch-update-autoloads $(CAL_DIR) -.PHONY: bootstrap-clean distclean maintainer-clean extraclean +.PHONY: bootstrap-clean distclean maintainer-clean bootstrap-clean: find $(lisp) -name '*.elc' $(FIND_DELETE) @@ -479,12 +479,6 @@ distclean: maintainer-clean: distclean bootstrap-clean rm -f TAGS -extraclean: bootstrap-clean distclean - -for file in $(loaddefs); do rm -f $${file}~; done - -rm -f $(lisp)/loaddefs.el~ - -find $(lisp) -name '*~' $(FIND_DELETE) - -find $(lisp) -name '#*' $(FIND_DELETE) - .PHONY: check-declare check-declare: diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 95126fac10..9338b7191d 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -979,6 +979,9 @@ be reported. If NO-ERROR is nil, signal an error that no VC backend is responsible for the given file." (or (and (not (file-directory-p file)) (vc-backend file)) + ;; FIXME it would be more efficient to walk up the directory tree, + ;; stopping the first time a backend is responsible. + ;; ;; First try: find a responsible backend. If this is for registration, ;; it must be a backend under which FILE is not yet registered. (let ((dirs (delq nil diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index ce77789db8..fb0ae0e1c2 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -93,9 +93,9 @@ globals_h = ../src/globals.h $(globals_h): $(MAKE) -C ../src globals.h -.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean +.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean -clean mostlyclean extraclean: +clean mostlyclean: rm -f ./*.o liblw.a \#* $(DEPDIR)/* distclean: clean diff --git a/nt/Makefile.in b/nt/Makefile.in index 0d448903ba..3274ff924f 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -170,7 +170,7 @@ $(DESTDIR)${archlibdir}: all fi .PHONY: install uninstall mostlyclean clean distclean maintainer-clean -.PHONY: bootstrap-clean extraclean check tags +.PHONY: bootstrap-clean check tags install: $(DESTDIR)${archlibdir} @echo @@ -203,9 +203,6 @@ distclean: clean bootstrap-clean maintainer-clean: distclean true -extraclean: maintainer-clean - -rm -f *~ \#* - ## Test the contents of the directory. check: @echo "We don't have any tests for the nt/ directory yet." diff --git a/src/Makefile.in b/src/Makefile.in index b8bad73b00..d9f65b5bd0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -671,7 +671,7 @@ ns-app: emacs$(EXEEXT) $(pdmp) $(MAKE) -C ../nextstep all .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean -.PHONY: versionclean extraclean +.PHONY: versionclean mostlyclean: rm -f temacs$(EXEEXT) core ./*.core \#* ./*.o @@ -706,9 +706,6 @@ distclean: bootstrap-clean maintainer-clean: distclean rm -f TAGS -extraclean: distclean - rm -f ./*~ \#* TAGS config.in - ETAGS = ../lib-src/etags${EXEEXT} commit 25c775b4e964aaa2cbf17997c0479dfc2ecf33e2 Author: Juri Linkov Date: Sun May 9 22:27:08 2021 +0300 * lisp/misearch.el (multi-isearch-switch-buffer): New function. * lisp/isearch.el (isearch-search-string): * lisp/misearch.el (multi-isearch-wrap, multi-isearch-pop-state): Use it. https://lists.gnu.org/archive/html/emacs-devel/2021-05/msg00309.html diff --git a/lisp/isearch.el b/lisp/isearch.el index 9f3cfd70fb..536c76ea5d 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -3506,9 +3506,8 @@ Optional third argument, if t, means if fail just return nil (no error). (when pos1 ;; When using multiple buffers isearch, switch to the new buffer here, ;; because `save-excursion' above doesn't allow doing it inside funcall. - (if (and multi-isearch-next-buffer-current-function - (buffer-live-p multi-isearch-current-buffer)) - (switch-to-buffer multi-isearch-current-buffer)) + (when multi-isearch-next-buffer-current-function + (multi-isearch-switch-buffer)) (goto-char pos1) pos1))) diff --git a/lisp/misearch.el b/lisp/misearch.el index 335efb9516..338880f25f 100644 --- a/lisp/misearch.el +++ b/lisp/misearch.el @@ -190,10 +190,10 @@ the initial buffer." (if (or (null multi-isearch-pause) (and multi-isearch-pause multi-isearch-current-buffer)) (progn - (switch-to-buffer - (setq multi-isearch-current-buffer - (funcall multi-isearch-next-buffer-current-function - (current-buffer) t))) + (setq multi-isearch-current-buffer + (funcall multi-isearch-next-buffer-current-function + (current-buffer) t)) + (multi-isearch-switch-buffer) (goto-char (if isearch-forward (point-min) (point-max)))) (setq multi-isearch-current-buffer (current-buffer)) (setq isearch-wrapped nil))) @@ -208,8 +208,18 @@ search status stack." (defun multi-isearch-pop-state (_cmd buffer) "Restore the multiple buffers search state in BUFFER. Switch to the buffer restored from the search status stack." - (unless (equal buffer (current-buffer)) - (switch-to-buffer (setq multi-isearch-current-buffer buffer)))) + (unless (eq buffer (current-buffer)) + (setq multi-isearch-current-buffer buffer) + (multi-isearch-switch-buffer))) + +;;;###autoload +(defun multi-isearch-switch-buffer () + "Switch to the next buffer in multi-buffer search." + (when (and (buffer-live-p multi-isearch-current-buffer) + (not (eq multi-isearch-current-buffer (current-buffer)))) + (setq isearch-mode nil) + (switch-to-buffer multi-isearch-current-buffer) + (setq isearch-mode " M-Isearch"))) ;;; Global multi-buffer search invocations commit 3d2c892114ebd35cb10928bb87f991316a0ca55c Author: Basil L. Contovounesios Date: Sun May 9 14:49:23 2021 +0100 ; * etc/NEWS.27: Revert last change. This reverts commit 3d276324edd90b2df9f0987f635ca0c39037a81d 2021-05-09 "; Fix decoded-time-set-defaults typo in NEWS.27." which was mistakenly applied to etc/NEWS.27 on the master branch. It is replaced by commit c233f4eccddf09e41441b2a292491b469fd61792 2021-05-09 "; * etc/NEWS: Fix decoded-time-set-defaults typo." on the emacs-27 branch (bug#48298). diff --git a/etc/NEWS.27 b/etc/NEWS.27 index 4b4c1a3145..55045d10ee 100644 --- a/etc/NEWS.27 +++ b/etc/NEWS.27 @@ -2701,7 +2701,7 @@ days there are in a month in a specific year), 'date-ordinal-to-time' (that computes the date of an ordinal day), 'decoded-time-add' (for doing computations on a decoded time structure), 'make-decoded-time' (for making a decoded time structure with only the given keywords -filled out), and 'decoded-time-set-defaults' (which fills in nil +filled out), and 'encoded-time-set-defaults' (which fills in nil elements as if it's midnight January 1st, 1970) have been added. *** In the DST slot, 'encode-time' and 'parse-time-string' now return -1 commit 515cac0dc046940bbbcb7deb5c7e8dcf8c785359 Author: Michael Albinus Date: Sun May 9 15:37:37 2021 +0200 Cleanups for Tramp out-of-band methods on MS Windows * doc/misc/tramp.texi (Frequently Asked Questions): tramp-use-ssh-controlmaster-options is nil on MS Windows. * lisp/net/tramp.el (tramp-unquote-shell-quote-argument): Revert previous change, it worked (not as expected but) properly. * test/lisp/net/tramp-tests.el (tramp-test17-dired-with-wildcards): Don't skip on MS Windows. (tramp--test-windows-nt-and-scp-p): Remove. (tramp--test-special-characters): Skip for out-of-band methods on MS Windows, sometimes. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 47beb90e6c..e5a0bb9a8b 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -2166,7 +2166,7 @@ commands for those hosts, the property @t{"posix"} should be set to The default value of this property is @code{t} (not specified in @code{tramp-methods}). If the remote host runs native MS Windows, -this propery has no effect. +this property has no effect. @item @t{"mount-point"} @@ -4504,9 +4504,9 @@ Note how @samp{%r}, @samp{%h} and @samp{%p} must be encoded as @samp{%%r}, @samp{%%h} and @samp{%%p}. @vindex tramp-use-ssh-controlmaster-options -If the @file{~/.ssh/config} is configured appropriately for the above -behavior, then any changes to @command{ssh} can be suppressed with -this @code{nil} setting: +If the @file{~/.ssh/config} file is configured appropriately for the +above behavior, then any changes to @command{ssh} can be suppressed +with this @code{nil} setting: @lisp (customize-set-variable 'tramp-use-ssh-controlmaster-options nil) @@ -4518,6 +4518,10 @@ This should also be set to @code{nil} if you use the @option{ProxyCommand} or @option{ProxyJump} options in your @command{ssh} configuration. +On MS Windows, @code{tramp-use-ssh-controlmaster-options} is set to +@code{nil} by default, because the MS Windows and MSYS2 +implementations of @command{OpenSSH} do not support this option properly. + @item On multi-hop connections, @value{tramp} does not use @command{ssh} diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5d62a1fb3d..9fec151422 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5476,12 +5476,8 @@ T1 and T2 are time values (as returned by `current-time' for example)." "Remove quotation prefix \"/:\" from string S, and quote it then for shell. Suppress `shell-file-name'. This is needed on w32 systems, which would use a wrong quoting for local file names. See `w32-shell-name'." - (if (eq system-type 'windows-nt) - (let ((result (tramp-compat-file-name-unquote s))) - (setq result (tramp-compat-string-replace "\"" "\"\"" result)) - (concat "\"" result "\"")) - (let (shell-file-name) - (shell-quote-argument (tramp-compat-file-name-unquote s))))) + (let (shell-file-name) + (shell-quote-argument (tramp-compat-file-name-unquote s)))) ;; Currently (as of Emacs 20.5), the function `shell-quote-argument' ;; does not deal well with newline characters. Newline is replaced by diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 03915d7a3f..52480bac7e 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -3094,7 +3094,6 @@ This tests also `file-directory-p' and `file-accessible-directory-p'." (skip-unless (tramp--test-enabled)) (skip-unless (tramp--test-sh-p)) (skip-unless (not (tramp--test-rsync-p))) - (skip-unless (not (tramp--test-windows-nt-and-scp-p))) ;; Wildcards are not supported in tramp-crypt.el. (skip-unless (not (tramp--test-crypt-p))) ;; Since Emacs 26.1. @@ -5842,13 +5841,6 @@ This does not support utf8 based file transfer." (and (eq system-type 'windows-nt) (tramp-method-out-of-band-p tramp-test-vec 1))) -(defun tramp--test-windows-nt-and-scp-p () - "Check, whether the locale host runs MS Windows, and scpx? is used. -This does not support utf8 based file transfer." - (and (eq system-type 'windows-nt) - (string-match-p - "^scpx?" (file-remote-p tramp-test-temporary-file-directory 'method)))) - (defun tramp--test-windows-nt-or-smb-p () "Check, whether the locale or remote host runs MS Windows. This requires restrictions of file name syntax." @@ -6072,10 +6064,9 @@ This requires restrictions of file name syntax." "\tfoo bar baz\t") (t " foo\tbar baz\t")) "@foo@bar@baz@" - (unless (tramp--test-windows-nt-and-scp-p) - "$foo$bar$$baz$") + (unless (tramp--test-windows-nt-and-out-of-band-p) "$foo$bar$$baz$") "-foo-bar-baz-" - "%foo%bar%baz%" + (unless (tramp--test-windows-nt-and-out-of-band-p) "%foo%bar%baz%") "&foo&bar&baz&" (unless (or (tramp--test-ftp-p) (tramp--test-gvfs-p) @@ -6089,7 +6080,7 @@ This requires restrictions of file name syntax." "'foo'bar'baz'" "'foo\"bar'baz\"") "#foo~bar#baz~" - (unless (tramp--test-windows-nt-and-scp-p) + (unless (tramp--test-windows-nt-and-out-of-band-p) (if (or (tramp--test-gvfs-p) (tramp--test-windows-nt-or-smb-p)) "!foo!bar!baz!" "!foo|bar!baz|")) commit 457c44a2055f70dd02e8e34781d43fd24e2355ba Author: Andreas Schwab Date: Sun May 9 14:22:05 2021 +0200 Make autoloads-force work in build directory * lisp/Makefile.in (autoloads-force): Remove $(lisp)/loaddefs.el, not loaddefs.el. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index b970451dd2..052de266dc 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -202,7 +202,7 @@ $(lisp)/loaddefs.el: gen-lisp $(LOADDEFS) # regeneration of all these files. .PHONY: autoloads-force autoloads-force: - rm loaddefs.el + rm -f $(lisp)/loaddefs.el $(MAKE) autoloads # This is required by the bootstrap-emacs target in ../src/Makefile, so commit b376ed72204193eba652666fa2540f412f456490 Author: Basil L. Contovounesios Date: Sun May 9 09:50:00 2021 +0100 Default to 1970 in decoded-time-set-defaults * lisp/calendar/time-date.el (decoded-time-set-defaults): Set an unspecified year field to 1970, as promised in the docstring, and to ensure it's representable on all systems (bug#48298). diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el index 2df57a3c33..1c169b78fd 100644 --- a/lisp/calendar/time-date.el +++ b/lisp/calendar/time-date.el @@ -525,6 +525,8 @@ changes in daylight saving time are not taken into account." (defun decoded-time-set-defaults (time &optional default-zone) "Set any nil values in `decoded-time' TIME to default values. The default value is based on January 1st, 1970 at midnight. +This year is used to guarantee portability; see Info +node `(elisp) Time of Day'. TIME is modified and returned." (unless (decoded-time-second time) @@ -539,7 +541,7 @@ TIME is modified and returned." (unless (decoded-time-month time) (setf (decoded-time-month time) 1)) (unless (decoded-time-year time) - (setf (decoded-time-year time) 0)) + (setf (decoded-time-year time) 1970)) ;; When we don't have a time zone, default to DEFAULT-ZONE without ;; DST if DEFAULT-ZONE if given, and to unknown DST otherwise. commit af529f777c965fc347ec0d9144f5b9babce66d08 Author: Lars Ingebrigtsen Date: Sun May 9 11:47:01 2021 +0200 Reintroduce autoloads for edebug-all-defs/edebug-all-forms * lisp/emacs-lisp/edebug.el (edebug-all-defs, edebug-all-forms): Reintroduce ;;;###autoload of these user options that were removed in bae2cfe63c, because this leads to errors in a common (and recommended) use case (bug#47516). diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index b08ee3c4a1..2aec8197dc 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -88,6 +88,7 @@ using, but only when you also use Edebug." ;; because the byte compiler binds them; as a result, if edebug ;; is first loaded for a require in a compilation, they will be left unbound. +;;;###autoload (defcustom edebug-all-defs nil "If non-nil, evaluating defining forms instruments for Edebug. This applies to `eval-defun', `eval-region', `eval-buffer', and @@ -100,6 +101,7 @@ variable. You may wish to make it local to each buffer with `emacs-lisp-mode-hook'." :type 'boolean) +;;;###autoload (defcustom edebug-all-forms nil "Non-nil means evaluation of all forms will instrument for Edebug. This doesn't apply to loading or evaluations in the minibuffer. commit 6b7e93e44488bb5f0efaa363a9d2e52d511959d5 Author: Lars Ingebrigtsen Date: Sat May 8 14:42:51 2021 +0200 Fix indentation of lines starting with # in js-mode * lisp/progmodes/js.el (js--proper-indentation): # is not like in C -- it doesn't have to appear on the beginning of the line (bug#47488). diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index eeb85d9df0..fac0d39b69 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -2861,7 +2861,6 @@ return nil." ((nth 3 parse-status) 0) ; inside string ((when (and js-jsx-syntax (not js-jsx--indent-col)) (save-excursion (js-jsx--indentation parse-status)))) - ((eq (char-after) ?#) 0) ((save-excursion (js--beginning-of-macro)) 4) ;; Indent array comprehension continuation lines specially. ((let ((bracket (nth 1 parse-status)) commit 3d276324edd90b2df9f0987f635ca0c39037a81d Author: Basil L. Contovounesios Date: Sun May 9 09:40:40 2021 +0100 ; Fix decoded-time-set-defaults typo in NEWS.27. See bug#48298. diff --git a/etc/NEWS.27 b/etc/NEWS.27 index 55045d10ee..4b4c1a3145 100644 --- a/etc/NEWS.27 +++ b/etc/NEWS.27 @@ -2701,7 +2701,7 @@ days there are in a month in a specific year), 'date-ordinal-to-time' (that computes the date of an ordinal day), 'decoded-time-add' (for doing computations on a decoded time structure), 'make-decoded-time' (for making a decoded time structure with only the given keywords -filled out), and 'encoded-time-set-defaults' (which fills in nil +filled out), and 'decoded-time-set-defaults' (which fills in nil elements as if it's midnight January 1st, 1970) have been added. *** In the DST slot, 'encode-time' and 'parse-time-string' now return -1