diff options
| author | Juri Linkov <juri@jurta.org> | 2011-11-19 22:14:56 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2011-11-19 22:14:56 +0200 |
| commit | 645ca9cf3730a94481ff52b47d63f20852b15245 (patch) | |
| tree | 42f4d31179d45f4ef872d262f30c5b41de3e9961 | |
| parent | df754f6672e953b309538ad1ded72d2f3300f215 (diff) | |
| download | emacs-645ca9cf3730a94481ff52b47d63f20852b15245.tar.gz | |
Replace `delete' with `remove' in info.el.
* lisp/info.el (Info-find-node-2, Info-select-node, Info-history-find-node):
Use non-destructive `remove' instead of `delete' because
`Info-history-list' stored to `Info-isearch-initial-history-list' in
`Info-isearch-start' might need to be restored in `Info-isearch-end'.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/info.el | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 46245ba6090..fcfdb066d5c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2011-11-19 Juri Linkov <juri@jurta.org> + * info.el (Info-find-node-2, Info-select-node, Info-history-find-node): + Use non-destructive `remove' instead of `delete' because + `Info-history-list' stored to `Info-isearch-initial-history-list' in + `Info-isearch-start' might need to be restored in `Info-isearch-end'. + +2011-11-19 Juri Linkov <juri@jurta.org> + * isearch.el (isearch-edit-string): Let-bind `history-add-new-input' to nil instead of binding `search-ring' and `regexp-search-ring'. (Bug#9185) diff --git a/lisp/info.el b/lisp/info.el index 0148ee544f9..12639478d8e 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1087,7 +1087,7 @@ a case-insensitive match is tried." ;; Add anchors to the history too (setq Info-history-list (cons new-history - (delete new-history Info-history-list)))) + (remove new-history Info-history-list)))) (goto-char anchorpos)) ((numberp Info-point-loc) (forward-line (- Info-point-loc 2)) @@ -1514,7 +1514,7 @@ escaped (\\\",\\\\)." ;; Add a new unique history item to full history list (let ((new-history (list Info-current-file Info-current-node))) (setq Info-history-list - (cons new-history (delete new-history Info-history-list))) + (cons new-history (remove new-history Info-history-list))) (setq Info-history-forward nil)) (if (not (eq Info-fontify-maximum-menu-size nil)) (Info-fontify-node)) @@ -2153,7 +2153,7 @@ If SAME-FILE is non-nil, do not move to a different Info file." (insert "Recently Visited Nodes\n") (insert "**********************\n\n") (insert "* Menu:\n\n") - (let ((hl (delete '("*History*" "Top") Info-history-list))) + (let ((hl (remove '("*History*" "Top") Info-history-list))) (while hl (let ((file (nth 0 (car hl))) (node (nth 1 (car hl)))) |