aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2006-08-14 09:00:36 +0000
committerJan Djärv2006-08-14 09:00:36 +0000
commit369422051239c7ac9fc48ee42f898e41a77c7561 (patch)
tree84aaf59ffcf3ab62ca10ea24f308c4b2a9de7c5b
parente71cb549802ddb2ab5a04c2b7fdb2d892f846536 (diff)
downloademacs-369422051239c7ac9fc48ee42f898e41a77c7561.tar.gz
emacs-369422051239c7ac9fc48ee42f898e41a77c7561.zip
* term/x-win.el (menu-bar-edit-menu): Disable paste if buffer is
read only.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/x-win.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e44ebd5fbc..07c2f08e138 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-08-14 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * term/x-win.el (menu-bar-edit-menu): Disable paste if buffer is
4 read only.
5
12006-08-13 Romain Francoise <romain@orebokech.com> 62006-08-13 Romain Francoise <romain@orebokech.com>
2 7
3 * cus-theme.el (customize-create-theme) 8 * cus-theme.el (customize-create-theme)
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index af45c7c4270..38add1538aa 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2513,8 +2513,9 @@ order until succeed.")
2513 (yank))) 2513 (yank)))
2514 2514
2515(define-key menu-bar-edit-menu [paste] 2515(define-key menu-bar-edit-menu [paste]
2516 (cons "Paste" (cons "Paste text from clipboard or kill ring" 2516 '(menu-item "Paste" x-clipboard-yank
2517 'x-clipboard-yank))) 2517 :enable (not buffer-read-only)
2518 :help "Paste (yank) text most recently cut/copied"))
2518 2519
2519;; Initiate drag and drop 2520;; Initiate drag and drop
2520(add-hook 'after-make-frame-functions 'x-dnd-init-frame) 2521(add-hook 'after-make-frame-functions 'x-dnd-init-frame)