From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 8 Sep 2020 20:41:33 +0000 (+0200)
Subject: Revert "Use format-prompt in calls to read-from-minibuffer with default value"
X-Git-Tag: emacs-28.0.90~6181
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=60de60b35079eecbadf65e2fa71d1098f9040055;p=emacs.git

Revert "Use format-prompt in calls to read-from-minibuffer with default value"

This reverts commit 1921d2176bb9127d2483a1c8a470abfc3f4eec33.

The DEFAULT-VALUE here isn't really a default value (since READ is nil), so
don't say there's a default.
---

diff --git a/lisp/simple.el b/lisp/simple.el
index 86db34a5c54..3b2b5c92e94 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2200,12 +2200,12 @@ Normally, history elements are matched case-insensitively if
 makes the search case-sensitive."
   (interactive
    (let* ((enable-recursive-minibuffers t)
-	  (regexp (read-from-minibuffer
-                   (format-prompt "Next element matching (regexp)"
-                                  (car minibuffer-history-search-history))
-		   nil minibuffer-local-map nil
-		   'minibuffer-history-search-history
-                   (car minibuffer-history-search-history))))
+	  (regexp (read-from-minibuffer "Next element matching (regexp): "
+					nil
+					minibuffer-local-map
+					nil
+					'minibuffer-history-search-history
+ 					(car minibuffer-history-search-history))))
      ;; Use the last regexp specified, by default, if input is empty.
      (list (if (string= regexp "")
 	       (if minibuffer-history-search-history
diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 56c936e773d..d8f932e7a40 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -1028,7 +1028,7 @@ function `tab-bar-tab-name-function'."
           (tab-index (or current-prefix-arg (1+ (tab-bar--current-tab-index tabs))))
           (tab-name (alist-get 'name (nth (1- tab-index) tabs))))
      (list (read-from-minibuffer
-            (format-prompt "New name for tab" tab-name)
+            "New name for tab (leave blank for automatic naming): "
             nil nil nil nil tab-name)
            current-prefix-arg)))
   (let* ((tabs (funcall tab-bar-tabs-function))
@@ -1057,7 +1057,7 @@ function `tab-bar-tab-name-function'."
                                               (alist-get 'name tab))
                                             (funcall tab-bar-tabs-function)))))
      (list tab-name (read-from-minibuffer
-                     (format-prompt "New name for tab" tab-name)
+                     "New name for tab (leave blank for automatic naming): "
                      nil nil nil nil tab-name))))
   (tab-bar-rename-tab new-name (1+ (tab-bar--tab-index-by-name tab-name))))