Merge branch 'master' of https://github.com/emacs-mirror/emacs

Author: Yuuki Harano

.dir-locals.el

@@ -1,6 +1,7 @@
 ((nil . ((tab-width . 8)
          (sentence-end-double-space . t)
-         (fill-column . 70)))
+         (fill-column . 70)
+         (bug-reference-url-format . "https://debbugs.gnu.org/%s")))
  (c-mode . ((c-file-style . "GNU")
             (c-noise-macro-names . ("INLINE" "ATTRIBUTE_NO_SANITIZE_UNDEFINED" "UNINIT" "CALLBACK" "ALIGN_STACK"))
             (electric-quote-comment . nil)
@@ -12,8 +13,7 @@
                    (log-edit-setup-add-author . t)))
  (change-log-mode . ((add-log-time-zone-rule . t)
 		     (fill-column . 74)
-		     (bug-reference-url-format . "https://debbugs.gnu.org/%s")
-		     (mode . bug-reference)))
+		     (eval . (bug-reference-mode))))
  (diff-mode . ((mode . whitespace)))
  (emacs-lisp-mode . ((indent-tabs-mode . nil)
                      (electric-quote-comment . nil)

.gitignore

@@ -185,7 +185,6 @@ src/bootstrap-emacs
 src/emacs
 src/emacs-[0-9]*
 src/temacs
-src/temacs.in
 src/fingerprint.c
 src/dmpstruct.h
 src/*.pdmp

.gitlab-ci.yml

@@ -53,13 +53,15 @@ test-filenotify-gio:
   only:
     changes:
       - .gitlab-ci.yml
+      - lisp/autorevert.el
       - lisp/filenotify.el
       - lisp/net/tramp-sh.el
       - src/gfilenotify.c
+      - test/lisp/autorevert-tests.el
       - test/lisp/filenotify-tests.el
   script:
     - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libglib2.0-dev libglib2.0-bin libglib2.0-0
     - ./autogen.sh autoconf
     - ./configure --without-makeinfo --with-file-notification=gfile
     - make bootstrap
-    - make -C test filenotify-tests
+    - make -C test autorevert-tests filenotify-tests

CONTRIBUTE

@@ -54,6 +54,12 @@ packages the patch's commit message and changes.  To send just one
 such patch without additional remarks, you can use a command like
 'git send-email [email protected] 0001-DESCRIPTION.patch'.
 
+Once the cumulative amount of your submissions exceeds about 15 lines
+of non-trivial changes, we will need you to assign to the FSF the
+copyright for your contributions.  Ask on [email protected], and we
+will send you the necessary form together with the instructions to
+fill and email it, in order to start this legal paperwork.
+
 ** Issue tracker (a.k.a. "bug tracker")
 
 The Emacs issue tracker at https://debbugs.gnu.org lets you view bug

ChangeLog.3

@@ -1,3 +1,148 @@
+2019-04-11  Eli Zaretskii  <[email protected]>
+
+	Improve documentation of 'read-command'
+
+	* src/minibuf.c (Fread_command): Document the return value
+	when DEFAULT-VALUE is nil and the user enters nothing.
+	* doc/lispref/minibuf.texi (High-Level Completion): Document
+	the printed representation of a symbol whose name is empty.
+	(Bug#3522)
+
+2019-04-11  Eli Zaretskii  <[email protected]>
+
+	Fix an outdated URL in a comment
+
+	* src/emacs.c: Fix reference to Cocoa CoreFoundation Release
+	Notes.  (Bug#35225)
+
+2019-04-11  Basil L. Contovounesios  <[email protected]>
+
+	Backport: Fix comment-empty-lines docstring (bug#35152)
+
+	* lisp/newcomment.el (comment-empty-lines): Consistently use US
+	commas in docstring.  Fix indentation of and typo in custom :type.
+
+	(cherry picked from commit 690c678fb6c1fb5b2f828f9bb90782bd0b01c399)
+
+2019-04-11  Alex Branham  <[email protected]>
+
+	Backport: 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
+
+	(cherry picked from commit 10cd65878c741d2a22a1f2c36c54fcad4e516f72)
+
+2019-04-11  Noam Postavsky  <[email protected]>
+
+	Update nxml-mode.texi: completion now gives xmlns="-!-"
+
+	* doc/misc/nxml-mode.texi (Completion): As of 2016-01-16 "* lisp/nxml:
+	Use standard completion; it also works for company-mode", completing
+	an attribute when there is only one candidate inserts both quotes.
+	Update the example accordingly.
+
+2019-04-10  Eric Abrahamsen  <[email protected]>
+
+	Note that choose-completion-string-functions funcs take four args
+
+	* lisp/simple.el (choose-completion-string-functions): Functions in
+	  this list actually need to accept four arguments, though the fourth
+	  should be ignored.
+
+2019-04-10  Gemini Lasswell  <[email protected]>
+
+	Address name conflicts in EIEIO documentation (bug#31660)
+
+	* doc/misc/eieio.texi (Quick Start): Rename the class used in the
+	example from 'record' to 'person'.
+	(Building Classes): Advise user to check for name conflicts before
+	naming a class.  Add a missing apostrophe.
+	(Making New Objects): Correct grammar.  Rename the class used in the
+	example from 'record' to 'my-class'.
+
+2019-04-09  Mattias Engdegård  <[email protected]>
+
+	Clarify the TESTFN argument to `alist-get'
+
+	* lisp/subr.el (alist-get):
+	Rephrase the initial text to clarify the meaning of the TESTFN argument.
+	It's an equality predicate, not a look-up function (Bug#35206).
+
+	(cherry picked from commit c81465580fe262f28ce47502c00f4afcbe3b8f8d)
+
+2019-04-08  Eli Zaretskii  <[email protected]>
+
+	* src/editfns.c (Fnarrow_to_region): Doc fix.  (Bug#35163)
+
+2019-04-06  Eli Zaretskii  <[email protected]>
+
+	Fix doc strings of 'vc-version-diff' and 'vc-version-ediff'
+
+	* lisp/vc/vc.el (vc-version-diff, vc-version-ediff): Describe
+	arguments in the doc strings.  (Bug#35019)
+
+2019-04-06  Eli Zaretskii  <[email protected]>
+
+	Improve documentation of set-window-start
+
+	* doc/lispref/windows.texi (Window Start and End):
+	* src/window.c (Fset_window_start): Document that reliable
+	setting of a window start position requires to adjust point to
+	be visible.  (Bug#34038)
+
+2019-04-06  Eli Zaretskii  <[email protected]>
+
+	Improve documentation of window parameters
+
+	* doc/lispref/windows.texi (Cyclic Window Ordering): Describe
+	the effect of the 'other-window' window parameter.
+	(Window Parameters): Improve the descriptions of window
+	parameters.  Move the detailed description of the
+	'quit-restore' window parameter from here...
+	(Quitting Windows): ...to here.  (Bug#35063)
+
+2019-04-06  Eli Zaretskii  <[email protected]>
+
+	Improve commentary in frame.el
+
+	* lisp/frame.el: Improve commentary for display-* functions.
+	(Bug#35058)
+
+2019-04-06  Mauro Aranda  <[email protected]>
+
+	Fix typo in a doc string
+
+	* lisp/autorevert.el (global-auto-revert-mode): Fix a typo.
+	(Bug#35165)
+
+2019-03-20  Paul Eggert  <[email protected]>
+
+	Say which regexp ranges should be avoided
+
+	* doc/lispref/searching.texi (Regexp Special): Say that
+	regular expressions like "[a-m-z]" and "[[:alpha:]-~]" should
+	be avoided, for the same reason that regular expressions like
+	"+" and "*" should be avoided: POSIX says their behavior is
+	undefined, and they are confusing anyway.  Also, explain
+	better what happens when the bound of a range is a raw 8-bit
+	byte; the old explanation appears to have been obsolete
+	anyway.  Finally, say that ranges like "[\u00FF-\xFF]" that
+	mix non-ASCII characters and raw 8-bit bytes should be
+	avoided, since it’s not clear what they should mean.
+
+2019-03-20  Nicolas Petton  <[email protected]>
+
+	* etc/AUTHORS: Update.
+
+	* ; ChangeLog.3 update
+
 2019-03-20  Eli Zaretskii  <[email protected]>
 
 	Improve indexing of the user manual
@@ -64946,7 +65091,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 0f523deec1c1e9e2a5a3474f912aa2183d3fe33d (inclusive).
+commit 85829363f728c410e33ffdc3839202977b2115cc (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:

GNUmakefile

@@ -27,10 +27,10 @@
 # newly-built Makefile.  If the source tree is already configured,
 # this file defers to the existing Makefile.
 
-# If you are using a non-GNU 'make', or if you want non-default build
-# options, or if you want to build in an out-of-source tree, please
-# run "configure" by hand.  But run autogen.sh first, if the source
-# was checked out directly from the repository.
+# If you want non-default build options, or if you want to build in an
+# out-of-source tree, you should run 'configure' before running 'make'.
+# But run 'autogen.sh' first, if the source was checked out directly
+# from the repository.
 
 # If a Makefile already exists, just use it.
 

admin/admin.el

@@ -696,6 +696,7 @@ style=\"text-align:left\">")
     (if (file-directory-p stem)
 	(delete-directory stem t))
     (make-directory stem)
+    (setq stem (file-name-as-directory stem))
     (copy-file "../doc/misc/texinfo.tex" stem)
     (unless (equal type "emacs")
       (copy-file "../doc/emacs/emacsver.texi" stem)
@@ -718,7 +719,7 @@ style=\"text-align:left\">")
 	  (setq ats t)
 	  (message "Unexpanded: %s" (match-string 0)))
 	(if ats (error "Unexpanded configure variables in Makefile?")))
-      (write-region nil nil (expand-file-name (format "%s/Makefile" stem))
+      (write-region nil nil (expand-file-name (format "%sMakefile" stem))
 		    nil 'silent))
     (call-process "tar" nil nil nil "-cf" tarfile stem)
     (delete-directory stem t)

admin/merge-gnulib

@@ -36,7 +36,7 @@ GNULIB_MODULES='
   filemode filevercmp flexmember fpieee fstatat fsusage fsync
   getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
   ieee754-h ignore-value intprops largefile lstat
-  manywarnings memrchr minmax mkostemp mktime nstrftime
+  manywarnings memmem-simple memrchr minmax mkostemp mktime nstrftime
   pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat regex
   sig2str socklen stat-time std-gnu11 stdalign stddef stdio
   stpcpy strtoimax symlink sys_stat sys_time
@@ -47,7 +47,7 @@ GNULIB_MODULES='
 
 AVOIDED_MODULES='
   btowc close dup fchdir fstat langinfo lock
-  malloc-posix mbrtowc mbsinit mkdir msvc-inval msvc-nothrow nl_langinfo
+  malloc-posix mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
   openat-die opendir raise
   save-cwd select setenv sigprocmask stat stdarg stdbool
   threadlib tzset unsetenv utime utime-h

build-aux/config.sub

@@ -822,7 +822,9 @@ case $basic_machine in
 		cpu=m68k
 		vendor=next
 		case $os in
-		    nextstep* )
+		    openstep*)
+		        ;;
+		    nextstep*)
 			;;
 		    ns2*)
 		      os=nextstep2