Commit 13373538 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

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

parent 6b497923
......@@ -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'.
2012-10-08 Juanma Barranquero <>
* 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 <>
* ffap.el (ffap-replace-file-component): Support Tramp file name
......@@ -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
'("//" ("/*" . "*/"))
;; words reserved for ECMA extensions below
;; Java Keywords reserved by JavaScript
(1 font-lock-function-name-face))
(1 font-lock-variable-name-face)))
(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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment