[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110466: lisp/generic-x.el: Make java
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110466: lisp/generic-x.el: Make javascript-generic-mode an obsolete alias of js-mode. |
Date: |
Mon, 08 Oct 2012 18:20:59 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110466
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-08 18:20:59 +0200
message:
lisp/generic-x.el: Make javascript-generic-mode an obsolete alias of js-mode.
modified:
etc/NEWS
lisp/ChangeLog
lisp/generic-x.el
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2012-10-08 09:23:31 +0000
+++ b/etc/NEWS 2012-10-08 16:20:59 +0000
@@ -431,6 +431,9 @@
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'.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-10-08 13:59:18 +0000
+++ b/lisp/ChangeLog 2012-10-08 16:20:59 +0000
@@ -1,3 +1,8 @@
+2012-10-08 Juanma Barranquero <address@hidden>
+
+ * 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 <address@hidden>
* ffap.el (ffap-replace-file-component): Support Tramp file name
=== modified file 'lisp/generic-x.el'
--- a/lisp/generic-x.el 2012-09-24 11:39:33 +0000
+++ b/lisp/generic-x.el 2012-10-08 16:20:59 +0000
@@ -646,83 +646,10 @@
"Generic mode for Sys V pkginfo files."))
;; Javascript mode
-;; Includes extra keywords from Armando Singer address@hidden
+;; 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110466: lisp/generic-x.el: Make javascript-generic-mode an obsolete alias of js-mode.,
Juanma Barranquero <=