Permalink
Browse files

Added haml-mode, clojurescript-mode.

  • Loading branch information...
1 parent 19bb471 commit 5feb8a1250b143adb985b986fb58f9cf002db923 @zk committed Jun 9, 2012
@@ -6,20 +6,32 @@
[(1 0)
nil "Edit all lines matching a given regexp" single])
(ampc .
- [(0 1 1)
+ [(0 1 2)
nil "Asynchronous Music Player Controller" single])
(auctex .
[(11 86)
nil "Integrated environment for *TeX*" tar])
(company .
[(0 5)
nil "Flexible inline text and code completion" tar])
+ (csv-mode .
+ [(1 0)
+ nil "Major mode for editing comma/char separated values" single])
(debbugs .
[(0 3)
nil "SOAP library to access debbugs servers" tar])
+ (dict-tree .
+ [(0 12 7)
+ ((trie
+ (0 2 5))
+ (tNFA
+ (0 1 1))
+ (heap
+ (0 3)))
+ "Dictionary data structure package" single])
(djvu .
[(0 5)
- nil "edit and view Djvu files via djvused" single])
+ nil "Edit and view Djvu files via djvused" single])
(ediprolog .
[(1 0)
nil "Emacs Does Interactive Prolog" single])
@@ -32,6 +44,12 @@
(f90-interface-browser .
[(1 0)
nil "Parse and browse f90 interfaces" single])
+ (heap .
+ [(0 3)
+ nil "Heap (a.k.a. priority queue) data structure" single])
+ (ioccur .
+ [(2 4)
+ nil "Incremental occur" single])
(jgraph-mode .
[(0 0)
nil "Major mode for Jgraph files" single])
@@ -56,15 +74,21 @@
(muse .
[(3 20)
nil "Authoring and publishing tool" tar])
+ (nhexl-mode .
+ [(0 1)
+ nil "Minor mode to edit files via hex-dump format" single])
(oauth2 .
- [(0 2)
+ [(0 4)
nil "OAuth 2.0 Authorization Protocol" single])
(org .
- [(20120216)
+ [(20120523)
nil "Outline-based notes management and organizer" tar])
(quarter-plane .
[(0 1)
- nil "editing using quarter-plane screen model" single])
+ nil "Minor mode for quarter-plane style editing" single])
+ (queue .
+ [(0 1)
+ nil "Queue data structure" single])
(rainbow-mode .
[(0 2)
nil "Colorize color names in buffers" single])
@@ -80,8 +104,22 @@
(svg-clock .
[(0 4)
nil "Analog clock using Scalable Vector Graphics" single])
+ (tNFA .
+ [(0 1 1)
+ ((queue
+ (0 1)))
+ "Tagged non-deterministic finite-state automata" single])
+ (trie .
+ [(0 2 5)
+ ((emacs
+ (24 1))
+ (tNFA
+ (0 1 1))
+ (heap
+ (0 3)))
+ "Trie data structure" single])
(undo-tree .
- [(0 3 3)
+ [(0 4)
nil "Treat undo history as a tree" single])
(uni-confusables .
[(0 1)
View
@@ -15,14 +15,17 @@
(require 'linum)
(require 'paredit)
(require 'clojure-mode)
+(require 'clojurescript-mode)
(require 'yasnippet)
(require 'ruby-mode)
-(eval-after-load "ruby-mode" '(require 'ruby-mode-indent-fix))
+;; (require 'ruby-mode-indent-fix)
(require 'eproject)
(require 'eproject-extras)
;;(require 'scala-mode)
(require 'smooth-scrolling)
;; (require 'centered-cursor-mode)
+(require 'haml-mode)
+(require 'js2-mode)
(require 'smex)
(smex-initialize)
@@ -75,8 +78,6 @@
;;(turn-on-line-numbers-display)
-(add-to-list 'auto-mode-alist '("\\.cljs$" . clojure-mode))
-
(eval-after-load 'slime '(setq slime-protocol-version 'ignore))
(defmacro defclojureface (name color desc &optional others)
@@ -161,6 +162,8 @@
(define-key paredit-mode-map (kbd "C-w") 'paredit-backward-kill-word)
(global-set-key (kbd "M-DEL") 'kill-region)
(define-key paredit-mode-map (kbd "M-DEL") 'kill-region)
+;;(define-key html-mode-map (kbd "<RET>") 'reindent-then-newline-and-indent)
+;;(define-key js-mode-map (kbd "<RET>") 'reindent-then-newline-and-indent)
(defun what-face (pos)
@@ -169,9 +172,9 @@
(get-char-property (point) 'face))))
(if face (message "Face: %s" face) (message "No face at %d" pos))))
-;;(defun toggle-fullscreen () (interactive) (ns-toggle-fullscreen))
-;;(ns-toggle-fullscreen)
-;;(global-set-key [f11] 'toggle-fullscreen)
+(defun toggle-fullscreen () (interactive) (ns-toggle-fullscreen))
+(ns-toggle-fullscreen)
+(global-set-key [f11] 'toggle-fullscreen)
(setq visible-bell nil)
@@ -261,3 +264,6 @@
(global-set-key (kbd "<ESC> <right>") 'windmove-right)
(global-set-key (kbd "<ESC> <up>") 'windmove-up)
(global-set-key (kbd "<ESC> <down>") 'windmove-down)
+
+
+(load-file (expand-file-name "~/.emacs.d/custom.el"))
@@ -0,0 +1,17 @@
+(require 'clojure-mode)
+
+(define-derived-mode clojurescript-mode clojure-mode "ClojureScript"
+ "Major mode for ClojureScript")
+
+(add-to-list 'auto-mode-alist '("\\.cljs$" . clojurescript-mode))
+
+(setq inferior-lisp-program "/Users/zkim/zaarly/bi-admin/bin/browser-repl")
+
+(define-key clojurescript-mode-map (kbd "C-o") 'lisp-eval-defun)
+(define-key clojurescript-mode-map (kbd "C-c k") 'lisp-eval-region)
+
+(when (and (featurep 'paredit) paredit-mode (>= paredit-version 21))
+ (define-key clojurescript-mode-map "{" 'paredit-open-curly)
+ (define-key clojurescript-mode-map "}" 'paredit-close-curly))
+
+(provide 'clojurescript-mode)
Oops, something went wrong.

0 comments on commit 5feb8a1

Please sign in to comment.