aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorStefan Monnier2014-05-31 21:53:04 -0400
committerStefan Monnier2014-05-31 21:53:04 -0400
commitffa8a2db083165fc9f8c38ba9636e2c7801fcd2f (patch)
treef2f5034b80b590b6b833018e4e42d078e7e9ef59 /lisp/progmodes
parent8889b935d16baa59a76417d465f54501e8246b1a (diff)
downloademacs-ffa8a2db083165fc9f8c38ba9636e2c7801fcd2f.tar.gz
emacs-ffa8a2db083165fc9f8c38ba9636e2c7801fcd2f.zip
* lisp/progmodes/js.el (js-indent-line): Don't mix columns and chars.
Fixes: debbugs:17619
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/js.el2
1 files changed, 1 insertions, 1 deletions
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."
1907 (interactive) 1907 (interactive)
1908 (let* ((parse-status 1908 (let* ((parse-status
1909 (save-excursion (syntax-ppss (point-at-bol)))) 1909 (save-excursion (syntax-ppss (point-at-bol))))
1910 (offset (- (current-column) (current-indentation)))) 1910 (offset (- (point) (save-excursion (back-to-indentation) (point)))))
1911 (indent-line-to (js--proper-indentation parse-status)) 1911 (indent-line-to (js--proper-indentation parse-status))
1912 (when (> offset 0) (forward-char offset)))) 1912 (when (> offset 0) (forward-char offset))))
1913 1913