Permalink
Browse files

Merge branch 'master' of github.com:Joonhwan/dotEmacs

  • Loading branch information...
2 parents 65b4c17 + 002e94b commit 3b32f4ffdfe6f33e3f33fd60918847b16c35543f @joonhwan committed Apr 17, 2012
Showing with 16 additions and 5 deletions.
  1. +4 −0 my-editing.el
  2. +2 −1 my-el-get.el
  3. +1 −1 my-helm.el
  4. +7 −2 my-init.el
  5. +2 −1 my-programming.el
View
@@ -455,6 +455,10 @@ home directory is a root directory) and removes automounter prefixes
(global-set-key (kbd "C-M-SPC") 'er/expand-region)
)
+(when (my-try-require 'undo-tree)
+ (global-undo-tree-mode 1)
+ )
+
;; activate disabled features
(put 'narrow-to-region 'disabled nil)
(put 'downcase-region 'disabled nil)
View
@@ -101,7 +101,7 @@
;; eproject
;; evil
expand-region
- flymake-fringe-icons
+ ;; flymake-fringe-icons
full-ack
goto-last-change
graphviz-dot-mode
@@ -127,6 +127,7 @@
ropemacs
scss-mode
smex
+ ;; undo-tree
workgroups
yasnippet
)
View
@@ -85,11 +85,11 @@
)
(progn
- (global-set-key (kbd "C-c a") helm-command-map)
(define-key helm-command-map (kbd "<RET>") 'helm-mini)
;; (define-key helm-command-map (kbd "C-l") 'helm-filelist)
(define-key helm-command-map (kbd "h v") 'my-helm-for-help-variable)
(define-key helm-command-map (kbd "h f") 'my-helm-for-help-function)
+ (global-set-key (kbd "C-c a") helm-command-map)
)
(provide 'my-helm)
View
@@ -39,8 +39,13 @@
(progn
(set-language-environment "Korean")
(setq default-input-method "korean-hangul390")
- (unless macp
- (setq process-coding-system-alist '(("locate" . "euc-kr-dos"))))
+ (cond
+ (macp
+ (setq process-coding-system "utf-8-mac")
+ )
+ (t
+ (setq process-coding-system-alist '(("locate" . "euc-kr-dos"))))
+ )
;; use 3 beolsik
;; (setq default-korean-keyboard "3f") ;;--> 3beolsik final.
(setq default-korean-keyboard "390")) ;;--> 3beolsik 390
View
@@ -182,7 +182,7 @@
(list "pycheckers" (list local-file))))
(add-to-list 'flymake-allowed-file-name-masks
'("\\.py\\'" flymake-pyflakes-init)))
- (load-library "flymake-fringe-icons")
+ ;; (load-library "flymake-fringe-icons")
(global-set-key (kbd "C-c C-p") 'flymake-goto-prev-error)
(global-set-key (kbd "C-c C-n") 'flymake-goto-next-error)
(defun my-electric-pair ()
@@ -214,6 +214,7 @@
python-remove-cwd-from-path nil
)
(flymake-mode 1)
+ (eldoc-mode 1)
)
(add-hook 'python-mode-hook 'my-python-mode-hook)
)

0 comments on commit 3b32f4f

Please sign in to comment.