aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kastrup2006-09-20 04:13:32 +0000
committerDavid Kastrup2006-09-20 04:13:32 +0000
commit1d45e02e70b11201279ca3a9cd939c0090fe9b1b (patch)
treef465a69f90bcd2402c4e2ba824f43b677d163c80
parentf9367e6ffed9eb41a9d46e6bb38c2adb5e769f6b (diff)
downloademacs-1d45e02e70b11201279ca3a9cd939c0090fe9b1b.tar.gz
emacs-1d45e02e70b11201279ca3a9cd939c0090fe9b1b.zip
(clipboard-yank): bomb out in interactive use if
buffer is read-only.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/menu-bar.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79082e53798..5ce0d6d18f2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-09-20 David Kastrup <dak@gnu.org>
2
3 * menu-bar.el (clipboard-yank): bomb out in interactive use if
4 buffer is read-only.
5
12006-09-18 Ken Manheimer <ken.manheimer@gmail.com> 62006-09-18 Ken Manheimer <ken.manheimer@gmail.com>
2 7
3 * allout.el (allout-unprotected): Let inhibit-read-only only when 8 * allout.el (allout-unprotected): Let inhibit-read-only only when
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index cc1351b9032..9a89aa42401 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -510,7 +510,7 @@ A large number or nil slows down menu responsiveness."
510 510
511(defun clipboard-yank () 511(defun clipboard-yank ()
512 "Insert the clipboard contents, or the last stretch of killed text." 512 "Insert the clipboard contents, or the last stretch of killed text."
513 (interactive) 513 (interactive "*")
514 (let ((x-select-enable-clipboard t)) 514 (let ((x-select-enable-clipboard t))
515 (yank))) 515 (yank)))
516 516