summaryrefslogtreecommitdiff
path: root/lisp/emulation
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-07-06 16:58:52 -0700
committerGlenn Morris <rgm@gnu.org>2014-07-06 16:58:52 -0700
commit50802fa8e234ba241036c7fded8a57c6088722ea (patch)
tree57f8b11c2fcffc35a72e2aae0ff7d4cb0804d1be /lisp/emulation
parent41cd2704e2972a1aac00aa5d538d2f66c5f6f664 (diff)
downloademacs-50802fa8e234ba241036c7fded8a57c6088722ea.tar.gz
* cua-rect.el (cua--activate-rectangle): Avoid setting cua--rectangle to nil.
Fixes: debbugs:17877
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/cua-rect.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index d516bd4c7cc..31dd137a6b9 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -726,11 +726,11 @@ If command is repeated at same position, delete the rectangle."
;; Set cua--rectangle to indicate we're marking a rectangle.
;; Be careful if we are already marking a rectangle.
(setq cua--rectangle
- (if (and cua--last-rectangle
+ (or (and cua--last-rectangle
(eq (car cua--last-rectangle) (current-buffer))
- (eq (car (cdr cua--last-rectangle)) (point)))
- (cdr (cdr cua--last-rectangle))
- (cua--rectangle-get-corners))
+ (eq (car (cdr cua--last-rectangle)) (point))
+ (cdr (cdr cua--last-rectangle)))
+ (cua--rectangle-get-corners))
cua--status-string (if (cua--rectangle-virtual-edges) " [R]" "")
cua--last-rectangle nil)
(activate-mark))