[Emacs-diffs] master a3f2604 3/3: Merge from origin/emacs-26

[Paul Eggert]

branch: master
commit a3f26048a9b115e8dabffaa768128eaccd07dfd3
Merge: ab04a09 5c91ca8
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-26
    
    5c91ca8 Fix create_process bug breaking eudc-expand-inline
    e244fed Clarify that nil doesn't match itself as a cl-case clause (Bu...
    df0e7e2 Improve SVG documentation
    a34ef52 Document the "URL" keyword in library headers
    fbc7f9a * test/lisp/international/mule-tests.el: Avoid local variable...
    16faff6 ; * lisp/org/org-table.el: Replace obsolete alias in comment.
---
 doc/lispref/display.texi              |  7 +++----
 doc/lispref/tips.texi                 |  3 ++-
 lisp/emacs-lisp/cl-macs.el            | 16 +++++++++-------
 lisp/org/org-table.el                 |  2 +-
 src/process.c                         |  6 +++---
 test/lisp/international/mule-tests.el |  3 +++
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index dcd2fcf..2ac89ba 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5387,7 +5387,6 @@ hint to ImageMagick to help it detect the image type.
 Specifies a rotation angle in degrees.
 
 @item :index @var{frame}
address@hidden Doesn't work: https://debbugs.gnu.org/7978
 @xref{Multi-Frame Images}.
 @end table
 
@@ -5396,8 +5395,8 @@ Specifies a rotation angle in degrees.
 @cindex SVG images
 
 SVG (Scalable Vector Graphics) is an XML format for specifying images.
-If your Emacs build has with SVG support, you can create and manipulate
-these images with the following commands.
+If your Emacs build has SVG support, you can create and manipulate
+these images with the following functions.
 
 @defun svg-create width height &rest args
 Create a new, empty SVG image with the specified dimensions.
@@ -5411,7 +5410,7 @@ The default width (in pixels) of any lines created.
 The default stroke color on any lines created.
 @end table
 
-This function returns an SVG structure, and all the following commands
+This function returns an SVG structure, and all the following functions
 work on that structure.
 @end defun
 
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 0695d9b..c62cfcf 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -1043,7 +1043,8 @@ the place to write arbitrary keywords that describe their 
package,
 rather than just the relevant Finder keywords.
 
 @item Homepage
-This line states the homepage of the library.
address@hidden URL
+These lines state the homepage of the library.
 
 @item Package-Version
 If @samp{Version} is not suitable for use by the package manager, then
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 4d4640c..9600230 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -771,13 +771,15 @@ The result of the body appears to the compiler as a 
quoted constant."
 ;;;###autoload
 (defmacro cl-case (expr &rest clauses)
   "Eval EXPR and choose among clauses on that value.
-Each clause looks like (KEYLIST BODY...).  EXPR is evaluated and compared
-against each key in each KEYLIST; the corresponding BODY is evaluated.
-If no clause succeeds, cl-case returns nil.  A single atom may be used in
-place of a KEYLIST of one atom.  A KEYLIST of t or `otherwise' is
-allowed only in the final clause, and matches if no other keys match.
-Key values are compared by `eql'.
-\n(fn EXPR (KEYLIST BODY...)...)"
+Each clause looks like (KEYLIST BODY...).  EXPR is evaluated and
+compared against each key in each KEYLIST; the corresponding BODY
+is evaluated.  If no clause succeeds, cl-case returns nil.  A
+single non-nil atom may be used in place of a KEYLIST of one
+atom.  A KEYLIST of t or `otherwise' is allowed only in the final
+clause, and matches if no other keys match.  Key values are
+compared by `eql'.
+
+\(fn EXPR (KEYLIST BODY...)...)"
   (declare (indent 1) (debug (form &rest (sexp body))))
   (macroexp-let2 macroexp-copyable-p temp expr
     (let* ((head-list nil))
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 3932671..4bb5c91 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -5428,7 +5428,7 @@ which will prompt for the width."
 ;; - orgtbl-uc-draw-cont (smooth unicode)
 
 ;; This is best viewed with the "DejaVu Sans Mono" font
-;; (use M-x set-default-font).
+;; (use M-x set-frame-font).
 
 (defun orgtbl-uc-draw-grid (value min max &optional width)
   "Draw a bar in a table using block unicode characters.
diff --git a/src/process.c b/src/process.c
index 6ba27a3..9b9b9f3 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2096,9 +2096,9 @@ create_process (Lisp_Object process, char **new_argv, 
Lisp_Object current_dir)
     {
       /* Make the pty be the controlling terminal of the process.  */
 #ifdef HAVE_PTYS
-      /* First, disconnect its current controlling terminal.  */
-      if (pty_flag)
-       setsid ();
+      /* First, disconnect its current controlling terminal.
+        Do this even if !PTY_FLAG; see Bug#30762.  */
+      setsid ();
       /* Make the pty's terminal the controlling terminal.  */
       if (pty_flag && forkin >= 0)
        {
diff --git a/test/lisp/international/mule-tests.el 
b/test/lisp/international/mule-tests.el
index 3c3bae1..59c9ff5 100644
--- a/test/lisp/international/mule-tests.el
+++ b/test/lisp/international/mule-tests.el
@@ -36,4 +36,7 @@
                      (find-auto-coding "" (buffer-size)))
                    '(utf-8 . :coding)))))
 
+;; Stop "Local Variables" above causing confusion when visiting this file.
+
+
 ;;; mule-tests.el ends here