master 013ddd1 1/3: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 013ddd1e5dcea1515e849eb9dea5b9c864407bd0
Merge: 23e6c36 cf0ee6f
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    cf0ee6f49b ; spelling fixes
    16f4f26632 Fix startup working dir bug on NeXTSTEP
---
 ChangeLog.3                 |  2 +-
 lisp/desktop.el             |  2 +-
 lisp/emacs-lisp/rx.el       |  4 ++--
 lisp/progmodes/cc-engine.el |  2 +-
 lisp/simple.el              |  2 +-
 src/composite.c             |  2 +-
 src/emacs.c                 | 16 ++++++++++------
 src/xdisp.c                 |  4 ++--
 src/xfns.c                  |  2 +-
 9 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ChangeLog.3 b/ChangeLog.3
index 6418f9c..1a53011 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -2958,7 +2958,7 @@
        * doc/lispref/searching.texi (Rx Constructs): Document.
        * lisp/emacs-lisp/rx.el (rx--normalise-or-arg)
        (rx--all-string-or-args): New.
-       (rx--translate-or): Normalise arguments first, and check for strings
+       (rx--translate-or): Normalize arguments first, and check for strings
        in subforms.
        (rx--expand-eval): Extracted from rx--translate-eval.
        (rx--translate-eval): Call rx--expand-eval.
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 7fe5f73..7a7f1d0 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1037,7 +1037,7 @@ file.
 
 To upgrade a version 206 file to version 208, call this command
 explicitly with a prefix argument: \\[universal-argument] \\[desktop-save].
-If you are upgrading from Emacs 24 or older, we recommed to do
+If you are upgrading from Emacs 24 or older, we recommend to do
 this once you decide you no longer need compatibility with versions
 of Emacs before 25.1.
 
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 88bb0a8..8d8d071 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -255,9 +255,9 @@ Left-fold the list L, starting with X, by the binary 
function F."
   x)
 
 (defun rx--normalise-or-arg (form)
-  "Normalise the `or' argument FORM.
+  "Normalize the `or' argument FORM.
 Characters become strings, user-definitions and `eval' forms are expanded,
-and `or' forms are normalised recursively."
+and `or' forms are normalized recursively."
   (cond ((characterp form)
          (char-to-string form))
         ((and (consp form) (memq (car form) '(or |)))
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index c3a98d9..7b8b174 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -384,7 +384,7 @@ comment at the start of cc-engine.el for more info."
              c-macro-cache-syntactic nil
              c-macro-cache-no-comment nil))
       (save-match-data
-       (let ((safe-pos (point)))       ; a point ouside any literal.
+       (let ((safe-pos (point)))       ; a point outside any literal.
          ;; Move over stuff followed by a multiline block comment lacking
          ;; escaped newlines each time around this loop.
          (while
diff --git a/lisp/simple.el b/lisp/simple.el
index b45fb87..755d700 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -247,7 +247,7 @@ from which next-error navigated, and a target buffer 
TO-BUFFER."
                                                         extra-test-exclusive)
   "Try the current buffer when outside navigation.
 But return nil if we navigated to the current buffer by the means
-of `next-error' command.  Othewise, return it if it's next-error
+of `next-error' command.  Otherwise, return it if it's next-error
 capable."
   ;; Check that next-error-buffer has no buffer-local value
   ;; (i.e. we never navigated to the current buffer from another),
diff --git a/src/composite.c b/src/composite.c
index 396d456..984e0d9 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1258,7 +1258,7 @@ composition_reseat_it (struct composition_it *cmp_it, 
ptrdiff_t charpos,
             is backward in the buffer, which can only happen if the
             display routines were called to perform the bidi
             reordering.  But it doesn't harm to test for that, and
-            avoid someon raising their brows and thinking it's a
+            avoid someone raising their brows and thinking it's a
             subtle bug...  */
          if (bidi_level < 0)
            direction = Qnil;
diff --git a/src/emacs.c b/src/emacs.c
index cb04de4..059e1c6 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1625,23 +1625,27 @@ Using an Emacs configured with --with-x-toolkit=lucid 
does not have this problem
     {
 #ifdef NS_IMPL_COCOA
       /* Started from GUI? */
-      /* FIXME: Do the right thing if get_homedir returns "", or if
-         chdir fails.  */
-      if (! inhibit_window_system && ! isatty (STDIN_FILENO) && ! ch_to_dir)
-        chdir (get_homedir ());
+      bool go_home = (!ch_to_dir && !inhibit_window_system
+                     && !isatty (STDIN_FILENO));
       if (skip_args < argc)
         {
           if (!strncmp (argv[skip_args], "-psn", 4))
             {
               skip_args += 1;
-              if (! ch_to_dir) chdir (get_homedir ());
+             go_home |= !ch_to_dir;
             }
           else if (skip_args+1 < argc && !strncmp (argv[skip_args+1], "-psn", 
4))
             {
               skip_args += 2;
-              if (! ch_to_dir) chdir (get_homedir ());
+             go_home |= !ch_to_dir;
             }
         }
+      if (go_home)
+       {
+         char const *home = get_homedir ();
+         if (*home && chdir (home) == 0)
+           emacs_wd = emacs_get_current_dir_name ();
+       }
 #endif  /* COCOA */
     }
 #endif /* HAVE_NS */
diff --git a/src/xdisp.c b/src/xdisp.c
index f05319a..ad03ac4 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -180,8 +180,8 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
    present (non-empty) only if the corresponding display margin is
    shown in the window.  If the glyph array for a marginal area is not
    present its beginning and end coincide, i.e. such arrays are
-   actually empty (they contain no glyphs).  Frame glyph matrics, used
-   on text-mode terminals (see below) never have marginal areas, they
+   actually empty (they contain no glyphs).  Frame glyph matrices, used
+   on text-mode terminals (see below) never have marginal areas; they
    treat the entire frame-wide row of glyphs as a single large "text
    area".
 
diff --git a/src/xfns.c b/src/xfns.c
index 07bba90..d56fc0a 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -8027,7 +8027,7 @@ If this equals the symbol 'resize-mode', Emacs uses GTK's 
resize mode to
 always trigger an immediate resize of the child frame.  This method is
 deprecated by GTK and may not work in future versions of that toolkit.
 It also may freeze Emacs when used with other desktop environments.  It
-avoids, however, the unpleasent flicker induced by the hiding approach.
+avoids, however, the unpleasant flicker induced by the hiding approach.
 
 This variable is considered a temporary workaround and will be hopefully
 eliminated in future versions of Emacs.  */);