From: Glenn Morris <rgm@gnu.org>
Date: Tue, 15 May 2018 16:09:48 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5034
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ee1841f288b5b9cf9301945d10db2b45688bcf8;p=emacs.git

Merge from origin/emacs-26

b98cf9c ; Fix a typo in the Emacs manual
700fcd7 * doc/emacs/help.texi: Fix paren typo.
c9c0e40 More minor changes in shell-related nodes of Emacs manual
e6bf19c Fix inaccuracies in "Shell Ring" node of Emacs manual
087681b8 Improve documentation of kmacro commands and variables.
be2e8cb * doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon.
1d9e66a Don't check non-X frames for z order (Bug#31373)
7dc028e Check NSWindow is actually a frame

Conflicts:
	src/nsfns.m
---

3ee1841f288b5b9cf9301945d10db2b45688bcf8
diff --cc doc/emacs/fixit.texi
index 0cb8565c6a4,fe2da7ae4f1..ec26a35d682
--- a/doc/emacs/fixit.texi
+++ b/doc/emacs/fixit.texi
@@@ -186,17 -180,13 +186,17 @@@ Otherwise, a reverse search (@kbd{C-r}
  dragging the word preceding or containing point forward as well.  The
  punctuation characters between the words do not move.  For example,
  @w{@samp{FOO, BAR}} transposes into @w{@samp{BAR, FOO}} rather than
- @samp{@w{BAR FOO,}}.  When point is at the end of the line, it will
+ @w{@samp{BAR FOO,}}.  When point is at the end of the line, it will
  transpose the word before point with the first word on the next line.
  
 +@findex transpose-sentences
 +@findex transpose-paragraphs
    @kbd{C-M-t} (@code{transpose-sexps}) is a similar command for
  transposing two expressions (@pxref{Expressions}), and @kbd{C-x C-t}
 -(@code{transpose-lines}) exchanges lines.  They work like @kbd{M-t}
 -except as regards the units of text they transpose.
 +(@code{transpose-lines}) exchanges lines.  @kbd{M-x
 +transpose-sentences} and @kbd{M-x transpose-paragraphs} transpose
 +sentences and paragraphs, respectively.  These commands work like
 +@kbd{M-t} except as regards the units of text they transpose.
  
    A numeric argument to a transpose command serves as a repeat count: it
  tells the transpose command to move the character (or word or
diff --cc lisp/kmacro.el
index 0acb7fce8f3,7abd8aed79a..08a27aef5c6
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@@ -273,11 -287,11 +280,11 @@@ current value of `kmacro-counter', but 
  (defun kmacro-display-counter (&optional value)
    "Display current counter value."
    (unless value (setq value kmacro-counter))
 -  (message "New macro counter value: %s (%d)" (format kmacro-counter-format value) value))
 -
 +  (message "New macro counter value: %s (%d)"
 +           (format kmacro-counter-format value) value))
  
  (defun kmacro-set-counter (arg)
-   "Set `kmacro-counter' to ARG or prompt if missing.
+   "Set the value of `kmacro-counter' to ARG, or prompt for value if no argument.
  With \\[universal-argument] prefix, reset counter to its value prior to this iteration of the macro."
    (interactive "NMacro counter value: ")
    (if (not (or defining-kbd-macro executing-kbd-macro))