master 731c453b03: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 731c453b035c1c61af9a76d44680a7e4c660eaaf
Merge: 5b3c4004a9 a2f9788cbc
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-28
    
    a2f9788cbc ; Minor copyedits of *-frame-alist doc strings
    c200098dde ; * src/intervals.c (get_local_map): Fix commentary.
    69cc3d38bc Fix Tramp error with eshell integration
---
 lisp/frame.el                 | 2 +-
 lisp/net/tramp-integration.el | 6 ++++--
 src/frame.c                   | 2 +-
 src/intervals.c               | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lisp/frame.el b/lisp/frame.el
index 67c1168557..56a982562d 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -64,7 +64,7 @@ handles the corresponding kind of display.")
 ;; But that's not necessary, because the default is to have one.
 ;; By not specifying it here, we let an X resource specify it.
 (defcustom initial-frame-alist nil
-  "Alist of parameters for the initial X window frame.
+  "Alist of parameters for the initial window-system (a.k.a. \"GUI\") frame.
 You can set this in your init file; for example,
 
  (setq initial-frame-alist
diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el
index b8364b208c..35c0636b1c 100644
--- a/lisp/net/tramp-integration.el
+++ b/lisp/net/tramp-integration.el
@@ -130,8 +130,10 @@ been set up by `rfn-eshadow-setup-minibuffer'."
   ;; Remove last element of `(exec-path)', which is `exec-directory'.
   ;; Use `path-separator' as it does eshell.
   (setq eshell-path-env
-       (mapconcat
-        #'identity (butlast (tramp-compat-exec-path)) path-separator)))
+        (if (file-remote-p default-directory)
+            (mapconcat
+            #'identity (butlast (tramp-compat-exec-path)) path-separator)
+          (getenv "PATH"))))
 
 (with-eval-after-load 'esh-util
   (add-hook 'eshell-mode-hook
diff --git a/src/frame.c b/src/frame.c
index 25d71e0769..91b9bec82c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -6243,7 +6243,7 @@ You can also use a floating number between 0.0 and 1.0.  
*/);
 #endif
 
   DEFVAR_LISP ("default-frame-alist", Vdefault_frame_alist,
-              doc: /* Alist of default values for frame creation.
+    doc: /* Alist of default values of frame parameters for frame creation.
 These may be set in your init file, like this:
   (setq default-frame-alist \\='((width . 80) (height . 55) (menu-bar-lines . 
1)))
 
diff --git a/src/intervals.c b/src/intervals.c
index 85152c58a5..7f11981557 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -2171,8 +2171,8 @@ get_property_and_range (ptrdiff_t pos, Lisp_Object prop, 
Lisp_Object *val,
 
 /* Return the proper local keymap TYPE for position POSITION in
    BUFFER; TYPE should be one of `keymap' or `local-map'.  Use the map
-   specified by the PROP property, if any.  Otherwise, if TYPE is
-   `local-map' use BUFFER's local map.  */
+   specified by the TYPE property, if any.  Otherwise, if TYPE is
+   `local-map', use BUFFER's local map.  */
 
 Lisp_Object
 get_local_map (ptrdiff_t position, struct buffer *buffer, Lisp_Object type)