aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-10-17 15:31:11 -0400
committerGlenn Morris2013-10-17 15:31:11 -0400
commit642eb8b6afa1c16b134d296ed90fd8fe59dc1d49 (patch)
tree021be9653d9f137044eaab26b36422b79d3e14a6
parent14cf4bfea97d5a3fb24e416b84f0b8ae08c08229 (diff)
downloademacs-642eb8b6afa1c16b134d296ed90fd8fe59dc1d49.tar.gz
emacs-642eb8b6afa1c16b134d296ed90fd8fe59dc1d49.zip
* lisp/indent.el (indent-rigidly): Fix 2013-10-08 change.
Fixes: debbugs:15635
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/indent.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8dfd2553046..ba8fea8652e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-10-17 Glenn Morris <rgm@gnu.org>
2
3 * indent.el (indent-rigidly): Fix 2013-10-08 change. (Bug#15635)
4
12013-10-17 Stefan Monnier <monnier@iro.umontreal.ca> 52013-10-17 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * skeleton.el (skeleton-newline): Remove. 7 * skeleton.el (skeleton-newline): Remove.
diff --git a/lisp/indent.el b/lisp/indent.el
index 434d73dc5bb..e733ece66d5 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -212,7 +212,7 @@ and <S-right>.")
212 (skip-chars-forward " \t") 212 (skip-chars-forward " \t")
213 (setq eol-flag (eolp))) 213 (setq eol-flag (eolp)))
214 (or eol-flag 214 (or eol-flag
215 (indent-to (max 0 (+ indent arg)) 0)) 215 (indent-to (max 0 (+ indent (prefix-numeric-value arg))) 0))
216 (delete-region (point) (progn (skip-chars-forward " \t") (point)))) 216 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
217 (forward-line 1)) 217 (forward-line 1))
218 (move-marker end nil)))) 218 (move-marker end nil))))