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

Author: Yuuki Harano

admin/MAINTAINERS

@@ -126,6 +126,11 @@ Ulf Jasper
 	    lisp/calendar/icalendar.el
 	    test/lisp/calendar/icalendar-tests.el
 
+Amin Bandali
+	ERC
+	    lisp/erc/*
+	    doc/misc/erc.texi
+
 ==============================================================================
 2. Areas that someone is willing to maintain, although he would not
 necessarily mind if someone else was the official maintainer.
@@ -248,6 +253,11 @@ Alan Third
             lisp/term/ns-win.el
             doc/emacs/macos.texi
 
+Amin Bandali
+	Eshell
+	    lisp/eshell/*
+	    doc/misc/eshell.texi
+
 
 ;;; Local Variables:
 ;;;   coding: utf-8

admin/merge-gnulib

@@ -38,7 +38,7 @@ GNULIB_MODULES='
   getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
   ieee754-h ignore-value intprops largefile lstat
   manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime nstrftime
-  pathmax pipe2 pselect pthread_sigmask putenv
+  pathmax pipe2 pselect pthread_sigmask
   qcopy-acl readlink readlinkat regex
   sig2str socklen stat-time std-gnu11 stdalign stddef stdio
   stpcpy strnlen strtoimax symlink sys_stat sys_time

admin/notes/font-backend

@@ -46,18 +46,22 @@ See admin/gitmerge.el.
 Emacs uses the "blocking" feature of Debbugs for bugs that need to be
 addressed in the next release.
 
-Currently, bug#21966 is the tracking bug for release of 25.2 and
-bug#24655 is the tracking bug for release 26.1.  Say bug#123 needs
-to be fixed for Emacs 26.1.  Send a message to [email protected]
+Currently, bug#39200 is the tracking bug for release of 27.1 and
+bug#39202 is the tracking bug for release 28.1.  Say bug#123 needs
+to be fixed for Emacs 27.1.  Send a message to [email protected]
 that says:
 
-   block 24655 by 123
+   block 39200 by 123
 
 Change "block" to "unblock" to remove a bug from the list.  Closed
 bugs are not listed as blockers, so you do not need to explicitly
 unblock one that has been closed.  You may need to force an update of
 the tracking bug with ctrl-f5/shift-reload to see the latest version.
 
+If you use the debbugs package from GNU ELPA, you can apply the
+following form to see all bugs which block a given release:
+
+  (debbugs-gnu-emacs-release-blocking-reports "27.1")
 
 * TO BE DONE SHORTLY BEFORE RELEASE
 

admin/release-process

@@ -882,11 +882,6 @@ for func in $ac_func_list; do
   test $func = pthread_sigmask || AS_VAR_APPEND([funcs], [" $func"])
 done
 ac_func_list=$funcs
-# Use the system putenv even if it lacks GNU features, as we don't need them,
-# and the gnulib replacement runs afoul of a FreeBSD 10.1 bug; see Bug#19874.
-AC_CHECK_FUNCS_ONCE([putenv])
-AC_DEFUN([gl_FUNC_PUTENV],
-  [test "$ac_cv_func_putenv" = yes || REPLACE_PUTENV=1])
 # Emacs does not use the wchar or wctype-h modules.
 AC_DEFUN([gt_TYPE_WINT_T],
   [GNULIB_OVERRIDES_WINT_T=0
@@ -2043,7 +2038,7 @@ NS_OBJ=
 NS_OBJC_OBJ=
 if test "${HAVE_NS}" = yes; then
   if test "$with_toolkit_scroll_bars" = "no"; then
-    AC_MSG_ERROR([Non-toolkit scroll bars are not implemented for Nextstep.])
+    AC_MSG_WARN([Non-toolkit scroll bars are not implemented for Nextstep.])
   fi
 
   window_system=nextstep

configure.ac

@@ -93,11 +93,11 @@ The optional display of the fill-column indicator is no longer
 supported.  With the display sizes becoming smaller and smaller as you
 move back in time, we feel that the display itself will always show
 you where to fill or wrap your text, and do this much more easily and
-reliably than eny such display indicator.
+reliably than any such display indicator.
 
 @item
 We removed the features that made visiting large files easier.  Thus,
-Emacs will no longer suggest visiting a large file literally, nor will
+Emacs will no longer suggest visiting a large file literally, nor
 offer the @code{so-long} mode to deal with overly-long lines.  We
 decided that this simplification is worthwhile, given that the general
 tendency of having very large files is becoming a rarity as we move

doc/emacs/anti.texi

@@ -565,12 +565,6 @@ is found there.
 @item HOSTNAME
 @vindex HOSTNAME@r{, environment variable}
 The name of the machine that Emacs is running on.
-@c complete.el is obsolete since 24.1.
-@ignore
-@item INCPATH
-A colon-separated list of directories.  Used by the @code{complete} package
-to search for files.
-@end ignore
 @item INFOPATH
 @vindex INFOPATH@r{, environment variable}
 A colon-separated list of directories in which to search for Info files.

doc/emacs/cmdargs.texi

@@ -2655,26 +2655,37 @@ library.  @xref{Hooks}.
 
   Emacs normally finds your init file in a location under your home
 directory.  @xref{Init File}.  By default this location is
-@file{~/.config/emacs/init.el} where @file{~/} stands for your home directory.
+@file{~/.emacs.d/init.el} where @file{~/} stands for your home directory.
 This default can be overridden as described below.
 
-  If @env{XDG_CONFIG_HOME} is set in your environment, its
-value replaces @file{~/.config} in the name of the default
-init file.
-
-  If the default init file's parent directory does not exist but the
-directory @file{~/.emacs.d} does exist, Emacs looks for your init file
+Emacs looks for your init file
 using the filenames @file{~/.emacs.el}, @file{~/.emacs}, or
 @file{~/.emacs.d/init.el}; you can choose to use any one of these
 names.  (Note that only the locations directly in your home directory
-have a leading dot in the location's basename.)  Although this is
-backward-compatible with older Emacs versions, modern POSIX platforms
-prefer putting your initialization files under @file{~/.config} so
-that troubleshooting a problem that might be due to a bad init file,
-or archiving a collection of init files, can be done by renaming that
-directory.  To help older Emacs versions find configuration files in
-their current default locations, you can execute the following
-Emacs Lisp code:
+have a leading dot in the location's basename.)
+
+Emacs can also look in an XDG-compatible location for @file{init.el},
+the default is the directory @file{~/.config/emacs}.  This can be
+overriden by setting @env{XDG_CONFIG_HOME} in your environment, its
+value replaces @file{~/.config} in the name of the default XDG init
+file.  However @file{~/.emacs.d} and @file{~/.emacs} are always
+preferred if they exist, which means that you must delete or rename
+them in order to use the XDG location.
+
+Note also that if neither the XDG location nor @file{~/.emacs.d}
+exist, then Emacs will create @file{~/.emacs.d} (and therefore use it
+during subsequent invocations).
+
+Emacs will set @code{user-emacs-directory} to the directory it decides
+to use.
+
+Although this is backward-compatible with older Emacs versions, modern
+POSIX platforms prefer putting your initialization files under
+@file{~/.config} so that troubleshooting a problem that might be due
+to a bad init file, or archiving a collection of init files, can be
+done by renaming that directory.  To help older Emacs versions find
+configuration files in their current default locations, you can
+execute the following Emacs Lisp code:
 
 @example
 (make-symbolic-link ".config/emacs" "~/.emacs.d")
@@ -2694,7 +2705,7 @@ otherwise, it looks up the home directory corresponding to that user
 name in the system's data base of users.
 
   For brevity the rest of the Emacs documentation generally uses just
-the current default location @file{~/.config/emacs/init.el} for the
+the current default location @file{~/.emacs.d/init.el} for the
 init file.
 @c  LocalWords:  backtab
 
@@ -2740,7 +2751,7 @@ Type @kbd{C-q}, followed by the key you want to bind, to insert @var{char}.
 @xref{Init File}.  However, it is sometimes desirable
 to have customizations that take effect during Emacs startup earlier than the
 normal init file is processed.  Such customizations can be put in the early
-init file, @file{~/.config/emacs.d/early-init.el} or @file{~/.emacs.d/early-init.el}.  This file is loaded before the
+init file, @file{~/.config/emacs/early-init.el} or @file{~/.emacs.d/early-init.el}.  This file is loaded before the
 package system and GUI is initialized, so in it you can customize variables
 that affect frame appearance as well as the package initialization process,
 such as @code{package-enable-at-startup}, @code{package-load-list}, and

doc/emacs/custom.texi

@@ -720,8 +720,8 @@ should create non-existent directories in @var{new}.
 Dired automatically changes the visited file name of buffers associated
 with renamed files so that they refer to the new names.
 
-@vindex dired-vc-rename
-If the value of the variable @code{dired-vc-rename} is non-@code{nil},
+@vindex dired-vc-rename-file
+If the value of the variable @code{dired-vc-rename-file} is non-@code{nil},
 files are renamed using the commands of the underlying VCS, via
 @code{vc-rename-file} (@pxref{VC Delete/Rename}).
 

doc/emacs/dired.texi

@@ -122,14 +122,14 @@ setting the variables @code{undo-limit}, @code{undo-strong-limit}, and
   The variable @code{undo-limit} sets a soft limit: Emacs keeps undo
 data for enough commands to reach this size, and perhaps exceed it,
 but does not keep data for any earlier commands beyond that.  Its
-default value is 80000.  The variable @code{undo-strong-limit} sets a
+default value is 160000.  The variable @code{undo-strong-limit} sets a
 stricter limit: any previous command (though not the most recent one)
 that pushes the size past this amount is forgotten.  The default value
-of @code{undo-strong-limit} is 120000.
+of @code{undo-strong-limit} is 240000.
 
   Regardless of the values of those variables, the most recent change
 is never discarded unless it gets bigger than @code{undo-outer-limit}
-(normally 12,000,000).  At that point, Emacs discards the undo data and
+(normally 24,000,000).  At that point, Emacs discards the undo data and
 warns you about it.  This is the only situation in which you cannot
 undo the last command.  If this happens, you can increase the value of
 @code{undo-outer-limit} to make it even less likely to happen in the