 (global-set-key "\C-ct" 'google-translate-smooth-translate)
 (setq google-translate-translation-directions-alist '(("en" . "zh-CN")))
 
-<<<<<<< HEAD
+
 ;;; remove makefile tab
 (add-hook 'makefile-mode-hook
           (lambda ()
             (whitespace-cleanup-mode 0)
             (setq tab-width 8)))
 
-=======
->>>>>>> 8d915519110aa102cf3c8580b6815ae8d88ddc11
 ;;; install inf-mongodb
 (require-package 'inf-mongo)
 (require 'inf-mongo)
-
-
-;;; private org mode setting
-(defun org-insert-src-block (src-code-type)
-  "Insert a `SRC-CODE-TYPE' type source code block in org-mode."
-  (interactive
-   (let ((src-code-types
-          '("emacs-lisp" "python" "C" "sh" "java" "js" "clojure" "C++" "css"
-            "calc" "asymptote" "dot" "gnuplot" "ledger" "lilypond" "mscgen"
-            "octave" "oz" "plantuml" "R" "sass" "screen" "sql" "awk" "ditaa"
-            "haskell" "latex" "lisp" "matlab" "ocaml" "org" "perl" "ruby"
-            "scheme" "sqlite")))
-     (list (ido-completing-read "Source code type: " src-code-types))))
-  (progn
-    (newline-and-indent)
-    (insert (format "#+BEGIN_SRC %s\n" src-code-type))
-    (newline-and-indent)
-    (insert "#+END_SRC\n")
-    (previous-line 2)
-    (org-edit-src-code)))
-
-(add-hook 'org-mode-hook '(lambda ()
-                            ;; turn on flyspell-mode by default
-                            (flyspell-mode 1)
-                            ;; C-TAB for expanding
-                            (local-set-key (kbd "C-<tab>")
-                                           'yas/expand-from-trigger-key)
-                            ;; keybinding for editing source code blocks
-                            (local-set-key (kbd "C-c s e")
-                                           'org-edit-src-code)
-                            ;; keybinding for inserting code blocks
-                            (local-set-key (kbd "C-c s i")
-                                           'org-insert-src-block)
-                            ))
-
-(setq org-src-fontify-natively t)
 
 (require-package 'ob-mongo)
 (require 'ob-mongo)

(add-hook 'html-mode-hook 'emmet-mode)
(add-hook 'css-mode-hook  'emmet-mode)


;;; set theme
(dark)


;;;insert time function
(defun insert-date ()
  "Insert current date yyyy-mm-dd."
  (interactive)
  (when (region-active-p)
<<<<<<< HEAD
        (delete-region (region-beginning) (region-end) )
        )
=======
        (delete-region (region-beginning) (region-end) ))
>>>>>>> 8d915519110aa102cf3c8580b6815ae8d88ddc11
  (insert (format-time-string "%Y-%m-%d %H:%M:%S"))
  )


;; install golden-ratio
(require-package 'golden-ratio)
(require 'golden-ratio)
;;(golden-ratio-mode 1)

;; don't generate backup file
;;(setq make-backup-files nil)

;; all backups goto ~/.backups instead in the current directory
(setq backup-directory-alist (quote (("." . "~/.saves"))))
(setq backup-by-copying t)

(provide 'init-local)
