Merge branch 'master' of gitlab.com:FG42/FG42 into add-go-extention

config/fg42.user.el

@@ -105,3 +105,7 @@
 ;; set it up like this:
 ;; (setq irc-auth '(("freenode" nickserv "some_user" "p455w0rd")
 ;;                  ("freenode" chanserv "some_user" "#channel" "passwd99"))
+;;
+;;
+;; If you want to change the default font uncomment the following line
+;;(setq fg42-font "Terminus")

lib/extensions/editor/init.el

@@ -58,7 +58,7 @@
   ;; Font Configuration -----------------------------------
   (ability font ()
            "Sets the default font to fg42 font"
-           (add-to-list 'default-frame-alist '(cons 'font fg42-font))
+           (add-to-list 'default-frame-alist (cons 'font fg42-font))
            (set-face-attribute 'default t :font fg42-font))
   ;; ------------------------------------------------------
 

lib/fg42/utils.el

@@ -7,6 +7,10 @@
 (require 'fg42/vars)
 (require 'fg42/utils/json)
 
+;; Vars -----------------------------------------------------------------------
+(defvar fg42-font "Fira Mono"
+  "The default font to be used with FG42.")
+
 ;;; Buffer helpers ------------------------------------------------------------
 (defun buffer-mode (buffer-or-string)
   "Return the major mode associated with a the given BUFFER-OR-STRING."
@@ -65,12 +69,5 @@ 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-font "Fira Mono")
-
-(defun fg42-font (font)
-  (setq fg42-font font))
-
-
 (provide 'fg42/utils)
 ;;; utils.el ends here