summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2000-12-11 15:33:34 +0000
committerGerd Moellmann <gerd@gnu.org>2000-12-11 15:33:34 +0000
commitab7e20d586cae93a2f763ca54aa5273926cb894a (patch)
tree9991361bba1a38dda4d452f083ec3b1fb817c256
parent6e80fddb98809ae5b527e26e585186400c60e88f (diff)
downloademacs-ab7e20d586cae93a2f763ca54aa5273926cb894a.tar.gz
(kill-new): Don't try to setcar kill-ring if it is
nil.
-rw-r--r--lisp/simple.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 2158d35891c..aded4e0650d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1668,7 +1668,7 @@ Optional second argument REPLACE non-nil means that STRING will replace
the front of the kill ring, rather than being added to the list."
(and (fboundp 'menu-bar-update-yank-menu)
(menu-bar-update-yank-menu string (and replace (car kill-ring))))
- (if replace
+ (if (and replace kill-ring)
(setcar kill-ring string)
(setq kill-ring (cons string kill-ring))
(if (> (length kill-ring) kill-ring-max)