Merge branch 'develop'

.gitignore

@@ -0,0 +1,15 @@
+# Gitignore file
+
+# Remove backup files
+*#
+*.
+*.elc
+*~
+.#*
+
+# Emacs packages
+elpa/
+var/
+
+# Emacs server file
+server/

README.md

@@ -0,0 +1,5 @@
+# Emacs configuration #
+
+This git repository tracks the `~/.emacs.d/` dir.
+
+Its main purpose is track changes in the `init.el` config file, and theme configuration.

emacs → init.el

@@ -40,18 +40,39 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(case-fold-search t)
+ '(current-language-environment "UTF-8")
+ '(default-input-method "rfc1345")
+ '(display-time-mode t)
+ '(global-font-lock-mode t)
+ '(inhibit-startup-screen t)
+ '(mouse-wheel-mode t)
+ '(show-paren-mode t)
+ ;; '(custom-enabled-themes (quote (philsf-windows)))
  '(custom-safe-themes
    (quote
-    ("90071cf01f58867a55a71e6cfe0ea4bacb67b782566f0534c10e612af74f573b" default)))
- '(display-time-mode t)
- '(font-use-system-font t)
- '(inhibit-startup-screen t))
+    ("75a696bc7160537d6071073f50422d1db6315ea303d33d622dbf5d8d413add0f" "587d5e8ac355074b51471b7ecdf05213a33f40515fd5027e4796ea6370a7efa8" "555065b4cca21d27b1c799633e0e3cc7c02be5b19d93c1fcd6818e3f1ed08944" default)))
+ '(ess-R-font-lock-keywords
+   (quote
+    ((ess-R-fl-keyword:modifiers . t)
+     (ess-R-fl-keyword:fun-defs . t)
+     (ess-R-fl-keyword:keywords . t)
+     (ess-R-fl-keyword:assign-ops . t)
+     (ess-R-fl-keyword:constants . t)
+     (ess-fl-keyword:fun-calls . t)
+     (ess-fl-keyword:numbers . t)
+     (ess-fl-keyword:operators . t)
+     (ess-fl-keyword:delimiters . t)
+     (ess-fl-keyword:= . t)
+     (ess-R-fl-keyword:F&T . t)
+     (ess-R-fl-keyword:%op% . t))))
+ )
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(default ((t (:family "Ubuntu Mono" :foundry "DAMA" :slant normal :weight normal :height 120 :width normal)))))
+ )
 (setq visible-bell t)
 ;(add-hook 'text-mode-hook 'turn-on-auto-fill)
 
@@ -286,7 +307,7 @@ space does not end a sentence, so don't break a line there."
 			nil t))))
 
 ;; Use markdown-mode for README.md (GitHub Flavored Markdown) (2015-09-20 - fixed 2016-01-23)
-(add-to-list 'load-path "~/.emacs.d/markdown-mode")
+;; (add-to-list 'load-path "~/.emacs.d/markdown-mode")
 (autoload 'gfm-mode "markdown-mode" "Major mode for editing Markdown files" t)
 (setq auto-mode-alist (cons '("\\.md$" . gfm-mode) auto-mode-alist))
 (setq auto-mode-alist (cons '("\\.markdown$" . gfm-mode) auto-mode-alist))
@@ -298,7 +319,7 @@ space does not end a sentence, so don't break a line there."
 (require 'package) ;; You might already have this line
 (add-to-list 'package-archives
 ;             '("melpa-stable" . "https://stable.melpa.org/packages/") t)
-             '("melpa" . "https://melpa.org/packages/"))
+             '("melpa" . "http://melpa.org/packages/"))
 (when (< emacs-major-version 24)
   ;; For important compatibility libraries like cl-lib
   (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
@@ -314,3 +335,9 @@ space does not end a sentence, so don't break a line there."
 
 ;; (when my-prefered-font
 ;;   (set-frame-font my-prefered-font nil t))
+
+;; (load-file (expand-file-name
+;;             (cond ((eq system-type 'windows-nt) "windows.el")
+;;                   ((eq system-type 'gnu/linux) "linux.el")
+;;                   (t "global.el"))
+;;             user-emacs-directory))

philsf-global-theme.el

@@ -0,0 +1,19 @@
+(deftheme philsf-global
+  "Created 2016-08-23.")
+
+(custom-theme-set-variables
+ 'philsf-global
+ '(inhibit-startup-screen t)
+ '(case-fold-search t)
+ '(current-language-environment "UTF-8")
+ '(default-input-method "rfc1345")
+ '(display-time-mode t)
+ '(global-font-lock-mode t)
+ '(mouse-wheel-mode t)
+ '(show-paren-mode t))
+
+(custom-theme-set-faces
+ 'philsf-global
+ )
+
+(provide-theme 'philsf-global)

philsf-ubuntu-theme.el

@@ -3,14 +3,7 @@
 
 (custom-theme-set-variables
  'philsf-ubuntu
- '(case-fold-search t)
- '(current-language-environment "UTF-8")
- '(default-input-method "rfc1345")
- '(inhibit-startup-screen t)
- '(display-time-mode t)
- '(global-font-lock-mode t)
- '(mouse-wheel-mode t)
- '(show-paren-mode t))
+ )
 
 (custom-theme-set-faces
  'philsf-ubuntu

philsf-windows-theme.el

@@ -0,0 +1,12 @@
+(deftheme philsf-windows
+  "Created 2016-08-23.")
+
+(custom-theme-set-variables
+ 'philsf-windows
+)
+
+(custom-theme-set-faces
+ 'philsf-windows
+ '(default ((t (:family "Consolas" :foundry "outline" :slant normal :weight normal :height 98 :width normal)))))
+
+(provide-theme 'philsf-windows)