Make HIST arg of read-from-minibuffer work with buffer-local vars
* lisp/simple.el (minibuffer-history-values): New function, should be used to access the minibuffer input history variable when the minibuffer might be active. If the variable is buffer-local, the previous buffer's value will be used. (goto-history-element): Use the new function to access the minibuffer history. (minibuffer-history-isearch-wrap): Use the new function to access the minibuffer history. * src/minibuf.c (read_minibuf): Switch to previous buffer temporarily before updating history list (Bug#38317). (read-from-minibuffer): Extend documentation to mention that the result of using the command will be added to the history list by default. * doc/lispref/minibuf.texi (Minibuffer History): Mention the possibility of using a buffer-local variable as history. * etc/NEWS: Announce changes.
This commit is contained in:
Federico Tedin
committed by
Lars Ingebrigtsen
Lars Ingebrigtsen
parent
9027084793
commit
3586fef263
@@ -547,7 +547,8 @@ to the minibuffer input function (@pxref{Initial Input}).
|
||||
If you don't specify @var{history}, then the default history list
|
||||
@code{minibuffer-history} is used. For other standard history lists,
|
||||
see below. You can also create your own history list variable; just
|
||||
initialize it to @code{nil} before the first use.
|
||||
initialize it to @code{nil} before the first use. If the variable is
|
||||
buffer local, then each buffer will have its own input history list.
|
||||
|
||||
Both @code{read-from-minibuffer} and @code{completing-read} add new
|
||||
elements to the history list automatically, and provide commands to
|
||||
|
||||
6
etc/NEWS
6
etc/NEWS
@@ -522,6 +522,12 @@ Note that this key binding will not work on MS-Windows systems if
|
||||
key binding with an upper case letter - if you can type it, you can
|
||||
bind it.
|
||||
|
||||
+++
|
||||
** 'read-from-minibuffer' now works with buffer-local history variables.
|
||||
The HIST argument of 'read-from-minibuffer' now works correctly with
|
||||
buffer-local variables. This means that different buffers can have
|
||||
their own separated input history list if desired.
|
||||
|
||||
|
||||
* Editing Changes in Emacs 27.1
|
||||
|
||||
|
||||
@@ -2041,7 +2041,7 @@ See also `minibuffer-history-case-insensitive-variables'."
|
||||
(null minibuffer-text-before-history))
|
||||
(setq minibuffer-text-before-history
|
||||
(minibuffer-contents-no-properties)))
|
||||
(let ((history (symbol-value minibuffer-history-variable))
|
||||
(let ((history (minibuffer-history-value))
|
||||
(case-fold-search
|
||||
(if (isearch-no-upper-case-p regexp t) ; assume isearch.el is dumped
|
||||
;; On some systems, ignore case for file names.
|
||||
@@ -2141,6 +2141,14 @@ the end of the list of defaults just after the default value."
|
||||
(append def all)
|
||||
(cons def (delete def all)))))
|
||||
|
||||
(defun minibuffer-history-value ()
|
||||
"Return the value of the minibuffer input history list.
|
||||
If `minibuffer-history-variable' points to a buffer-local variable and
|
||||
the minibuffer is active, return the buffer-local value for the buffer
|
||||
that was current when the minibuffer was activated."
|
||||
(buffer-local-value minibuffer-history-variable
|
||||
(window-buffer (minibuffer-selected-window))))
|
||||
|
||||
(defun goto-history-element (nabs)
|
||||
"Puts element of the minibuffer history in the minibuffer.
|
||||
The argument NABS specifies the absolute history position in
|
||||
@@ -2169,8 +2177,8 @@ negative number -N means the Nth entry of \"future history.\""
|
||||
(user-error (if minibuffer-default
|
||||
"End of defaults; no next item"
|
||||
"End of history; no default available")))
|
||||
(if (> nabs (if (listp (symbol-value minibuffer-history-variable))
|
||||
(length (symbol-value minibuffer-history-variable))
|
||||
(if (> nabs (if (listp (minibuffer-history-value))
|
||||
(length (minibuffer-history-value))
|
||||
0))
|
||||
(user-error "Beginning of history; no preceding item"))
|
||||
(unless (memq last-command '(next-history-element
|
||||
@@ -2192,7 +2200,7 @@ negative number -N means the Nth entry of \"future history.\""
|
||||
(setq minibuffer-returned-to-present t)
|
||||
(setq minibuffer-text-before-history nil))
|
||||
(t (setq elt (nth (1- minibuffer-history-position)
|
||||
(symbol-value minibuffer-history-variable)))))
|
||||
(minibuffer-history-value)))))
|
||||
(insert
|
||||
(if (and (eq minibuffer-history-sexp-flag (minibuffer-depth))
|
||||
(not minibuffer-returned-to-present))
|
||||
@@ -2445,7 +2453,7 @@ or to the last history element for a backward search."
|
||||
;; beginning/end of the history, wrap the search to the first/last
|
||||
;; minibuffer history element.
|
||||
(if isearch-forward
|
||||
(goto-history-element (length (symbol-value minibuffer-history-variable)))
|
||||
(goto-history-element (length (minibuffer-history-value)))
|
||||
(goto-history-element 0))
|
||||
(setq isearch-success t)
|
||||
(goto-char (if isearch-forward (minibuffer-prompt-end) (point-max))))
|
||||
|
||||
@@ -353,7 +353,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
|
||||
Lisp_Object histvar, Lisp_Object histpos, Lisp_Object defalt,
|
||||
bool allow_props, bool inherit_input_method)
|
||||
{
|
||||
Lisp_Object val;
|
||||
Lisp_Object val, previous_buffer = Fcurrent_buffer ();
|
||||
ptrdiff_t count = SPECPDL_INDEX ();
|
||||
Lisp_Object mini_frame, ambient_dir, minibuffer, input_method;
|
||||
Lisp_Object enable_multibyte;
|
||||
@@ -698,7 +698,20 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
|
||||
|
||||
/* Add the value to the appropriate history list, if any. */
|
||||
if (! (NILP (Vhistory_add_new_input) || NILP (histstring)))
|
||||
call2 (intern ("add-to-history"), Vminibuffer_history_variable, histstring);
|
||||
{
|
||||
ptrdiff_t count2 = SPECPDL_INDEX ();
|
||||
|
||||
/* If possible, switch back to the previous buffer first, in
|
||||
case the history variable is buffer-local. */
|
||||
if (BUFFER_LIVE_P (XBUFFER (previous_buffer)))
|
||||
{
|
||||
record_unwind_current_buffer ();
|
||||
Fset_buffer (previous_buffer);
|
||||
}
|
||||
|
||||
call2 (intern ("add-to-history"), Vminibuffer_history_variable, histstring);
|
||||
unbind_to (count2, Qnil);
|
||||
}
|
||||
|
||||
/* If Lisp form desired instead of string, parse it. */
|
||||
if (expflag)
|
||||
@@ -879,6 +892,9 @@ Fifth arg HIST, if non-nil, specifies a history list and optionally
|
||||
starting from 1 at the beginning of the list. If HIST is the symbol
|
||||
`t', history is not recorded.
|
||||
|
||||
If `history-add-new-input' is non-nil (the default), the result will
|
||||
be added to the history list using `add-to-history'.
|
||||
|
||||
Sixth arg DEFAULT-VALUE, if non-nil, should be a string, which is used
|
||||
as the default to `read' if READ is non-nil and the user enters
|
||||
empty input. But if READ is nil, this function does _not_ return
|
||||
|
||||
Reference in New Issue
Block a user