From: Glenn Morris <rgm@gnu.org>
Date: Tue, 20 Aug 2019 16:01:55 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~1560
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f68449c9476956425881bf1534fa727d5247448;p=emacs.git

Merge from origin/emacs-26

0b810eb Fix a typo in char-width-table
3f00db7 Minor update in admin/notes/unicode
bcd0115 Fix lisp indent infloop on unfinished strings (Bug#37045)
5f992d1 Improve commentary in composite.el
3a04be2 ; Improve commentary in xdisp.c
15de1d1 Fix markup in dired-x.texi
bda7fc7 ; Fix typo in a doc string of speedbar.el
6f57ef9 * src/callproc.c (Fcall_process): Doc fix.

# Conflicts:
#	doc/misc/dired-x.texi
#	lisp/international/characters.el
#	src/callproc.c
---

8f68449c9476956425881bf1534fa727d5247448
diff --cc doc/misc/dired-x.texi
index 1e3414563f3,05a8919b4e6..f6f1a3ce485
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@@ -477,9 -466,76 +465,9 @@@ Loading @file{dired-x.el} will install 
  call @code{dired-extra-startup}, which in turn calls @code{dired-omit-startup}
  in your @code{dired-mode-hook}.
  
 -@node Local Variables
 -@chapter Local Variables for Dired Directories
 -@cindex local Variables for Dired Directories
 -
 -@vindex dired-local-variables-file
 -@vindex dired-enable-local-variables
 -@noindent
 -This Dired-X feature is obsolete as of Emacs 24.1.  The standard Emacs
 -directory local variables mechanism (@pxref{Directory
 -Variables,,,emacs,The GNU Emacs manual}) replaces it.  For an example of
 -the new mechanisms, @pxref{Omitting Variables}.
 -
 -When Dired visits a directory, it looks for a file whose name is the
 -value of variable @code{dired-local-variables-file} (default: @file{.dired}).
 -If such a file is found, Dired will temporarily insert it into the Dired
 -buffer and run @code{hack-local-variables}.
 -
 -@noindent
 -For example, if the user puts
 -
 -@example
 -Local Variables:
 -dired-actual-switches: "-lat"
 -dired-omit-mode: t
 -End:
 -@end example
 -
 -@noindent
 -into a file called @file{.dired} in a directory then when that directory is
 -viewed it will be
 -
 -@enumerate
 -@item
 -sorted by date
 -@item
 -omitted automatically
 -@end enumerate
 -
 -@noindent
 -You can set @code{dired-local-variables-file} to @code{nil} to suppress this.
 -The value of @code{dired-enable-local-variables} controls if and how these
 -local variables are read.  This variable exists so that it may override the
 -default value of @code{enable-local-variables}.
 -
 -@noindent
 -Please see the GNU Emacs Manual to learn more about local variables.
 -@xref{File Variables,Local Variables in Files,Local Variables in
 -Files,emacs,The GNU Emacs Manual}.
 -
 -@noindent
 -The following variables affect Dired Local Variables
 -
 -@defvar dired-local-variables-file
 -If non-@code{nil}, this variable specifies the file name for local
 -variables for Dired.  If Dired finds a file with that name in the
 -current directory, it will temporarily insert it into the Dired buffer
 -and run @code{hack-local-variables}.  The default is @file{.dired}.
 -@end defvar
 -
 -@defvar dired-enable-local-variables
 -This variable controls the use of local-variables lists in Dired.  It
 -temporarily overrides the value of @code{enable-local-variables} when
 -the Dired Local Variables are hacked.  It takes the same values as
 -that variable.  A value of @code{nil} means to ignore any Dired Local
 -Variables.  The default is @code{t}.
 -@end defvar
 -
  @node Shell Command Guessing
  @chapter Shell Command Guessing
- @cindex Guessing shell commands for files.
+ @cindex guessing shell commands for files.
  
  Based upon the name of a file, Dired tries to guess what shell
  command you might want to apply to it.  For example, if you have point
diff --cc src/callproc.c
index 3c77238cfb6,1b89d691b37..b296bdb088b
--- a/src/callproc.c
+++ b/src/callproc.c
@@@ -219,10 -220,7 +219,10 @@@ static mode_t const default_output_mod
  DEFUN ("call-process", Fcall_process, Scall_process, 1, MANY, 0,
         doc: /* Call PROGRAM synchronously in separate process.
  The remaining arguments are optional.
 +
- The program's input comes from file INFILE (nil means `/dev/null').
+ The program's input comes from file INFILE (nil means `null-device').
 +If you want to make the input come from an Emacs buffer, use
 +`call-process-region' instead.
  
  Third argument DESTINATION specifies how to handle program's output.
  If DESTINATION is a buffer, or t that stands for the current buffer,