Merge branch 'master' into rtags-attempt

* master: (139 commits)
  Add pdf-tools as a nicer replacement for doc-view
  Add pdf-tools submodule
  Fix maildir data with correct path
  Add desktop notifications for email
  Potential use for modes without repls
  Attach files more easily in mu
  Update to newest version of mu
  Please remove tooltips after a while, please
  ace-window gets confused when tooltips are present
  Sometimes the dispatch list does come in handy
  Pre-populate searches
  Succumb to muscle memory of control keys
  Remove ropemacs due to disuse
  Do not let company-quickhelp steal a global key
  Manage word navigation
  Use proper helm function to replace completing-read
  Electric operators on python mode
  Use which-key in preference to guide-key
  Navigate easier
  Simplify config with magit 2.1.0
  ...

1 files changed, 35 insertions, 9 deletions

diff --git a/init.el b/init.el
index 8f420c2..f38699a 100644
--- a/init.el
+++ b/init.el
@@ -10,6 +10,10 @@
 (when window-system
   (tooltip-mode -1)
   (tool-bar-mode -1))
+;; Open in full-screen of possible
+(when (fboundp 'toggle-frame-maximized)
+  (setq frame-resize-pixelwise t)
+  (toggle-frame-maximized))
 (menu-bar-mode -1)
 (setq warning-suppress-types nil)
 (set-face-background 'default "black")
@@ -21,6 +25,9 @@
   (find-if (lambda (f) (find-font (font-spec :name f))) fonts))
 (let ((fontval (font-candidate '"Inconsolata" "Source Code Pro" "Anonymous Pro")))
   (when fontval (set-face-attribute 'default nil :font fontval)))
+(when (find-font (font-spec :name "Symbola"))
+  (set-fontset-font "fontset-default" nil
+                    (font-spec :size 20 :name "Symbola")))
 (setq custom-file (concat ravi/init-dir "custom.el"))
 
 ;; Initialize package handling: currently using only the official repository and MELPA
@@ -29,8 +36,8 @@
         ;("original"    . "http://tromey.com/elpa/")
         ("org"         . "http://orgmode.org/elpa/")
         ;("marmalade"   . "http://marmalade-repo.org/packages/")
-        ("melpa"       . "http://melpa.milkbox.net/packages/")))
-(add-to-list 'load-path ravi/init-dir)
+        ("melpa"       . "http://melpa.org/packages/")))
+(add-to-list 'load-path (ravi/emacs-file "lisp/"))
 (add-to-list 'load-path (ravi/emacs-file "site-lisp/"))
 (setq autoload-file (concat ravi/init-dir "loaddefs.el"))
 (setq package-user-dir (concat ravi/init-dir "elpa"))
@@ -78,6 +85,9 @@
     result))
 ;; ---------------------------------------------------------------------
 
+(defvar ravi/use-helm-instead-of-ido t
+  "Prefer helm to ido")
+
 (when (file-exists-p (ravi/emacs-file "local.el"))
   (load-file (ravi/emacs-file "local.el"))
   )
@@ -94,22 +104,36 @@
 (require 's)
 (require 'ravi-ergodox-mode)
 (if (s-contains? "Ergodox" (shell-command-to-string "xinput"))
-    (ravi-ergodox-mode)
+    (progn
+      (ravi-ergodox-mode)
+      (diminish 'ravi-ergodox-mode))
   (progn
     ;; Temporary key-bindings
-    (bind-key "<f9>" 'ido-find-file)
-    (bind-key "<f8>" 'ido-switch-buffer)
+    (if (and (boundp 'ravi/use-helm-instead-of-ido) ravi/use-helm-instead-of-ido)
+        (progn
+          (bind-key "<f9>" 'helm-find-files)
+          (bind-key "<f8>" 'helm-mini))
+      (progn
+        (bind-key "<f9>" 'ido-find-file)
+        (bind-key "<f8>" 'ido-switch-buffer)))
     (bind-key "<f12>" 'undo-tree-undo)))
 
-(use-package keyadvice
-  :load-path ,(ravi/emacs-file "site-lisp/keyadvice")
-  )
-
 (use-package free-keys
   :ensure t
   :commands free-keys)
 
+(defun ravi/add-variables-from-dir-locals (varname hack-varname &optional make-it-local)
+  "Add variable from dir-locals.el to an existing variable as a buffer-local variable"
+  (let ((basic-var (symbol-value varname)))
+    (when (and (boundp hack-varname)
+               (listp (symbol-value hack-varname)))
+      (when make-it-local
+        (make-local-variable varname))
+      (set varname (append basic-var (symbol-value hack-varname))))))
+
+(require 'ravi-init-maps)
 (require 'ravi-init-ido)
+(require 'ravi-init-helm)
 (require 'ravi-init-marks)
 (require 'ravi-init-appearance)
 (require 'ravi-init-files)
@@ -124,3 +148,5 @@
 (require 'ravi-init-tex)
 (require 'ravi-init-repl)
 (require 'ravi-init-dired)
+(require 'ravi-init-mu)
+(require 'ravi-init-web)