From ffa8a2db083165fc9f8c38ba9636e2c7801fcd2f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 31 May 2014 21:53:04 -0400 Subject: [PATCH] * lisp/progmodes/js.el (js-indent-line): Don't mix columns and chars. Fixes: debbugs:17619 --- lisp/ChangeLog | 5 +++++ lisp/progmodes/js.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 20257f089d9..f1e3af8123d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-01 Stefan Monnier + + * progmodes/js.el (js-indent-line): Don't mix columns and chars + (bug#17619). + 2014-05-31 Stefan Monnier * subr.el (set-transient-map): Don't wait for some "nested" diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 5be1373213e..a8f0d556ec4 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1907,7 +1907,7 @@ In particular, return the buffer position of the first `for' kwd." (interactive) (let* ((parse-status (save-excursion (syntax-ppss (point-at-bol)))) - (offset (- (current-column) (current-indentation)))) + (offset (- (point) (save-excursion (back-to-indentation) (point))))) (indent-line-to (js--proper-indentation parse-status)) (when (> offset 0) (forward-char offset)))) -- 2.39.2