Commit 3cea277b authored by Haochen Xie's avatar Haochen Xie

Merge remote-tracking branch 'refs/remotes/gitlab/master'

parents a34406e8 abdd04a3
......@@ -39,7 +39,9 @@ function git-send-draft {
fi
REF=$(git symbolic-ref HEAD | sed -e 's,refs/,,')
git push "$2" "$(git-draft):refs/drafts/$1/$REF"
COMMIT=$(git-draft)
git push -f "$2" "$COMMIT:refs/drafts/$1/$REF"
git lfs push "$2" "$COMMIT"
}
function git-list-drafts {
......
......@@ -13,6 +13,7 @@
(setq ring-bell-function 'ignore)
(require 'tool-bar)
(tool-bar-mode 0)
(setq-default indent-tabs-mode nil)
;; Additional Repositories
(require 'package)
......@@ -33,6 +34,7 @@
;; Install required packages
(let ((package-list
'(ido-vertical-mode
rainbow-delimiters
exec-path-from-shell
ansi-color
flycheck
......@@ -189,7 +191,9 @@
(eval orgtbl-mode t)
(TeX-parse-self . t)
(whitespace-line-column . t)
(lexical-binding . t)))))
(lexical-binding . t))))
'(sml-indent-args 2)
'(sml-indent-level 2))
;; bind M-g M-s to magit-status
(require 'magit)
......@@ -278,3 +282,57 @@
(require 'opam-user-setup "~/.emacs.d/opam-user-setup.el")
;; ## end of OPAM user-setup addition for emacs / base ## keep this line
;; Clojure Configuration
(add-hook 'clojure-mode-hook 'cider-mode)
(add-hook 'cider-mode-hook 'cider-turn-on-eldoc-mode)
;; (setq nrepl-hide-special-buffers t)
(setq nrepl-buffer-name-show-port t)
;; Standard ML settings
(require 'flycheck)
(require 'sml-mode)
(add-hook 'sml-mode-hook
(lambda () (abbrev-mode 0)))
(flycheck-define-checker sml-smlsharp
"A Standard ML syntax and type checker using SML#.
See URL `http://www.pllab.riec.tohoku.ac.jp/smlsharp/'."
:command ("smlsharp" "-ftypecheck-only" source-original)
:error-patterns
((error line-start
;; (file-name) ":" line "." column "-" line "." column " Error:\n"
(file-name) ":"
(one-or-more digit) "." (one-or-more digit)
"-"
line "." column
" Error:"
(one-or-more "\n " (message)) line-end))
:modes (sml-mode))
(eval-after-load 'flycheck
'(add-to-list ' flycheck-checkers 'sml-smlsharp))
;; Lua editing
(add-hook 'lua-mode-hook
(lambda ()
(local-set-key (kbd "C-c C-e") (quote lua-send-current-line))
(local-set-key (kbd "C-c C-f") (quote lua-send-defun))
(local-set-key (kbd "C-c C-r") (quote lua-send-region))
(defun lua-send-region (start end)
(interactive "r")
(setq start (lua-maybe-skip-shebang-line start))
(let* ((lineno (line-number-at-pos start))
(lua-file (or (buffer-file-name) (buffer-name)))
(region-str (buffer-substring-no-properties start end))
(command
(format "%s" region-str)))
(lua-send-string command)
(lua-send-string "print()")
(when lua-always-show (lua-show-process-buffer))))))
;; footer?
......@@ -9,6 +9,8 @@
df = diff
ds = diff --staged
wdf = diff --word-diff
wds = diff --staged --word-diff
ci = commit
cm = commit -m
......
......@@ -9,3 +9,7 @@
# Mac OS X
.DS_Store
# IntelliJ
.idea/
*.iml
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment