From: Federico Tedin <federicotedin@gmail.com>
To: Lars Ingebrigtsen <larsi@gnus.org>
Cc: 38282@debbugs.gnu.org
Subject: bug#38282: 26.3; goto-line should not share input history with other commands
Date: Fri, 06 Dec 2019 23:14:15 +0100 [thread overview]
Message-ID: <87tv6d3xvs.fsf@gmail.com> (raw)
In-Reply-To: <87o8wxfslj.fsf@gnus.org> (Lars Ingebrigtsen's message of "Wed, 27 Nov 2019 12:48:08 +0100")
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
> I think it makes sense for read-number to use its own history variable,
> but it should not be buffer local. Most inputs are not naturally buffer
> local.
No problem - I've added an input history variable for `read-number', and
a buffer-local one for `goto-line'. I'm attaching a patch with my
changes.
- Fede
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 2720 bytes --]
From 249ccb59be23d94018a01b4f8b1577356732d1da Mon Sep 17 00:00:00 2001
From: Federico Tedin <federicotedin@gmail.com>
Date: Fri, 6 Dec 2019 23:07:27 +0100
Subject: [PATCH 1/1] Make goto-line keep a separate input history per buffer
* lisp/simple.el (goto-line-history): New history variable.
(goto-line): Use new (buffer-local) variable as input history.
* lisp/subr.el (read-number-history): New history variable.
(read-number): Use the new variable as default input history.
---
lisp/simple.el | 7 ++++++-
lisp/subr.el | 9 +++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/lisp/simple.el b/lisp/simple.el
index 67ddab3d34..c14718de1c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1212,6 +1212,10 @@ mark-whole-buffer
;; Counting lines, one way or another.
+(defvar goto-line-history nil
+ "History of values entered with `goto-line'.")
+(make-variable-buffer-local 'goto-line-history)
+
(defun goto-line (line &optional buffer)
"Go to LINE, counting from line 1 at beginning of buffer.
If called interactively, a numeric prefix argument specifies
@@ -1256,7 +1260,8 @@ goto-line
"")))
;; Read the argument, offering that number (if any) as default.
(list (read-number (format "Goto line%s: " buffer-prompt)
- (list default (line-number-at-pos)))
+ (list default (line-number-at-pos))
+ 'goto-line-history)
buffer))))
;; Switch to the desired buffer, one way or another.
(if buffer
diff --git a/lisp/subr.el b/lisp/subr.el
index de7d919abf..8f7a9128fa 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2518,10 +2518,15 @@ read-passwd
;; And of course, don't keep the sensitive data around.
(erase-buffer))))))))
-(defun read-number (prompt &optional default)
+(defvar read-number-history nil
+ "The default history for the `read-number' function.")
+
+(defun read-number (prompt &optional default hist)
"Read a numeric value in the minibuffer, prompting with PROMPT.
DEFAULT specifies a default value to return if the user just types RET.
The value of DEFAULT is inserted into PROMPT.
+HIST specifies a history list variable. See `read-from-minibuffer'
+for details of the HIST argument.
This function is used by the `interactive' code letter `n'."
(let ((n nil)
(default1 (if (consp default) (car default) default)))
@@ -2535,7 +2540,7 @@ read-number
(while
(progn
(let ((str (read-from-minibuffer
- prompt nil nil nil nil
+ prompt nil nil nil (or hist 'read-number-history)
(when default
(if (consp default)
(mapcar 'number-to-string (delq nil default))
--
2.17.1
next prev parent reply other threads:[~2019-12-06 22:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-19 21:48 bug#38282: 26.3; goto-line should not share input history with other commands Federico Tedin
2019-11-21 13:51 ` Lars Ingebrigtsen
2019-11-21 14:41 ` Robert Pluim
2019-11-21 15:20 ` Michael Albinus
2019-11-21 17:51 ` Lars Ingebrigtsen
2019-11-21 18:43 ` Federico Tedin
2019-11-21 22:06 ` Federico Tedin
2019-11-22 7:35 ` Eli Zaretskii
2019-11-22 12:09 ` Lars Ingebrigtsen
2019-11-23 17:05 ` Federico Tedin
2019-11-27 11:48 ` Lars Ingebrigtsen
2019-12-06 22:14 ` Federico Tedin [this message]
2019-12-14 11:44 ` Eli Zaretskii
2019-12-17 21:19 ` Federico Tedin
2019-12-24 16:39 ` Lars Ingebrigtsen
2019-12-24 23:21 ` Federico Tedin
2019-11-22 7:57 ` Michael Albinus
2019-11-22 8:40 ` Robert Pluim
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87tv6d3xvs.fsf@gmail.com \
--to=federicotedin@gmail.com \
--cc=38282@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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).