Mercurial > emacs
comparison lisp/progmodes/js.el @ 109588:a9df84c12868
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 27 Jul 2010 22:51:00 +0000 |
| parents | d7a517f1b312 |
| children | f583ffa8d0d6 |
comparison
equal
deleted
inserted
replaced
| 109587:4a3ef4f17f07 | 109588:a9df84c12868 |
|---|---|
| 3266 (delete-file temp-name)))))) | 3266 (delete-file temp-name)))))) |
| 3267 | 3267 |
| 3268 ;;; Main Function | 3268 ;;; Main Function |
| 3269 | 3269 |
| 3270 ;;;###autoload | 3270 ;;;###autoload |
| 3271 (define-derived-mode js-mode nil "js" | 3271 (define-derived-mode js-mode prog-mode "js" |
| 3272 "Major mode for editing JavaScript. | 3272 "Major mode for editing JavaScript. |
| 3273 | 3273 |
| 3274 Key bindings: | 3274 Key bindings: |
| 3275 | 3275 |
| 3276 \\{js-mode-map}" | 3276 \\{js-mode-map}" |