From 96d038c44a1ef26892adf4b775d1e2efe9e7b44b Mon Sep 17 00:00:00 2001 From: JSDurand Date: Sat, 16 Jan 2021 14:04:07 +0800 Subject: The first stable version Fixes: Avoid adding suffix-link repeatedly * embark-conf.el ("embark"): Use view-mode instead of view-file * init.el (load-after-function): Modify the macro so that it no longer redefines built-in functions. (global-map): ("view-conf.el"): Rename view-functions.el to view-conf.el * suffix tree/generalized-suffix-tree.el (gst-edge-length): (gst-add-suffix-link): (gst-canonize): (gst-extend-tree): (gst-build-for-strs): Fixed the bug. * suffix tree/gst debugging platform.txt (strs): Add a new debugging file * suffix tree/gst test ground (2).txt (strs): Do more debugging * tab-conf.el (durand-switch-tab-dwim): Add my own dwim tab function. (global-map): Bind it to the global map. * theme.el Update the modus-themes. * view-conf.el Rename view-functions.el to view-conf.el. --- init.el | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'init.el') diff --git a/init.el b/init.el index 0ce3c09..f0cbc5b 100644 --- a/init.el +++ b/init.el @@ -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") -- cgit v1.2.3-18-g5258