diff --git a/site-start.d/init_dired.el b/site-start.d/init_dired.el index c9cefb5..f980c5e 100644 --- a/site-start.d/init_dired.el +++ b/site-start.d/init_dired.el @@ -30,9 +30,6 @@ (setq ls-lisp-dirs-first t) -;; use single dired buffer -(require 'dired-single) - ;; TODO : when refersh(press 'g' in dired, ;; it require flymake-mode, pretty wired. (require 'flymake) @@ -67,13 +64,26 @@ Works in Microsoft Windows, Mac OS X, Linux." (defun my-dired-init () "Bunch of stuff to run for dired, either immediately or when it's loaded." + (require 'dired-single) ;; - (define-key dired-mode-map [return] 'dired-single-buffer) - (define-key dired-mode-map [mouse-1] 'dired-single-buffer-mouse) - (define-key dired-mode-map "^" + ;; original single-buffer + (when (fboundp 'dired-single-buffer) + (define-key dired-mode-map [return] 'dired-single-buffer) + (define-key dired-mode-map "^" + (function + (lambda nil (interactive) (dired-single-buffer ".."))))) + (when (fboundp 'dired-single-buffer-mouse) + (define-key dired-mode-map [mouse-1] 'dired-single-buffer-mouse)) + + ;; joc single-buffer + (when (fboundp 'joc-dired-single-buffer) + (define-key dired-mode-map [return] 'joc-dired-single-buffer) + (define-key dired-mode-map "^" (function - (lambda nil (interactive) (dired-single-buffer "..")))) - + (lambda nil (interactive) (joc-dired-single-buffer ".."))))) + (when (fboundp 'joc-dired-single-buffer-mouse) + (define-key dired-mode-map [mouse-1] 'joc-dired-single-buffer-mouse)) + ;; allow dired to be able to delete or copy a whole dir. ;; “always” means no asking. “top” means ask once. Any other symbol means ask each and every time for a dir and subdir. (setq dired-recursive-copies (quote always)) diff --git a/site-start.d/init_ocaml.el b/site-start.d/init_ocaml.el index 2017762..a05b031 100644 --- a/site-start.d/init_ocaml.el +++ b/site-start.d/init_ocaml.el @@ -24,6 +24,11 @@ ;;; Code: +;; flymake-tuareg +(require 'flymake-tuareg) +(add-hook 'tuareg-mode-hook 'flymake-tuareg-load) + +;; utop-mode (when (executable-find "utop") (add-to-list 'load-path (my-dotfile-vendor "utop")) diff --git a/site-start.d/init_packages.el b/site-start.d/init_packages.el index fc53206..54948fb 100644 --- a/site-start.d/init_packages.el +++ b/site-start.d/init_packages.el @@ -62,8 +62,11 @@ marmalade oddmuse scala-mode + + ;;;;;;;;;;;;;;;;;;;; + ;; Web Dev js2-mode - + ;;;;;;;;;;;;;;;;;;;; ;; latex auctex @@ -89,6 +92,12 @@ ;;;;;;;;;;;;;;;;;;;; ;; Auto-complete auto-complete + + ;;;;;;;;;;;;;;;;;;;; + ;; Flymake + flymake + flymake-jslint + flymake-tuareg ;;;;;;;;;;;;;;;;;;;; ;; Text Editing diff --git a/site-start.d/init_web.el b/site-start.d/init_web.el index 09fbb08..59c8890 100644 --- a/site-start.d/init_web.el +++ b/site-start.d/init_web.el @@ -39,5 +39,8 @@ (autoload 'js2-mode "js2-mode" nil t) (add-to-list 'auto-mode-alist '("\\.js$" . js2-mode)) +;; flymake-jslint +(add-hook 'js-mode-hook 'flymake-jslint-load) + (provide 'init_web) ;;; init_html.el ends here