aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2014-07-08 22:20:21 -0400
committerStefan Monnier2014-07-08 22:20:21 -0400
commit388b22deb41bd53d9294c0e4dcfb6af286252884 (patch)
treee65bbefa059c4999be1fc67c95156cc76098a877
parent5613a6f6d52bca0018c5777aba67a99f51016a35 (diff)
downloademacs-388b22deb41bd53d9294c0e4dcfb6af286252884.tar.gz
emacs-388b22deb41bd53d9294c0e4dcfb6af286252884.zip
* lisp/rect.el (apply-on-rectangle): Check forward-line really moved to the
next line.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/rect.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f50993e2131..ce4c371aeed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12014-07-09 Stefan Monnier <monnier@iro.umontreal.ca> 12014-07-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * rect.el (apply-on-rectangle): Check forward-line really moved to the
4 next line.
5
62014-07-09 Stefan Monnier <monnier@iro.umontreal.ca>
7
3 * progmodes/sh-script.el (sh-smie-sh-rules): Don't align with a && in 8 * progmodes/sh-script.el (sh-smie-sh-rules): Don't align with a && in
4 the middle of a line (bug#17896). 9 the middle of a line (bug#17896).
5 10
diff --git a/lisp/rect.el b/lisp/rect.el
index a2f8e4f6371..4c3aa08d7bd 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -163,7 +163,7 @@ The final point after the last operation will be returned."
163 (progn 163 (progn
164 (apply function startcol endcol args) 164 (apply function startcol endcol args)
165 (setq final-point (point)) 165 (setq final-point (point))
166 (and (zerop (forward-line 1)) 166 (and (zerop (forward-line 1)) (bolp)
167 (<= (point) endpt)))) 167 (<= (point) endpt))))
168 final-point))) 168 final-point)))
169 169