From: Stefan Kangas <stefan@marxist.se>
Date: Fri, 27 May 2022 04:30:20 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1910^2~401
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7da754015f15642b884e11a9b9abeaec838b0c4a;p=emacs.git

Merge from origin/emacs-28

9283508fb2 Fix format specifiers in tramp-adb.el
a9f17ccce3 ; Fix some doc typos and minor language issues
---

7da754015f15642b884e11a9b9abeaec838b0c4a
diff --cc lisp/progmodes/sh-script.el
index 8205218ce11,966357c0970..4d2554c0870
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@@ -1412,10 -1409,10 +1412,10 @@@ If FORCE is non-nil and no process foun
  (defun sh-show-shell ()
    "Pop the shell interaction buffer."
    (interactive)
 -  (pop-to-buffer (process-buffer (sh-shell-process t))))
 +  (pop-to-buffer (process-buffer (sh-shell-process t)) display-comint-buffer-action))
  
  (defun sh-send-text (text)
-   "Send the text to the `sh-shell-process'."
+   "Send TEXT to `sh-shell-process'."
    (comint-send-string (sh-shell-process t) (concat text "\n")))
  
  (defun sh-cd-here ()