aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-07 21:41:05 -0400
committerGlenn Morris2012-05-07 21:41:05 -0400
commit5075bdb576c96ffba8eee9ae8bbf70c23315f8ed (patch)
tree4ddc2f9ec406de5f7afaf06d42e2a99b257ff302
parent06f679a7941bdb0ca787021a89702fbed668d3a3 (diff)
downloademacs-5075bdb576c96ffba8eee9ae8bbf70c23315f8ed.tar.gz
emacs-5075bdb576c96ffba8eee9ae8bbf70c23315f8ed.zip
* lisp/play/zone.el (zone-pgm-stress): Don't pollute kill-ring. (Bug#11388)
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/play/zone.el5
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 318d18a05d9..78d4bb87c9b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-05-08 Glenn Morris <rgm@gnu.org>
2
3 * play/zone.el (zone-pgm-stress): Don't pollute kill-ring. (Bug#11388)
4
12012-05-08 Aaron S. Hawley <aaron.s.hawley@gmail.com> 52012-05-08 Aaron S. Hawley <aaron.s.hawley@gmail.com>
2 6
3 * progmodes/make-mode.el (makefile-browse): 7 * progmodes/make-mode.el (makefile-browse):
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index f47e273d612..b64099844e2 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -1,6 +1,6 @@
1;;; zone.el --- idle display hacks 1;;; zone.el --- idle display hacks
2 2
3;; Copyright (C) 2000-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
4 4
5;; Author: Victor Zandy <zandy@cs.wisc.edu> 5;; Author: Victor Zandy <zandy@cs.wisc.edu>
6;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org> 6;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org>
@@ -595,8 +595,7 @@ If the element is a function or a list of a function and a number,
595 (when (< 50 (random 100)) 595 (when (< 50 (random 100))
596 (goto-char (point-max)) 596 (goto-char (point-max))
597 (forward-line -1) 597 (forward-line -1)
598 (let ((kill-whole-line t)) 598 (delete-region (point) (line-beginning-position 2))
599 (kill-line))
600 (goto-char (point-min)) 599 (goto-char (point-min))
601 (insert (nth (random (length lines)) lines))) 600 (insert (nth (random (length lines)) lines)))
602 (message (concat (make-string (random (- (frame-width) 5)) ? ) "grrr")) 601 (message (concat (make-string (random (- (frame-width) 5)) ? ) "grrr"))