From: Liu Hui <liuhui1610@gmail.com>
To: 72138@debbugs.gnu.org
Subject: bug#72138: 30.0.50; [PATCH] Fix ring size in comint-read-input-ring
Date: Tue, 16 Jul 2024 18:10:00 +0800 [thread overview]
Message-ID: <CAOQTW-NC=0Au3vnHgW9vdirgx0P0AOBVpQ58vWGJ27n4Zfi_fg@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
Hi,
When comint-read-input-ring reads history to the ring, the global
value of comint-input-ring-size (i.e. 500) is used regardless of the
local value due to the use of temp buffer. For example:
1. HISTSIZE=10 emacs -Q
2. M-x shell
The buffer-local value of comint-input-ring-size is correctly set to
10, but C-c C-l shows 500 commands.
The attached patch fixes the problem that comint-read-input-ring
ignores the buffer-local comint-input-ring-size. Thanks.
[-- Attachment #2: 0001-lisp-comint.el-comint-read-input-ring-Fix-ring-size.patch --]
[-- Type: text/x-patch, Size: 1766 bytes --]
From 50f4e7e349693dfb72e4dba23ec69efdb90b7eab Mon Sep 17 00:00:00 2001
From: Liu Hui <liuhui1610@gmail.com>
Date: Tue, 16 Jul 2024 18:05:46 +0800
Subject: [PATCH] * lisp/comint.el (comint-read-input-ring): Fix ring size.
---
lisp/comint.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/comint.el b/lisp/comint.el
index 29d2c429717..35b18edec66 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1060,6 +1060,7 @@ comint-read-input-ring
(ring-size (min 1500 comint-input-ring-size))
(ring (make-ring ring-size))
;; Use possibly buffer-local values of these variables.
+ (ring-max-size comint-input-ring-size)
(ring-separator comint-input-ring-separator)
(ring-file-prefix comint-input-ring-file-prefix)
(history-ignore comint-input-history-ignore)
@@ -1070,7 +1071,7 @@ comint-read-input-ring
;; Watch for those date stamps in history files!
(goto-char (point-max))
(let (start end history)
- (while (and (< count comint-input-ring-size)
+ (while (and (< count ring-max-size)
(re-search-backward ring-separator nil t)
(setq end (match-beginning 0)))
(goto-char (if (re-search-backward ring-separator nil t)
@@ -1088,7 +1089,7 @@ comint-read-input-ring
(not (string-equal (ring-ref ring 0)
history))))
(when (= count ring-size)
- (ring-extend ring (min (- comint-input-ring-size ring-size)
+ (ring-extend ring (min (- ring-max-size ring-size)
ring-size))
(setq ring-size (ring-size ring)))
(ring-insert-at-beginning ring history)
--
2.25.1
next reply other threads:[~2024-07-16 10:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-16 10:10 Liu Hui [this message]
2024-07-27 7:13 ` bug#72138: 30.0.50; [PATCH] Fix ring size in comint-read-input-ring Eli Zaretskii
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='CAOQTW-NC=0Au3vnHgW9vdirgx0P0AOBVpQ58vWGJ27n4Zfi_fg@mail.gmail.com' \
--to=liuhui1610@gmail.com \
--cc=72138@debbugs.gnu.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).