From b9d0e251bfaeaa440d277f56b15a516e99a97adf Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 8 Oct 2012 18:20:59 +0200
Subject: [PATCH] lisp/generic-x.el: Make javascript-generic-mode an obsolete
 alias of js-mode.

---
 etc/NEWS          |  3 +++
 lisp/ChangeLog    |  5 ++++
 lisp/generic-x.el | 79 +++----------------------------------------------------
 3 files changed, 11 insertions(+), 76 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 8364b6dd557..2b934741c2c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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'.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1ee9a27ef3..70c951d3197 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index ce1599b9010..878021ec5c5 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -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)
-- 
2.11.4.GIT