summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuri Linkov <juri@linkov.net>2021-05-21 21:18:09 +0300
committerJuri Linkov <juri@linkov.net>2021-05-21 21:18:09 +0300
commitdfe79a8185bb1374e09096f81aba865adb33359f (patch)
tree04bddabeda7e611069ef4345794a4c9496ad46ad
parentbab7e8546143d21e30c1d49bfdc1315a196c2c41 (diff)
downloademacs-dfe79a8185bb1374e09096f81aba865adb33359f.tar.gz
emacs-dfe79a8185bb1374e09096f81aba865adb33359f.tar.bz2
emacs-dfe79a8185bb1374e09096f81aba865adb33359f.zip
* lisp/simple.el (yank-from-kill-ring): Fix kill-ring-yank-pointer (bug#48478)
-rw-r--r--lisp/simple.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index f139555dd34..2a90a076315 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5772,9 +5772,8 @@ When called from Lisp, insert STRING like `insert-for-yank' does."
(insert-for-yank string)
(when yank-from-kill-ring-rotate
(let ((pos (seq-position kill-ring string)))
- (setq kill-ring-yank-pointer
- (or (and pos (nthcdr pos kill-ring))
- kill-ring))))
+ (when pos
+ (setq kill-ring-yank-pointer (nthcdr pos kill-ring)))))
(if (consp arg)
;; Swap point and mark like in `yank' and `yank-pop'.
(goto-char (prog1 (mark t)