From 5abe5befb97eac279209e40f6f5177bd690f7956 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 9 Dec 2014 18:10:14 +0900 Subject: [PATCH] Add function my-git-apply-index-from-buffer --- emacs.el | 66 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/emacs.el b/emacs.el index 49ea6e7..fb0df93 100644 --- a/emacs.el +++ b/emacs.el @@ -2214,6 +2214,48 @@ ARG is ignored." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; x open +(defvar my-filer nil) +(setq my-filer (or (executable-find "pcmanfm") + (executable-find "nautilus"))) +(defun my-x-open (file) + "open FILE." + (interactive "FOpen File: ") + (setq file (expand-file-name file)) + (message "Opening %s..." file) + (cond ((eq system-type 'windows-nt) + (call-process "cmd.exe" nil 0 nil + "/c" "start" "" (convert-standard-filename file))) + ((eq system-type 'darwin) + (call-process "open" nil 0 nil file)) + ((getenv "DISPLAY") + (call-process (or my-filer "xdg-open") nil 0 nil file)) + (t + (find-file file)) + ) + ;; (recentf-add-file file) + (message "Opening %s...done" file)) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; misc funcs + +(defun my-git-apply-index-from-buffer (&optional buf) + "Git apply buffer. BUF is buffer to apply. nil to use current buffer." + (interactive) + (let ((buf (or buf + (current-buffer))) + (file (make-temp-file "git-apply-diff.emacs"))) + (with-current-buffer buf + (write-region (point-min) + (point-max) + file) + (call-process "git" + nil + nil + nil + "apply" + "--cached" + file)))) + (defvar term-shell-command-history nil "History for term-shell-command.") (defun my-term-shell-command (command &optional buffer-or-name) @@ -2267,30 +2309,6 @@ COMMAND." ;; (goto-char (point-max)) )))) -(defvar my-filer nil) -(setq my-filer (or (executable-find "pcmanfm") - (executable-find "nautilus"))) -(defun my-x-open (file) - "open FILE." - (interactive "FOpen File: ") - (setq file (expand-file-name file)) - (message "Opening %s..." file) - (cond ((eq system-type 'windows-nt) - (call-process "cmd.exe" nil 0 nil - "/c" "start" "" (convert-standard-filename file))) - ((eq system-type 'darwin) - (call-process "open" nil 0 nil file)) - ((getenv "DISPLAY") - (call-process (or my-filer "xdg-open") nil 0 nil file)) - (t - (find-file file)) - ) - ;; (recentf-add-file file) - (message "Opening %s...done" file)) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; misc funcs - (defun memo (&optional dir) "Open memo.txt in DIR." (interactive)