aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2017-01-29 10:39:55 +0200
committerDmitry Gutov2017-01-29 23:01:42 +0200
commit52feecd3c71716ca5dbade0e8e6ae2f8ebf46e54 (patch)
tree6d05827a51808cb4f30cd56a6a5a734b4822f5cc
parent2f90bbb5febd44bc9ff8dbff9267f535f907c307 (diff)
downloademacs-52feecd3c71716ca5dbade0e8e6ae2f8ebf46e54.tar.gz
emacs-52feecd3c71716ca5dbade0e8e6ae2f8ebf46e54.zip
Say JavaScript, not Javascript
* lisp/progmodes/js.el (js-mode-map, js-syntax-propertize) (js-js-error, js-eval, js-set-js-context) (js--get-js-context): Refer to the language consistently as JavaScript.
-rw-r--r--lisp/progmodes/js.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 4a5bde764bb..74dd4add9e2 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -574,8 +574,8 @@ then the \".\"s will be lined up:
574 (define-key keymap [(control ?c) (control ?j)] #'js-set-js-context) 574 (define-key keymap [(control ?c) (control ?j)] #'js-set-js-context)
575 (define-key keymap [(control meta ?x)] #'js-eval-defun) 575 (define-key keymap [(control meta ?x)] #'js-eval-defun)
576 (define-key keymap [(meta ?.)] #'js-find-symbol) 576 (define-key keymap [(meta ?.)] #'js-find-symbol)
577 (easy-menu-define nil keymap "Javascript Menu" 577 (easy-menu-define nil keymap "JavaScript Menu"
578 '("Javascript" 578 '("JavaScript"
579 ["Select New Mozilla Context..." js-set-js-context 579 ["Select New Mozilla Context..." js-set-js-context
580 (fboundp #'inferior-moz-process)] 580 (fboundp #'inferior-moz-process)]
581 ["Evaluate Expression in Mozilla Context..." js-eval 581 ["Evaluate Expression in Mozilla Context..." js-eval
@@ -1712,7 +1712,7 @@ This performs fontification according to `js--class-styles'."
1712 nil)))))) 1712 nil))))))
1713 1713
1714(defun js-syntax-propertize (start end) 1714(defun js-syntax-propertize (start end)
1715 ;; Javascript allows immediate regular expression objects, written /.../. 1715 ;; JavaScript allows immediate regular expression objects, written /.../.
1716 (goto-char start) 1716 (goto-char start)
1717 (js-syntax-propertize-regexp end) 1717 (js-syntax-propertize-regexp end)
1718 (funcall 1718 (funcall
@@ -2710,7 +2710,7 @@ current buffer. Pushes a mark onto the tag ring just like
2710;;; MozRepl integration 2710;;; MozRepl integration
2711 2711
2712(define-error 'js-moz-bad-rpc "Mozilla RPC Error") ;; '(timeout error)) 2712(define-error 'js-moz-bad-rpc "Mozilla RPC Error") ;; '(timeout error))
2713(define-error 'js-js-error "Javascript Error") ;; '(js-error error)) 2713(define-error 'js-js-error "JavaScript Error") ;; '(js-error error))
2714 2714
2715(defun js--wait-for-matching-output 2715(defun js--wait-for-matching-output
2716 (process regexp timeout &optional start) 2716 (process regexp timeout &optional start)
@@ -3391,7 +3391,7 @@ With argument, run even if no intervening GC has happened."
3391 3391
3392(defun js-eval (js) 3392(defun js-eval (js)
3393 "Evaluate the JavaScript in JS and return JSON-decoded result." 3393 "Evaluate the JavaScript in JS and return JSON-decoded result."
3394 (interactive "MJavascript to evaluate: ") 3394 (interactive "MJavaScript to evaluate: ")
3395 (with-js 3395 (with-js
3396 (let* ((content-window (js--js-content-window 3396 (let* ((content-window (js--js-content-window
3397 (js--get-js-context))) 3397 (js--get-js-context)))
@@ -3665,7 +3665,7 @@ Change with `js-set-js-context'.")
3665(defun js-set-js-context (context) 3665(defun js-set-js-context (context)
3666 "Set the JavaScript context to CONTEXT. 3666 "Set the JavaScript context to CONTEXT.
3667When called interactively, prompt for CONTEXT." 3667When called interactively, prompt for CONTEXT."
3668 (interactive (list (js--read-tab "Javascript Context: "))) 3668 (interactive (list (js--read-tab "JavaScript Context: ")))
3669 (setq js--js-context context)) 3669 (setq js--js-context context))
3670 3670
3671(defun js--get-js-context () 3671(defun js--get-js-context ()
@@ -3679,7 +3679,7 @@ If one hasn't been set, or if it's stale, prompt for a new one."
3679 (`browser (not (js? (js< (cdr js--js-context) 3679 (`browser (not (js? (js< (cdr js--js-context)
3680 "contentDocument")))) 3680 "contentDocument"))))
3681 (x (error "Unmatched case in js--get-js-context: %S" x)))) 3681 (x (error "Unmatched case in js--get-js-context: %S" x))))
3682 (setq js--js-context (js--read-tab "Javascript Context: "))) 3682 (setq js--js-context (js--read-tab "JavaScript Context: ")))
3683 js--js-context)) 3683 js--js-context))
3684 3684
3685(defun js--js-content-window (context) 3685(defun js--js-content-window (context)