Detect remote uid and gid in tramp-gvfs.el

[gnu-emacs] / lisp / comint.el

diff --git a/lisp/comint.el b/lisp/comint.el
index cb79c175f0e8a939770e78e81a4742dc46694849..88fc0b2d197e737536ab458e6eb769d6c74e01bd 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -345,14 +345,15 @@ This variable is buffer-local."
    (regexp-opt
     '("Enter" "enter" "Enter same" "enter same" "Enter the" "enter the"
       "Old" "old" "New" "new" "'s" "login"
-      "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad") t)
+      "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "[sudo]" "Repeat" "Bad" "Retype")
+    t)
    " +\\)"
    "\\(?:" (regexp-opt password-word-equivalents) "\\|Response\\)"
    "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\
 \\(?: for [^:：៖]+\\)?[:：៖]\\s *\\'")
   "Regexp matching prompts for passwords in the inferior process.
 This is used by `comint-watch-for-password-prompt'."
-  :version "24.4"
+  :version "25.2"
   :type 'regexp
   :group 'comint)
 
@@ -816,13 +817,6 @@ series of processes in the same Comint buffer.  The hook
                    (format "COLUMNS=%d" (window-width)))
            (list "TERM=emacs"
                  (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width))))
-
-         ;; This hack is for backward compatibility with Bash 4.3 and
-         ;; earlier.  It can break common uses of 'configure', so
-         ;; remove it once Bash 4.4 or later is common.
-         (unless (getenv "EMACS")
-           (list "EMACS=t"))
-
          (list (format "INSIDE_EMACS=%s,comint" emacs-version))
          process-environment))
        (default-directory