diff options
Diffstat (limited to 'init.el')
-rw-r--r-- | init.el | 31 |
1 files changed, 20 insertions, 11 deletions
@@ -46,17 +46,20 @@ After loading, execute DEF. Finally if REDEFINE-P is non-nil, then FUNCTION-NAME will be defined as DEF after loading." - `(defun ,function-name () - ,doc - (interactive) - (load-config ,file-path) - ,@def - ,(cond - (redefine-p - `(defun ,function-name () - ,doc - (interactive) - ,@def))))) + (cond + ((fboundp function-name)) + (t + `(defun ,function-name () + ,doc + (interactive) + (load-config ,file-path) + ,@def + ,(cond + (redefine-p + `(defun ,function-name () + ,doc + (interactive) + ,@def))))))) (load-config "common.el") @@ -143,6 +146,12 @@ then FUNCTION-NAME will be defined as DEF after loading." (defalias 'magit 'magit-status) (magit)) +(define-key global-map (vector 3 103) 'magit) + +;;; Viewing things + +(load-config "view-conf.el") + ;;; flymake (prepare-in-hook-once prepare-flymake prog-mode-hook "flymake-conf.el") |