2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 36c4c6ae4e8..7365e8c274e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-22  Mihir Rege  <mihirrege@gmail.com>  (tiny change)
+
+        * progmodes/js.el (js--ctrl-statement-indentation): Fix indent
+        when control-statement is the first statement in a buffer (Bug#15956).
+
 2013-11-24  Dmitry Gutov  <dgutov@yandex.ru>
 
         * imenu.el (imenu-generic-skip-comments-and-strings):
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 49a21933133..17c13607d71 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1749,8 +1749,8 @@ nil."
     (when (save-excursion
             (and (not (eq (point-at-bol) (point-min)))
                  (not (looking-at "[{]"))
+                 (js--re-search-backward "[[:graph:]]" nil t)
                  (progn
-                   (js--re-search-backward "[[:graph:]]" nil t)
                    (or (eobp) (forward-char))
                    (when (= (char-before) ?\)) (backward-list))
                    (skip-syntax-backward " ")