[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 227/287: Be more careful of cua--rectangle
From: |
Matthew Fidler |
Subject: |
[elpa] 227/287: Be more careful of cua--rectangle |
Date: |
Wed, 02 Jul 2014 14:46:12 +0000 |
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
- [elpa] 225/287: Added disabling to redo based on undo-tree-mode, (continued)
- [elpa] 225/287: Added disabling to redo based on undo-tree-mode, Matthew Fidler, 2014/07/02
- [elpa] 218/287: Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode, Matthew Fidler, 2014/07/02
- [elpa] 231/287: Change layout descriptions, Matthew Fidler, 2014/07/02
- [elpa] 229/287: Fix order of operations, Matthew Fidler, 2014/07/02
- [elpa] 226/287: Remove default redo keys; Possibly Fix Issue #242, Matthew Fidler, 2014/07/02
- [elpa] 224/287: Make undo-tree the default undo method and installed when ergoemacs-mode is installed. Issue #242, Matthew Fidler, 2014/07/02
- [elpa] 228/287: Add `cua-rect` require so that tests pass, Matthew Fidler, 2014/07/02
- [elpa] 219/287: `ergoemacs-select-text-in-quote' can now deal with escaped quote in string., Matthew Fidler, 2014/07/02
- [elpa] 233/287: Change the default option back, Matthew Fidler, 2014/07/02
- [elpa] 230/287: Fix `ergoemacs-beginning-of-line-or-what` and `ergoemacs-end-of-line-or-what`, Matthew Fidler, 2014/07/02
- [elpa] 227/287: Be more careful of cua--rectangle,
Matthew Fidler <=
- [elpa] 232/287: Fix beginning of line function again..., Matthew Fidler, 2014/07/02
- [elpa] 238/287: Fix warnings for cua-clear-rectangle-mark., Matthew Fidler, 2014/07/02
- [elpa] 240/287: Move the fixed bracket moving to the bracket theme component., Matthew Fidler, 2014/07/02
- [elpa] 236/287: add electric-pair-made as an option, Matthew Fidler, 2014/07/02
- [elpa] 237/287: Expanded outlook integration with Emacs org-mode, Matthew Fidler, 2014/07/02
- [elpa] 234/287: Make comment-search-backward less fragile, Matthew Fidler, 2014/07/02
- [elpa] 235/287: Add the uri encoding function, Matthew Fidler, 2014/07/02
- [elpa] 241/287: Cleanup for select text in quotes, Matthew Fidler, 2014/07/02
- [elpa] 243/287: Make the quote selection consistent., Matthew Fidler, 2014/07/02
- [elpa] 242/287: Fix `ergoemacs-select-text-in-ascii-quote` to work using font-lock, Matthew Fidler, 2014/07/02