Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
13373538
Commit
13373538
authored
Oct 08, 2012
by
Juanma Barranquero
Browse files
lisp/generic-x.el: Make javascript-generic-mode an obsolete alias of js-mode.
parent
6b497923
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
76 deletions
+11
-76
etc/NEWS
etc/NEWS
+3
-0
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/generic-x.el
lisp/generic-x.el
+3
-76
No files found.
etc/NEWS
View file @
13373538
...
...
@@ -431,6 +431,9 @@ The option `follow-intercept-processes' has been removed.
specifying URL types which should be converted to remote file names at
the FFAP prompt. The default is now '("ftp").
** Generic-x
`javascript-generic-mode'
is now an obsolete alias for `js-mode'.
** Ibuffer
*** New `derived-mode' filter, bound to `/ M'.
...
...
lisp/ChangeLog
View file @
13373538
2012-10-08 Juanma Barranquero <lekktu@gmail.com>
* generic-x.el (javascript-generic-mode, javascript-generic-mode-hook):
Make obsolete aliases of js-mode and js-mode-hook (from js.el).
2012-10-08 Michael Albinus <michael.albinus@gmx.de>
* ffap.el (ffap-replace-file-component): Support Tramp file name
...
...
lisp/generic-x.el
View file @
13373538
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment