2 files changed, 6 insertions, 1 deletions

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  <monnier@iro.umontreal.ca>
+
+        * progmodes/js.el (js-indent-line): Don't mix columns and chars
+        (bug#17619).
+
 2014-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * 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))))