aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2005-12-09 09:10:10 +0000
committerKim F. Storm2005-12-09 09:10:10 +0000
commit559202293294bb5d124f6567d5ffbbf509821f29 (patch)
tree2f3141878694144af499954cdfc5a6436538cad4
parent58090a8d2868a57c49b226947230de1d7cbbeb09 (diff)
downloademacs-559202293294bb5d124f6567d5ffbbf509821f29.tar.gz
emacs-559202293294bb5d124f6567d5ffbbf509821f29.zip
(cua--extract-rectangle): Undo recent change re. \s in strings.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/emulation/cua-rect.el4
2 files changed, 2 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc9d5a3ca7a..d6d3a5488c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1273,9 +1273,6 @@
1273 (cua--init-rectangles): Always bind C-return to toggle rectangle. 1273 (cua--init-rectangles): Always bind C-return to toggle rectangle.
1274 Pass ?\s instead of 'space to cua--M/H-key and cua--rect-M/H-key. 1274 Pass ?\s instead of 'space to cua--M/H-key and cua--rect-M/H-key.
1275 1275
1276 * emulation/cua-rect.el (cua--extract-rectangle): Don't use \s
1277 in strings.
1278
1279 * ido.el: Move Acknowledgements and History after Commentary. 1276 * ido.el: Move Acknowledgements and History after Commentary.
1280 Minor changes to Commentary. 1277 Minor changes to Commentary.
1281 1278
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 46974089dc2..aa82e148aff 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -641,11 +641,11 @@ If command is repeated at same position, delete the rectangle."
641 (if (= (point) (line-end-position)) 641 (if (= (point) (line-end-position))
642 (setq bs (- r l) 642 (setq bs (- r l)
643 copy nil) 643 copy nil)
644 (skip-chars-forward " \t" e) 644 (skip-chars-forward "\s\t" e)
645 (setq bs (- (min r (current-column)) l) 645 (setq bs (- (min r (current-column)) l)
646 s (point)) 646 s (point))
647 (move-to-column r) 647 (move-to-column r)
648 (skip-chars-backward " \t" s) 648 (skip-chars-backward "\s\t" s)
649 (setq as (- r (max (current-column) l)) 649 (setq as (- r (max (current-column) l))
650 e (point))) 650 e (point)))
651 (setq row (if (and copy (> e s)) 651 (setq row (if (and copy (> e s))