[Emacs-diffs] emacs-24 r117183: * lisp/progmodes/js.el (js-indent-line): Don't mix columns and chars.

[Stefan Monnier]

------------------------------------------------------------
revno: 117183
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17619
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-05-31 21:53:04 -0400
message:
  * lisp/progmodes/js.el (js-indent-line): Don't mix columns and chars.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/js.el           js.el-20091113204419-o5vbwnq5f7feedwu-10919

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-31 20:02:47 +0000
+++ b/lisp/ChangeLog    2014-06-01 01:53:04 +0000
@@ -1,3 +1,8 @@
+2014-06-01  Stefan Monnier  <address@hidden>
+
+       * progmodes/js.el (js-indent-line): Don't mix columns and chars
+       (bug#17619).
+
 2014-05-31  Stefan Monnier  <address@hidden>
 
        * subr.el (set-transient-map): Don't wait for some "nested"

=== modified file 'lisp/progmodes/js.el'
--- a/lisp/progmodes/js.el      2014-05-01 23:55:25 +0000
+++ b/lisp/progmodes/js.el      2014-06-01 01:53:04 +0000
@@ -1907,7 +1907,7 @@
   (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))))