procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Erase existing duplicates in eshell-history-ring

Browse source 
Erase all existing duplicates instead of just the last duplicate entry
when 'eshell-hist-ignoredups' is set to 'erase'.  Multiple duplicates
can exist in case 'eshell-hist-ignoredups' was set to something else
than 'erase' in the past or if the history file contains duplicates
(bug#71107).

* lisp/eshell/em-hist.el (eshell-add-input-to-history): Remove all
duplicates from history ring.

* test/lisp/eshell/em-hist-tests.el
(em-hist-test/add-to-history/erase-existing-dups): New test.
This commit is contained in:
Robin Joy 2024-05-24 14:26:39 +02:00 • committed by Jim Porter
parent f3dd0d981c
commit 984fb346fd
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/eshell/em-hist.el
View file

@ -398,11 +398,9 @@ input."
(pcase eshell-hist-ignoredups
('nil t) ; Always add to history
('erase ; Add, removing any old occurrences
(when-let ((old-index (ring-member eshell-history-ring input)))
;; Remove the old occurrence of this input so we can
;; add it to the end. FIXME: Should we try to
;; remove multiple old occurrences, e.g. if the user
;; recently changed to using `erase'?
(while-let ((old-index (ring-member eshell-history-ring input)))
;; Remove the old occurrences of this input so we can
;; add it to the end.
(ring-remove eshell-history-ring old-index))
t)
(_ ; Add if not already the latest entry

17
test/lisp/eshell/em-hist-tests.el
View file

@ -163,6 +163,23 @@ elements against that; if t (the default), check against EXPECTED."
(should (equal (ring-elements eshell-history-ring)
'("echo hi" "echo bye"))))))
(ert-deftest em-hist-test/add-to-history/erase-existing-dups ()
"Test adding to history, erasing any old dups after switching to 'erase."
(let ((eshell-hist-ignoredups nil))
(with-temp-eshell
(eshell-insert-command "echo hi")
(eshell-insert-command "echo bye")
(eshell-insert-command "echo bye")
(eshell-insert-command "echo hi")
(eshell-insert-command "echo bye")
(setq eshell-hist-ignoredups 'erase)
(eshell-insert-command "echo hi")
(should (equal (ring-elements eshell-history-ring)
'("echo hi" "echo bye" "echo bye" "echo bye")))
(eshell-insert-command "echo bye")
(should (equal (ring-elements eshell-history-ring)
'("echo bye" "echo hi"))))))
(provide 'em-hist-test)
;;; em-hist-tests.el ends here