[elpa] 227/287: Be more careful of cua--rectangle

[Matthew Fidler]

mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.

commit 0428d2c88677d0d4dab2fa1ba0459027e4a7442d
Author: Matthew L. Fidler <address@hidden>
Date:   Thu Jun 26 09:34:35 2014 -0500

    Be more careful of cua--rectangle
---
 ergoemacs-functions.el |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index 6a84511..9ccd8f1 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -161,7 +161,7 @@ If an error occurs, display the error, and sit for 2 
seconds before exiting"
               (ergoemacs-read-key (concat key " " next-key) 'normal))
           (funcall fn-cp arg))))
      ((or (region-active-p)
-          (and cua--rectangle (boundp 'cua-mode) cua-mode))
+          (and (boundp 'cua--rectangle) cua--rectangle (boundp 'cua-mode) 
cua-mode))
       (funcall fn-cp arg))
      (t
       (ergoemacs-read-key key 'normal)))))
@@ -302,12 +302,13 @@ If `narrow-to-region' is in effect, then cut that region 
only."
 (defvar cua-mode)
 (declare-function cua-copy-rectangle "cua-rect.el")
 (declare-function cua-copy-region "cua-base.el")
+(defvar cua--rectangle)
 (defun ergoemacs-copy-line-or-region (&optional arg)
   "Copy current line, or current text selection."
   (interactive "P")
   (cond
    ;;; cua-copy-rectangle
-   ((and cua--rectangle cua-mode)
+   ((and (boundp 'cua--rectangle) cua--rectangle cua-mode)
     (cua-copy-rectangle arg))
    ((and (region-active-p) cua-mode)
     (cua-copy-region arg))
@@ -1716,7 +1717,7 @@ When in `browse-kill-ring-mode', cycle forward through 
the key ring.
   "Ergoemacs org-mode paste."
   (let ((regtxt (and cua--register (get-register cua--register))))
     (cond
-     ((and mark-active cua--rectangle)
+     ((and mark-active (boundp 'cua--rectangle) cua--rectangle)
       ;; call cua-paste
       (cua-paste arg))
      ((and cua--last-killed-rectangle