X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=126f90c684b38489dff3307bdd0d5be63b4309bb;hb=98f94ddef05fa07db4e8e118def29c324f8d2dec;hp=48ab5f7c6bea2e83c491209aceaf945c2b04dc48;hpb=da60fca2ddc7f876f244d95c2eb49f35338e04a9;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 48ab5f7..126f90c 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -133,17 +133,6 @@ Check out [[http://tapoueh.org/emacs/el-get.html][el-get]].
     :ensure t)
 #+END_SRC
 
-* Mac Specific
-#+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  ;; (defconst *is-a-mac* (eq system-type 'darwin))
-  ;; (setq mouse-wheel-scroll-amount '(1
-  ;;                                   ((shift) . 5)
-  ;;                                   ((control))))
-
-
-  ;; (setq-default indicate-empty-lines t)
-#+END_SRC
-
 * Color and Fonts Settings
 ** highlight current line
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
@@ -267,6 +256,8 @@ Loading theme should be after all required loaded, refere [[https://github.com/j
 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (setq vc-follow-symlinks t)
+  (use-package molokai-theme
+    :ensure t)
 
   (use-package color-theme
     :ensure t
@@ -737,7 +728,11 @@ Always indents header, and hide header leading starts so that no need type =#+ST
     (setq org-hide-emphasis-markers t)
     (setq org-html-validation-link nil)
     ;; open link when return clicked
-    (setq org-return-follows-link t))
+    (setq org-return-follows-link t)
+    ;; open the ppt file by external open instead of emacs
+    (add-to-list 'org-file-apps '("\\.pptx" . "open %s"))
+    (add-to-list 'org-file-apps '("\\.doc" . "open %s"))
+    (setq org-image-actual-width nil))
 #+END_SRC
 
 
@@ -747,8 +742,8 @@ Always indents header, and hide header leading starts so that no need type =#+ST
     :features ob-racket)
 
   ;; Lua support
-  (use-package ob-lua
-    :ensure t)
+  ;(use-package ob-lua
+  ;  :ensure t)
 
   ;; use current window for org source buffer editting
 
@@ -771,7 +766,7 @@ Always indents header, and hide header leading starts so that no need type =#+ST
                                  (latex . t)
                                  (java . t)
                                  (ruby . t)
-                                 (lua . t)
+  ;                               (lua . t)
                                  (lisp . t)
                                  (scheme . t)
                                  (racket . t)
@@ -1148,6 +1143,8 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em
   ,#+OPTIONS: toc:nil\n"))
   (add-to-list 'org-structure-template-alist
                '("d" "#+BEGIN_SRC ditaa :file ?  :cmdline -r -s 0.8 :cache yes \n\n#+END_SRC"))
+  (add-to-list 'org-structure-template-alist
+               '("u" "#+BEGIN_SRC plantuml :file ? \n\n#+END_SRC"))
 
 #+END_SRC