From 9c6c3aab5b6bb38b059f12d791ad466379782e11 Mon Sep 17 00:00:00 2001 From: amirrezaask Date: Sun, 23 Feb 2020 19:09:27 +0330 Subject: [PATCH 1/3] add fg42-font function and get-fg42-font function to get fg42 font if set by user or the default one --- lib/extensions/editor/init.el | 4 ++-- lib/extensions/editor/utils.el | 1 - lib/fg42/utils.el | 9 +++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/extensions/editor/init.el b/lib/extensions/editor/init.el index c7ed6d2..3230ad9 100644 --- a/lib/extensions/editor/init.el +++ b/lib/extensions/editor/init.el @@ -58,8 +58,8 @@ ;; Font Configuration ----------------------------------- (ability fira-font () "Sets the default font to Fira Mono" - (add-to-list 'default-frame-alist '(font . "Fira Mono")) - (set-face-attribute 'default t :font "Fira Mono")) + (add-to-list 'default-frame-alist '(font . (get-fg42-font))) + (set-face-attribute 'default t :font (get-fg42-font))) ;; ------------------------------------------------------ (cheatsheet-add :group '--HELP-- diff --git a/lib/extensions/editor/utils.el b/lib/extensions/editor/utils.el index 05bf886..bb72f13 100644 --- a/lib/extensions/editor/utils.el +++ b/lib/extensions/editor/utils.el @@ -42,5 +42,4 @@ it inserts comment at the end of the line." (interactive) (join-line -1)))) - (provide 'extensions/editor/utils) diff --git a/lib/fg42/utils.el b/lib/fg42/utils.el index 297dd93..4c6137c 100644 --- a/lib/fg42/utils.el +++ b/lib/fg42/utils.el @@ -65,6 +65,15 @@ with is the buffer." "Apply the given FACE-SYMBOL to the given TEXT." (put-text-property 0 (length text) 'face face-symbol text)) +(setq fg42--default-font "Fira Mono") + +(defvar fg42-font "" "FG42 font set by user") + +(defun fg42-font (font) + (setq fg42-font font)) + +(defun get-fg42-font () + (if fg42-font fg42-font fg42--default-font)) (provide 'fg42/utils) ;;; utils.el ends here From 5ff4bfaf33a5faef915c2627738b25643f5ebcda Mon Sep 17 00:00:00 2001 From: amirrezaask Date: Sun, 23 Feb 2020 19:11:53 +0330 Subject: [PATCH 2/3] remove go extension from this branch --- lib/extensions/go.el | 24 ------------------------ lib/extensions/go/init.el | 23 ----------------------- 2 files changed, 47 deletions(-) delete mode 100644 lib/extensions/go.el delete mode 100644 lib/extensions/go/init.el diff --git a/lib/extensions/go.el b/lib/extensions/go.el deleted file mode 100644 index 77f0842..0000000 --- a/lib/extensions/go.el +++ /dev/null @@ -1,24 +0,0 @@ -;;; GoExtention --- Enable Golang support in FG42 -;;; Commentary: -;;; Code: -(require 'fpkg) -(require 'fg42/extension) -(require 'extensions/go-initialize) - -;; dependencies - -(depends-on 'go-mode) -(depends-on 'go-add-tags) -(depends-on 'go-stacktracer) -(depends-on 'go-eldoc) -(depends-on 'gotest) - - - -(extension go - :version 0.0.1 - :on-initialize extensions/go-initialize - :docs "lib/extensions/go/readme.org") - - -;;; go.el ends here diff --git a/lib/extensions/go/init.el b/lib/extensions/go/init.el deleted file mode 100644 index bb64b94..0000000 --- a/lib/extensions/go/init.el +++ /dev/null @@ -1,23 +0,0 @@ -;;; go-init --- The entry point for golang extension -;;; Commentary: -;;; Code: - -(defun fg42-go-hook () - """Setup emacs hooks and turn necessary modes on.""" - (lsp) - (flymake-mode-on) - (yas-minor-mode-on) - (add-hook 'before-save-hook #'lsp-format-buffer t t) - (add-hook 'before-save-hook #'lsp-organize-imports t t) - (add-hook 'go-mode-hook 'go-eldoc-setup) - (local-set-key (kbd "M-.") #'godef-jump) - (local-set-key (kbd "M-*") 'pop-tag-mark)) - - -(defun extensions/go-initialize () - """Initialize Golang extension.""" - (add-hook 'go-mode-hook 'fg42-go-hook)) - -(provide 'extensions/go/init) - -;;; init ends here. From 02467ed8db0a5e133e6f38d28c40cc06a08af7d2 Mon Sep 17 00:00:00 2001 From: amirrezaask Date: Sun, 23 Feb 2020 19:49:12 +0330 Subject: [PATCH 3/3] simpler code --- lib/extensions/editor/init.el | 8 ++++---- lib/fg42/utils.el | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/extensions/editor/init.el b/lib/extensions/editor/init.el index 3230ad9..69134e7 100644 --- a/lib/extensions/editor/init.el +++ b/lib/extensions/editor/init.el @@ -56,10 +56,10 @@ (setq delete-old-versions t) ;; Font Configuration ----------------------------------- - (ability fira-font () - "Sets the default font to Fira Mono" - (add-to-list 'default-frame-alist '(font . (get-fg42-font))) - (set-face-attribute 'default t :font (get-fg42-font))) + (ability font () + "Sets the default font to fg42 font" + (add-to-list 'default-frame-alist '(cons 'font fg42-font)) + (set-face-attribute 'default t :font fg42-font)) ;; ------------------------------------------------------ (cheatsheet-add :group '--HELP-- diff --git a/lib/fg42/utils.el b/lib/fg42/utils.el index 4c6137c..c344635 100644 --- a/lib/fg42/utils.el +++ b/lib/fg42/utils.el @@ -65,15 +65,12 @@ with is the buffer." "Apply the given FACE-SYMBOL to the given TEXT." (put-text-property 0 (length text) 'face face-symbol text)) -(setq fg42--default-font "Fira Mono") -(defvar fg42-font "" "FG42 font set by user") +(setq fg42-font "Fira Mono") (defun fg42-font (font) (setq fg42-font font)) -(defun get-fg42-font () - (if fg42-font fg42-font fg42--default-font)) (provide 'fg42/utils) ;;; utils.el ends here