elpa-to-submit/espresso.el @@ -2,79 +2,24 @@ ;; ;; Part of the Emacs Starter Kit -(eval-after-load 'js2-mode - '(progn - - ;; Cosmetics - ;; (font-lock-add-keywords - ;; 'js2-mode `(("\\(function *\\)(" - ;; (0 (progn (compose-region (match-beginning 1) (match-end 1) - ;; "ƒ") - ;; nil))))) - - (font-lock-add-keywords - 'js2-mode - '(("\\<\\(FIX\\|TODO\\|FIXME\\|HACK\\|REFACTOR\\):" - 1 font-lock-warning-face t))) - - (defun js-lambda () (interactive) (insert "function () {\n}") - (backward-char 5)) - - (add-hook 'js2-mode-hook 'local-column-number-mode) - (add-hook 'js2-mode-hook 'local-comment-auto-fill) - (add-hook 'js2-mode-hook 'turn-on-hl-line-mode) - - (define-key js2-mode-map (kbd "C-c l") 'js-lambda) - (define-key js2-mode-map "\C-\M-h" 'backward-kill-word) - - ;; Fix js2's crazy indentation - (define-key js2-mode-map (kbd "TAB") (lambda () (interactive) - (indent-for-tab-command) - (back-to-indentation))) - - (setq js2-bounce-indent-flag nil - js2-indent-on-enter-key nil) - - (defun js-continued-var-decl-list-p () - "Return non-nil if point is inside a continued variable declaration list." - (interactive) - (let ((start (save-excursion (js-re-search-backward "\\<var\\>" nil t)))) - (and start - (save-excursion (re-search-backward "\n" start t)) - (not (save-excursion - (js-re-search-backward - ";\\|[^, \t][ \t]*\\(/[/*]\\|$\\)" start t)))))) - - (defun js-proper-indentation (parse-status) - "Return the proper indentation for the current line." - (save-excursion - (back-to-indentation) - (let ((ctrl-stmt-indent (js-ctrl-statement-indentation)) - (same-indent-p (looking-at "[]})]\\|\\<case\\>\\|\\<default\\>")) - (continued-expr-p (js-continued-expression-p))) - (cond (ctrl-stmt-indent) - ((js-continued-var-decl-list-p) - (js-re-search-backward "\\<var\\>" nil t) - (+ (current-indentation) js2-basic-offset)) - ((nth 1 parse-status) - (goto-char (nth 1 parse-status)) - (if (looking-at "[({[][ \t]*\\(/[/*]\\|$\\)") - (progn - (skip-syntax-backward " ") - (when (= (char-before) ?\)) (backward-list)) - (back-to-indentation) - (cond (same-indent-p - (current-column)) - (continued-expr-p - (+ (current-column) (* 2 js2-basic-offset))) - (t - (+ (current-column) js2-basic-offset)))) - (unless same-indent-p - (forward-char) - (skip-chars-forward " \t")) - (current-column))) - (continued-expr-p js2-basic-offset) - (t 0))))))) +(font-lock-add-keywords + 'espresso-mode `(("\\(function *\\)(" + (0 (progn (compose-region (match-beginning 1) (match-end 1) + "ƒ") + nil))))) + +(font-lock-add-keywords 'espresso-mode + '(("\\<\\(FIX\\|TODO\\|FIXME\\|HACK\\|REFACTOR\\):" + 1 font-lock-warning-face t))) + +(autoload 'espresso-mode "espresso" "Start espresso-mode" t) +(add-to-list 'auto-mode-alist '("\\.js$" . espresso-mode)) +(add-to-list 'auto-mode-alist '("\\.json$" . espresso-mode)) +(add-hook 'espresso-mode-hook 'moz-minor-mode) +(add-hook 'espresso-mode-hook 'turn-on-paredit) +(add-hook 'espresso-mode-hook 'run-coding-hook) +(add-hook 'espresso-mode-hook 'idle-highlight) +(setq espresso-indent-level 2) (defun esk-pp-json () "Pretty-print the json object following point." starter-kit-js.el 2138ec178290eaddbd8bb87c2c582b8a7c67a8d0 Phil Hagelberg technomancy@gmail.com http://github.com/technomancy/emacs-starter-kit/commit/a43b4a669822f7649ec830a25ae3a256b086655a a43b4a669822f7649ec830a25ae3a256b086655a 2009-06-16T11:06:24-07:00 2009-06-16T11:06:24-07:00 Switch from js2-mode to espresso. a7b1fc9a469780184487556856cfd480887bc656 Phil Hagelberg technomancy@gmail.com