diff options
| author | Lars Ingebrigtsen | 2020-09-08 22:41:33 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2020-09-08 22:41:33 +0200 |
| commit | 60de60b35079eecbadf65e2fa71d1098f9040055 (patch) | |
| tree | d5822541d7e26c8e9c6346005ea8501ed9fcdc38 | |
| parent | e90054bc3105feaba6544b214ecd60980e8a8722 (diff) | |
| download | emacs-60de60b35079eecbadf65e2fa71d1098f9040055.tar.gz emacs-60de60b35079eecbadf65e2fa71d1098f9040055.zip | |
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.
| -rw-r--r-- | lisp/simple.el | 12 | ||||
| -rw-r--r-- | lisp/tab-bar.el | 4 |
2 files changed, 8 insertions, 8 deletions
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 | |||
| 2200 | makes the search case-sensitive." | 2200 | makes the search case-sensitive." |
| 2201 | (interactive | 2201 | (interactive |
| 2202 | (let* ((enable-recursive-minibuffers t) | 2202 | (let* ((enable-recursive-minibuffers t) |
| 2203 | (regexp (read-from-minibuffer | 2203 | (regexp (read-from-minibuffer "Next element matching (regexp): " |
| 2204 | (format-prompt "Next element matching (regexp)" | 2204 | nil |
| 2205 | (car minibuffer-history-search-history)) | 2205 | minibuffer-local-map |
| 2206 | nil minibuffer-local-map nil | 2206 | nil |
| 2207 | 'minibuffer-history-search-history | 2207 | 'minibuffer-history-search-history |
| 2208 | (car minibuffer-history-search-history)))) | 2208 | (car minibuffer-history-search-history)))) |
| 2209 | ;; Use the last regexp specified, by default, if input is empty. | 2209 | ;; Use the last regexp specified, by default, if input is empty. |
| 2210 | (list (if (string= regexp "") | 2210 | (list (if (string= regexp "") |
| 2211 | (if minibuffer-history-search-history | 2211 | (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'." | |||
| 1028 | (tab-index (or current-prefix-arg (1+ (tab-bar--current-tab-index tabs)))) | 1028 | (tab-index (or current-prefix-arg (1+ (tab-bar--current-tab-index tabs)))) |
| 1029 | (tab-name (alist-get 'name (nth (1- tab-index) tabs)))) | 1029 | (tab-name (alist-get 'name (nth (1- tab-index) tabs)))) |
| 1030 | (list (read-from-minibuffer | 1030 | (list (read-from-minibuffer |
| 1031 | (format-prompt "New name for tab" tab-name) | 1031 | "New name for tab (leave blank for automatic naming): " |
| 1032 | nil nil nil nil tab-name) | 1032 | nil nil nil nil tab-name) |
| 1033 | current-prefix-arg))) | 1033 | current-prefix-arg))) |
| 1034 | (let* ((tabs (funcall tab-bar-tabs-function)) | 1034 | (let* ((tabs (funcall tab-bar-tabs-function)) |
| @@ -1057,7 +1057,7 @@ function `tab-bar-tab-name-function'." | |||
| 1057 | (alist-get 'name tab)) | 1057 | (alist-get 'name tab)) |
| 1058 | (funcall tab-bar-tabs-function))))) | 1058 | (funcall tab-bar-tabs-function))))) |
| 1059 | (list tab-name (read-from-minibuffer | 1059 | (list tab-name (read-from-minibuffer |
| 1060 | (format-prompt "New name for tab" tab-name) | 1060 | "New name for tab (leave blank for automatic naming): " |
| 1061 | nil nil nil nil tab-name)))) | 1061 | nil nil nil nil tab-name)))) |
| 1062 | (tab-bar-rename-tab new-name (1+ (tab-bar--tab-index-by-name tab-name)))) | 1062 | (tab-bar-rename-tab new-name (1+ (tab-bar--tab-index-by-name tab-name)))) |
| 1063 | 1063 | ||