* lisp/simple.el (yank-from-kill-ring): Fix kill-ring-yank-pointer (b…

…ug#48478)
flatwhatson · May 21, 2021 · dfe79a8 · dfe79a8
1 parent bab7e85
commit dfe79a8
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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)