X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=d0e298e494fb83b70ede42bb300802a56c6dc228;hb=69448f079379d8883c219136ca9b8e22d93635bd;hp=1739385be6319e847face6fea40b4c241eee3c9e;hpb=21135c0a9bdb62829862139adb056c8b9bc362a2;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 1739385..d0e298e 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -47,6 +47,9 @@ Set the emacs load path
   (show-paren-mode 1)
   ;; don't backupf
   (setq make-backup-files nil)
+
+  ;;supress the redefined warning at startup
+  (setq ad-redefinition-action 'accept)
 #+END_SRC
 
 *** Custom file 
@@ -165,39 +168,29 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]].
 #+END_SRC
 
 ** Font Setting
-
 syntax highlighting
-
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
   (global-font-lock-mode 1)
-
 #+END_SRC
 
 [[https://github.com/i-tu/Hasklig][Hasklig]] and Source Code Pro, defined fonts family
-
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
   (if window-system
       (defvar sd/fixed-font-family
         (cond ((x-list-fonts "Hasklig")         "Hasklig")
-              ((x-list-fonts "Source Code Pro") "Source Code Pro:weight:light")
+              ((x-list-fonts "Source Code Pro") "Source Code Pro:weight")
               ((x-list-fonts "Anonymous Pro")   "Anonymous Pro")
               ((x-list-fonts "M+ 1mn")          "M+ 1mn"))
         "The fixed width font based on what is installed, `nil' if not defined."))
-
 #+END_SRC
 
 Setting the fonts 
-
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
   (if window-system
       (when sd/fixed-font-family
         (set-frame-font sd/fixed-font-family)
         (set-face-attribute 'default nil :font sd/fixed-font-family :height 130)
         (set-face-font 'default sd/fixed-font-family)))
-
 #+END_SRC
 
 ** Color Theme
@@ -205,7 +198,6 @@ Setting the fonts
 Loading theme should be after all required loaded, refere [[https://github.com/jwiegley/use-package][:defer]] in =use-package=
 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-
   (setq vc-follow-symlinks t)
 
   (use-package color-theme
@@ -215,7 +207,9 @@ Loading theme should be after all required loaded, refere [[https://github.com/j
               :ensure t
               :no-require t
               :config
-              (load-theme 'sanityinc-tomorrow-bright t)))
+              ;; (load-theme 'sanityinc-tomorrow-bright t)
+              (load-theme 'molokai t)
+              ))
 
   ;(eval-after-load 'color-theme
   ;  (load-theme 'sanityinc-tomorrow-bright t))
@@ -591,7 +585,7 @@ Use [[https://github.com/DarwinAwardWinner/ido-ubiquitous][ido-ubiquitous]] for
   (use-package ido-exit-target
     :ensure t
     :init
-    (mapcar '(lambda (map)
+    (mapcar #'(lambda (map)
               (define-key map (kbd "C-j") #'ido-exit-target-other-window)
               (define-key map (kbd "C-k") #'ido-exit-target-split-window-below))
             (list ido-buffer-completion-map
@@ -1246,7 +1240,7 @@ define =multi-term= mapping to disable some mapping which is used globally.
     :ensure t)
 
   (defun sd/term-mode-mapping ()
-    (mapcar (lambda (map)
+    (mapcar #'(lambda (map)
               (define-key map (kbd "C-o") nil)
               (define-key map (kbd "C-g") nil))
             (list term-mode-map
@@ -1916,11 +1910,14 @@ C/C++ ide tools
 
   ;; "C-M-j" is my global binding for avy goto line below
   ;; disable it in c mode
-  (mapcar '(lambda (map)
+  (mapcar #'(lambda (map)
              (define-key map (kbd "C-M-j") nil))
           (list c-mode-map
                 c++-mode-map
                 objc-mode-map))
+
+  ;; objective c
+  (add-to-list 'auto-mode-alist '("\\.mm\\'" . objc-mode))
 #+END_SRC
 
 *** irony
@@ -2034,7 +2031,6 @@ irony-company
   (global-semantic-idle-scheduler-mode 1)
 
   (semantic-mode 1)
-
 #+END_SRC
 
 *** google C style