Prefer defvar-local in cua

* lisp/emulation/cua-base.el (cua-inhibit-cua-keys)
(cua--status-string):
* lisp/emulation/cua-rect.el (cua--rectangle)
(cua--rectangle-overlays): Prefer defvar-local.

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 881eff7f80136406f6845d1ab3f5d6ef78406e2e..a64274bc0c14cad76dcbc38673791772db03e9b8 100644 (file)
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -634,9 +634,8 @@ a cons (TYPE . COLOR), then both properties are affected."
 
 ;;; Low-level Interface
 
-(defvar cua-inhibit-cua-keys nil
+(defvar-local cua-inhibit-cua-keys nil
   "Buffer-local variable that may disable the CUA keymappings.")
-(make-variable-buffer-local 'cua-inhibit-cua-keys)
 
 ;;; Aux. variables
 
@@ -644,9 +643,8 @@ a cons (TYPE . COLOR), then both properties are affected."
 ;; checked in post-command hook to see if point was moved
 (defvar cua--buffer-and-point-before-command nil)
 
-;; status string for mode line indications
-(defvar cua--status-string nil)
-(make-variable-buffer-local 'cua--status-string)
+(defvar-local cua--status-string nil
+  "Status string for mode line indications.")
 
 (defvar cua--debug nil)
 

diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index ea5dad2aa0bb521a798f655331a34b4bb29d240d..be2d7c0fd8aaf1a17de3704a27212565aeb433d0 100644 (file)
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -37,7 +37,7 @@
 
 (require 'rect)
 
-(defvar cua--rectangle nil
+(defvar-local cua--rectangle nil
   "If non-nil, restrict current region to this rectangle.
 A cua-rectangle definition is a vector used for all actions in
 `cua-rectangle-mark-mode', of the form:
@@ -59,7 +59,6 @@ If VIRT is non-nil, virtual straight edges are enabled.
 
 If SELECT is a regexp, only lines starting with that regexp are
 affected.")
-(make-variable-buffer-local 'cua--rectangle)
 
 (defvar cua--last-rectangle nil
   "Most recent rectangle geometry.
@@ -85,9 +84,8 @@ See `cua--rectangle'.")
 ;;       "active " "sert on" " straig" " lines ")
 (defvar cua--last-killed-rectangle nil)
 
-(defvar cua--rectangle-overlays nil
+(defvar-local cua--rectangle-overlays nil
   "List of overlays used to display current rectangle.")
-(make-variable-buffer-local 'cua--rectangle-overlays)
 (put 'cua--rectangle-overlays 'permanent-local t)
 
 (defvar cua--overlay-keymap