Update.

[elisp.git] / emacs.el

diff --git a/emacs.el b/emacs.el
index 0106abb..f95d7b7 100644 (file)
--- a/emacs.el
+++ b/emacs.el
@@ -1194,12 +1194,23 @@ goback argument, go back where we were."
 ;; (define-key python-mode-map [(shift right)] 'indent-rigidly-right-to-tab-stop)
 ;; (define-key python-mode-map [(shift left)] 'indent-rigidly-left-to-tab-stop)
 
+(load "vc-git")
+
+(defun ff/git-push () (interactive)
+       (shell-command "git pull && git push" nil)
+       )
+
+(defun ff/git-pull () (interactive)
+       (shell-command "git pull" nil)
+       )
+
+(define-key global-map [(control x) (v) (p)] 'ff/git-push)
+(define-key global-map [(control x) (v) (P)] 'ff/git-pull)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; The big stuff (bbdb, mailcrypt, etc.)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(load "vc-git")
-
 (setq bbdb-file "~/private/bbdb")
 
 (when (file-exists-p bbdb-file)