]> code.delx.au - gnu-emacs-elpa/commitdiff
Merge pull request #332 from bolivier/master
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 4 May 2016 11:46:04 +0000 (14:46 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 4 May 2016 11:46:04 +0000 (14:46 +0300)
Allow space before global declaration

1  2 
js2-mode.el

diff --combined js2-mode.el
index 9515e2703ce33fd56a81f5d6a674ff52756a02f3,e804fbbb1c0f1c3a3c640f02857d6bb8631db085..238440c8f7a7f3582e44019f0ff5f8d180523e9b
@@@ -1456,7 -1456,7 +1456,7 @@@ the correct number of ARGS must be prov
           "Compilation produced %s syntax errors.")
  
  (js2-msg "msg.var.redecl"
 -         "TypeError: redeclaration of var %s.")
 +         "Redeclaration of var %s.")
  
  (js2-msg "msg.const.redecl"
           "TypeError: redeclaration of const %s.")
@@@ -7264,7 -7264,7 +7264,7 @@@ are ignored.
             when (and (eq 'block (js2-comment-node-format node))
                       (save-excursion
                         (goto-char (js2-node-abs-pos node))
-                        (looking-at "/\\*global ")))
+                        (looking-at "/\\* *global ")))
             append (js2-get-jslint-globals-in
                     (match-end 0)
                     (js2-node-abs-end node))))