commit 10cd65878c741d2a22a1f2c36c54fcad4e516f72 (HEAD, refs/remotes/origin/master) Author: Alex Branham Date: Mon Mar 25 20:49:01 2019 -0500 Update documentation for indent-relative functions * lisp/indent.el (indent-relative): Document what happens when there is no previous nonblank line. * doc/lispref/text.texi (Relative Indent): Document indent-relative-first-indent-point instead of obsolete indent-relative-maybe. Fix documentation of which argument from 'indent-relative' is used. Bug#34858 diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 86f9fa0e5f..1ef836b8f9 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -2577,11 +2577,11 @@ The quick brown fox jum @point{}ped. @end example @end deffn -@deffn Command indent-relative-maybe +@deffn Command indent-relative-first-indent-point @comment !!SourceFile indent.el This command indents the current line like the previous nonblank line, by calling @code{indent-relative} with @code{t} as the -@var{unindented-ok} argument. The return value is unpredictable. +@var{first-only} argument. The return value is unpredictable. If the previous nonblank line has no indent points beyond the current column, this command does nothing. diff --git a/lisp/indent.el b/lisp/indent.el index f3d3158faa..bf87d6af76 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -600,8 +600,9 @@ considered. If the previous nonblank line has no indent points beyond the column point starts at, then `tab-to-tab-stop' is done, if both -FIRST-ONLY and UNINDENTED-OK are nil, otherwise nothing is done -in this case. +FIRST-ONLY and UNINDENTED-OK are nil, otherwise nothing is done. +If there isn't a previous nonblank line and UNINDENTED-OK is nil, +call `tab-to-tab-stop'. See also `indent-relative-first-indent-point'." (interactive "P") commit 01dc2da75ba11f8ddb1ac1802a8c5a7f0caea975 Author: Michał Krzywkowski Date: Fri Apr 5 20:33:07 2019 -0400 Small elide-head.el update * lisp/elide-head.el (elide-head-headers-to-hide): Also match https for GPL. (Bug#34919) diff --git a/lisp/elide-head.el b/lisp/elide-head.el index 82d08190a6..c1678c003d 100644 --- a/lisp/elide-head.el +++ b/lisp/elide-head.el @@ -52,7 +52,7 @@ (defcustom elide-head-headers-to-hide '(("is free software[:;] you can redistribute it" . ; GNU boilerplate "\\(Boston, MA 0211\\(1-1307\\|0-1301\\), USA\\|\ -If not, see \\)\\.") +If not, see \\)\\.") ("The Regents of the University of California\\. All rights reserved\\." . "SUCH DAMAGE\\.") ; BSD ("Permission is hereby granted, free of charge" . ; X11 commit 652f5d4922f760e527d5a299c14c122de16844d1 Author: Glenn Morris Date: Fri Apr 5 17:03:04 2019 -0700 * doc/emacs/emacs.texi (Acknowledgments): Remove duplicate. diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 7edc1a5fae..58ec373029 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -1484,7 +1484,7 @@ Stevens, Andy Stewart, Jonathan Stigelman, Martin Stjernholm, Kim F. Storm, Steve Strassmann, Christopher Suckling, Olaf Sylvester, Naoto Takahashi, Steven Tamm, Jan Tatarik, Luc Teirlinck, Jean-Philippe Theberge, Jens T. Berger Thielemann, Spencer Thomas, Jim Thompson, Toru Tomabechi, -David O'Toole, Markus Triska, Tom Tromey, Enami Tsugutomo, Eli +David O'Toole, Markus Triska, Tom Tromey, Eli Tziperman, Daiki Ueno, Masanobu Umeda, Rajesh Vaidheeswarran, Neil W. Van Dyke, Didier Verna, Joakim Verona, Ulrik Vieth, Geoffrey Voelker, Johan Vromans, Inge Wallin, John Paul Wallington, Colin commit f2d22273599f96a731e23b2f6d7571af8bb7bb3f Author: Michael Albinus Date: Fri Apr 5 13:27:06 2019 +0200 Adapt tramp-tests.el * test/lisp/net/tramp-tests.el (tramp-test30-make-process): Instrument test. Adapt check string. (tramp-test34-explicit-shell-file-name) (tramp-test43-asynchronous-requests): Skip tests for tramp-adb with older Emacsen. diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 96e4438ec1..5a9541db8f 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -3926,6 +3926,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." ;; `make-process' supports file name handlers since Emacs 27. (skip-unless (tramp--test-emacs27-p)) + (tramp--test-instrument-test-case 0 (dolist (quoted (if (tramp--test-expensive-test) '(nil t) '(nil))) (let ((default-directory tramp-test-temporary-file-directory) (tmp-name (tramp--test-make-temp-name nil quoted)) @@ -4045,11 +4046,11 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (while (= (point-min) (point-max)) (while (accept-process-output proc 0 nil t)))) (should - (string-equal (buffer-string) "cat: /: Is a directory\n")))) + (string-match "^cat:.* Is a directory" (buffer-string))))) ;; Cleanup. (ignore-errors (delete-process proc)) - (ignore-errors (kill-buffer stderr)))))))) + (ignore-errors (kill-buffer stderr))))))))) (ert-deftest tramp-test31-interrupt-process () "Check `interrupt-process'." @@ -4365,7 +4366,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." "Check that connection-local `explicit-shell-file-name' is set." :tags '(:expensive-test) (skip-unless (tramp--test-enabled)) - (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) + ;; Prior Emacs 27, `shell-file-name' was hard coded as "/bin/sh" for + ;; remote processes in Emacs. That doesn't work for tramp-adb.el. + (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p)) + (tramp--test-sh-p))) ;; Since Emacs 26.1. (skip-unless (and (fboundp 'connection-local-set-profile-variables) (fboundp 'connection-local-set-profiles))) @@ -5363,7 +5367,10 @@ process sentinels. They shall not disturb each other." ;; we mark it as unstable. :tags '(:expensive-test :unstable) (skip-unless (tramp--test-enabled)) - (skip-unless (or (tramp--test-adb-p) (tramp--test-sh-p))) + ;; Prior Emacs 27, `shell-file-name' was hard coded as "/bin/sh" for + ;; remote processes in Emacs. That doesn't work for tramp-adb.el. + (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p)) + (tramp--test-sh-p))) (with-timeout (tramp--test-asynchronous-requests-timeout (tramp--test-timeout-handler)) @@ -5731,6 +5738,7 @@ Since it unloads Tramp, it shall be the last test to run." ;; `tramp-test30-make-process' on MS Windows (`process-send-eof'?). ;; * Fix Bug#16928 in `tramp-test43-asynchronous-requests'. Looks ;; like it is resolved now. Remove `:unstable' tag? +;; * Implement `tramp-test31-interrupt-process' for `adb'. (provide 'tramp-tests) ;;; tramp-tests.el ends here