From: Kim F. Storm Date: Wed, 1 May 2002 22:04:47 +0000 (+0000) Subject: (cua-inhibit-cua-keys): New buffer-local variable. X-Git-Tag: ttn-vms-21-2-B4~15231 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63e6f5b3f9b2c509f2928eb5bc6c54a9a1324288;p=emacs.git (cua-inhibit-cua-keys): New buffer-local variable. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0a338548f8d..6907a8450d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5,6 +5,9 @@ (menu-bar-options-menu): Added toggle for cua-mode. Disable toggle for transient-mark-mode if cua-mode is enabled. + * emulation/cua-base.el (cua-inhibit-cua-keys): New buffer-local + variable. + 2002-05-01 Richard M. Stallman * help.el (view-todo): New function. diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index b8188b7eb18..9e8fdb98ebb 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -460,6 +460,13 @@ Will change cursor color to specified color if string." (require 'cua-gmrk) ) + +;;; Low-level Interface + +(defvar cua-inhibit-cua-keys nil + "Buffer-local variable that may disable the cua keymappings.") +(make-variable-buffer-local 'cua-inhibit-cua-keys) + ;;; Aux. variables ;; Current region was started using cua-set-mark. @@ -1004,6 +1011,7 @@ Extra commands should be added to `cua-user-movement-commands'") (setq cua--ena-prefix-override-keymap (and cua--ena-region-keymap cua-enable-cua-keys + (not cua-inhibit-cua-keys) (or (eq cua-enable-cua-keys t) (not cua--explicit-region-start)) (not executing-kbd-macro) @@ -1013,6 +1021,7 @@ Extra commands should be added to `cua-user-movement-commands'") (timerp cua--prefix-override-timer))) (setq cua--ena-cua-keys-keymap (and cua-enable-cua-keys + (not cua-inhibit-cua-keys) (or (eq cua-enable-cua-keys t) cua--last-region-shifted))) (setq cua--ena-global-mark-keymap