[ELPA-diffs] ELPA branch, master, updated. 9e2de34d6c42dc54148303b334dea23e630be2ba

[Stefan Monnier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ELPA".

The branch, master has been updated
       via  9e2de34d6c42dc54148303b334dea23e630be2ba (commit)
       via  2c27e3eb847ccbfd494d23d61098610c87d21804 (commit)
       via  b06f31fa31c527dd890085f22f9936c3bbdab5a3 (commit)
      from  fcca4e12b3376d19c55d3290fd976ab342faa238 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9e2de34d6c42dc54148303b334dea23e630be2ba
Merge: fcca4e1 2c27e3e
Author: Stefan Monnier <address@hidden>
Date:   Wed Aug 21 15:41:25 2013 -0400

    Sync from js2-mode/master


commit 2c27e3eb847ccbfd494d23d61098610c87d21804
Author: Dmitry Gutov <address@hidden>
Date:   Thu Jul 25 01:25:06 2013 +0300

    Make comment vars buffer-local
    
    Fixes http://code.google.com/p/js2-mode/issues/detail?id=129

diff --git a/js2-mode.el b/js2-mode.el
index c74d2e6..6842056 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -10248,8 +10248,10 @@ Selecting an error will jump it to the corresponding 
source-buffer error.
 (define-derived-mode js2-mode prog-mode "Javascript-IDE"
   ;; FIXME: Should derive from js-mode.
   "Major mode for editing JavaScript code."
-  (setq comment-start "//"  ; used by comment-region; don't change it
-        comment-end "")
+  ;; Used by comment-region; don't change it.
+  (set (make-local-variable 'comment-start) "//")
+  (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'comment-start-skip) js2-comment-start-skip)
   (set (make-local-variable 'max-lisp-eval-depth)
        (max max-lisp-eval-depth 3000))
   (set (make-local-variable 'indent-line-function) #'js2-indent-line)
@@ -10278,7 +10280,6 @@ Selecting an error will jump it to the corresponding 
source-buffer error.
         c-line-comment-starter "//"
         c-paragraph-start js2-paragraph-start
         c-paragraph-separate "$"
-        comment-start-skip js2-comment-start-skip
         c-syntactic-ws-start js2-syntactic-ws-start
         c-syntactic-ws-end js2-syntactic-ws-end
         c-syntactic-eol js2-syntactic-eol)

commit b06f31fa31c527dd890085f22f9936c3bbdab5a3
Author: Dmitry Gutov <address@hidden>
Date:   Wed Jul 24 23:19:49 2013 +0300

    Update `js2-concat-multiline-strings' docstring
    
    #107

diff --git a/js2-mode.el b/js2-mode.el
index 982b794..c74d2e6 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -292,8 +292,8 @@ If `js2-dynamic-idle-timer-adjust' is 0 or negative,
   :group 'js2-mode)
 
 (defcustom js2-concat-multiline-strings t
-  "Non-nil to automatically turn a newline in mid-string into a
-string concatenation.  When `eol', the '+' will be inserted at the
+  "When non-nil, `js2-line-break' in mid-string will make it a
+string concatenation. When `eol', the '+' will be inserted at the
 end of the line, otherwise, at the beginning of the next line."
   :type '(choice (const t) (const eol) (const nil))
   :group 'js2-mode)

-----------------------------------------------------------------------

Summary of changes:
 packages/js2-mode/js2-mode.el |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
ELPA