1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

lisp/generic-x.el: Make javascript-generic-mode an obsolete alias of js-mode.

This commit is contained in:
Juanma Barranquero 2012-10-08 18:20:59 +02:00
parent 6b49792308
commit 1337353856
3 changed files with 11 additions and 76 deletions

View file

@ -646,83 +646,10 @@ like an INI file. You can add this hook to `find-file-hook'."
"Generic mode for Sys V pkginfo files."))
;; Javascript mode
;; Includes extra keywords from Armando Singer [asinger@MAIL.COLGATE.EDU]
;; Obsolete; defer to js-mode from js.el.
(when (memq 'javascript-generic-mode generic-extras-enable-list)
(define-generic-mode javascript-generic-mode
'("//" ("/*" . "*/"))
'("break"
"case"
"continue"
"default"
"delete"
"do"
"else"
"export"
"for"
"function"
"if"
"import"
"in"
"new"
"return"
"switch"
"this"
"typeof"
"var"
"void"
"while"
"with"
;; words reserved for ECMA extensions below
"catch"
"class"
"const"
"debugger"
"enum"
"extends"
"finally"
"super"
"throw"
"try"
;; Java Keywords reserved by JavaScript
"abstract"
"boolean"
"byte"
"char"
"double"
"false"
"final"
"float"
"goto"
"implements"
"instanceof"
"int"
"interface"
"long"
"native"
"null"
"package"
"private"
"protected"
"public"
"short"
"static"
"synchronized"
"throws"
"transient"
"true")
'(("^\\s-*function\\s-+\\([A-Za-z0-9_]+\\)"
(1 font-lock-function-name-face))
("^\\s-*var\\s-+\\([A-Za-z0-9_]+\\)"
(1 font-lock-variable-name-face)))
'("\\.js\\'")
(list
(function
(lambda ()
(setq imenu-generic-expression
'((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)
("*Variables*" "^var\\s-+\\([A-Za-z0-9_]+\\)" 1))))))
"Generic mode for JavaScript files."))
(define-obsolete-function-alias 'javascript-generic-mode 'js-mode "24.3")
(define-obsolete-variable-alias 'javascript-generic-mode-hook 'js-mode-hook "24.3"))
;; VRML files
(when (memq 'vrml-generic-mode generic-extras-enable-list)