From: Federico Tedin <federicotedin@gmail.com>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: 38317@debbugs.gnu.org
Subject: bug#38317: Buffer-local variables don't work as history for read-from-minibuffer
Date: Sun, 24 Nov 2019 00:12:15 +0100 [thread overview]
Message-ID: <87wobq5gs0.fsf@gmail.com> (raw)
In-Reply-To: <874kyu72kl.fsf@gmail.com> (Federico Tedin's message of "Sat, 23 Nov 2019 21:36:10 +0100")
[-- Attachment #1: Type: text/plain, Size: 1367 bytes --]
> So although `read_minibuf' does call `add-to-history' before returning
> (and after setting the current buffer to be the minibuffer's), my input
> wasn't added to any list (that I know of). This is strange, since
> `add-to-history' seemed to work correctly with buffer-local variables
> when I tested it separately. I would've expected the new history item to
> be added to one of the minibuffer's `test-history' local variable.
>
> So I think the first step would be to make `read_minibuf' add the new
> history item into the right place when HIST is buffer-local.
Turns out `get_minibuffer' sets the minibuffer's buffer mode to
`minibuffer-inactive-mode', which resets the minibuffer's local
variables (though not 100% sure about this). I think the history items
were being added to the minibuffer's local version of the variable, and
then being deleted by that.
I created a small patch that sets back the original buffer at the end of
`read_minibuf', so that the history item is added in the right
place. Then, I modified `goto-history-element' as Michael suggested, so
that the function reads the buffer-local version of the variable, but
not the minibuffer's (and updated `minibuffer-history-isearch-wrap' just
in case as well). With this, M-p and M-n works again.
I'm attaching a draft patch in case anyone wants to provide some
feedback. Thanks!
- Fede
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 3901 bytes --]
diff --git a/lisp/simple.el b/lisp/simple.el
index c61ccd511c..e5f9e9e785 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2028,7 +2028,7 @@ previous-matching-history-element
(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-values))
(case-fold-search
(if (isearch-no-upper-case-p regexp t) ; assume isearch.el is dumped
;; On some systems, ignore case for file names.
@@ -2128,6 +2128,14 @@ minibuffer-default-add-completions
(append def all)
(cons def (delete def all)))))
+(defun minibuffer-history-values ()
+ "Return the minibuffer input history values.
+If `minibuffer-history-variable' points to a buffer-local variable and
+the minibuffer is active, return the buffer-local value for the buffer
+selected in the window returned by `minibuffer-selected-window'."
+ (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
@@ -2156,8 +2164,8 @@ goto-history-element
(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-values))
+ (length (minibuffer-history-values))
0))
(user-error "Beginning of history; no preceding item"))
(unless (memq last-command '(next-history-element
@@ -2179,7 +2187,7 @@ goto-history-element
(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-values)))))
(insert
(if (and (eq minibuffer-history-sexp-flag (minibuffer-depth))
(not minibuffer-returned-to-present))
@@ -2432,7 +2440,7 @@ minibuffer-history-isearch-wrap
;; 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-values)))
(goto-history-element 0))
(setq isearch-success t)
(goto-char (if isearch-forward (minibuffer-prompt-end) (point-max))))
diff --git a/src/minibuf.c b/src/minibuf.c
index 1e87c5044a..c4d2fae9b4 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -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;
@@ -696,7 +696,12 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
else
histstring = Qnil;
- /* Add the value to the appropriate history list, if any. */
+ /* Add the value to the appropriate history list, if any. If
+ possible, switch back to the previous buffer first, in case the
+ history variable was buffer-local. */
+ if (BUFFER_LIVE_P (XBUFFER (previous_buffer)))
+ Fset_buffer (previous_buffer);
+
if (! (NILP (Vhistory_add_new_input) || NILP (histstring)))
call2 (intern ("add-to-history"), Vminibuffer_history_variable, histstring);
next prev parent reply other threads:[~2019-11-23 23:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 21:30 bug#38317: Buffer-local variables don't work as history for read-from-minibuffer Federico Tedin
2019-11-22 13:33 ` Lars Ingebrigtsen
2019-11-22 15:23 ` Michael Heerdegen
2019-11-22 16:24 ` martin rudalics
2019-11-23 11:54 ` Lars Ingebrigtsen
2019-11-23 20:36 ` Federico Tedin
2019-11-23 23:12 ` Federico Tedin [this message]
2019-11-26 21:54 ` Federico Tedin
2019-11-27 8:14 ` Robert Pluim
2019-11-27 15:24 ` Drew Adams
2019-11-27 15:28 ` Robert Pluim
2019-11-27 11:53 ` Lars Ingebrigtsen
2019-11-27 18:50 ` Federico Tedin
2019-11-27 19:25 ` Eli Zaretskii
2019-11-27 21:04 ` Federico Tedin
2019-11-28 12:05 ` Federico Tedin
2019-12-05 9:31 ` Lars Ingebrigtsen
2019-11-29 5:22 ` Richard Stallman
2019-11-29 10:21 ` Eli Zaretskii
2019-11-29 17:02 ` Federico Tedin
2019-12-01 5:59 ` Richard Stallman
2019-11-27 21:19 ` Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wobq5gs0.fsf@gmail.com \
--to=federicotedin@gmail.com \
--cc=38317@debbugs.gnu.org \
--cc=larsi@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.