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

diff --cc lisp/frame.el
Simple merge

diff --cc lisp/net/tramp-integration.el
Simple merge

diff --cc src/frame.c
index 25d71e0769f5ac0aa53e7b39ccbae0bf3e407b3c,506780ae364da18a332a86bb6224ea495ac89c31..91b9bec82c3b61e61603f6508e7ddb9df2b3bbc6
--- 1/src/frame.c
--- 2/src/frame.c
+++ b/src/frame.c
@@@ -6243,27 -6192,17 +6243,27 @@@ You can also use a floating number betw
  #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)))
 +
  These override values given in window system configuration data,
 - including X Windows' defaults database.
 +including X Windows' defaults database.
 +
 +Note that many display-related modes (like `scroll-bar-mode' or
 +`menu-bar-mode') alter `default-frame-alist', so if you set this
 +variable directly, you may be overriding other settings
 +unintentionally.  Instead it's often better to use
 +`modify-all-frames-parameters' or push new elements to the front of
 +this alist.
 +
  For values specific to the first Emacs frame, see `initial-frame-alist'.
 +
  For window-system specific values, see `window-system-default-frame-alist'.
 +
  For values specific to the separate minibuffer frame, see
 - `minibuffer-frame-alist'.
 -The `menu-bar-lines' element of the list controls whether new frames
 - have menu bars; `menu-bar-mode' works by altering this element.
 +`minibuffer-frame-alist'.
 +
  Setting this variable does not affect existing frames, only new ones.  */);
    Vdefault_frame_alist = Qnil;
  

diff --cc src/intervals.c
Simple merge