[Emacs-diffs] emacs-24 r117359: * cua-rect.el (cua--activate-rectangle): Avoid setting cua--rectangle to nil.

[Glenn Morris]

------------------------------------------------------------
revno: 117359
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17877
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-07-06 16:58:52 -0700
message:
  * cua-rect.el (cua--activate-rectangle): Avoid setting cua--rectangle to nil.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emulation/cua-rect.el     cuarect.el-20091113204419-o5vbwnq5f7feedwu-2417

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-06 20:28:38 +0000
+++ b/lisp/ChangeLog    2014-07-06 23:58:52 +0000
@@ -1,3 +1,8 @@
+2014-07-06  Glenn Morris  <address@hidden>
+
+       * emulation/cua-rect.el (cua--activate-rectangle):
+       Avoid setting cua--rectangle to nil.  (Bug#17877)
+
 2014-07-06  Stephen Berman  <address@hidden>
 
        * calendar/todo-mode.el: Fix wrong-type-argument error when

=== modified file 'lisp/emulation/cua-rect.el'
--- a/lisp/emulation/cua-rect.el        2014-01-01 07:43:34 +0000
+++ b/lisp/emulation/cua-rect.el        2014-07-06 23:58:52 +0000
@@ -726,11 +726,11 @@
   ;; 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))