Merge branch 'master' of github.com:10sr/dotfiles

bashrc

@@ -46,18 +46,18 @@ fi
 
 #################################
 
-__search_string(){
-    # __search_string str1 str2
+__match(){
+    # __match str1 str2
     # return 0 if str2 is found in str1
     expr "$1" : ".*$2.*" >/dev/null
 }
 
-if ! __search_string "$PATH" "$HOME/.local/bin"
+if ! __match "$PATH" "$HOME/.local/bin"
 then
     PATH="${PATH}:${HOME}/.local/bin:$HOME/.local/lib/gems/bin"
 fi
 
-if ismsys && ! __search_string "$PATH" /c/mingw/bin
+if ismsys && ! __match "$PATH" /c/mingw/bin
 then
     PATH="$PATH:/c/mingw/bin:/c/mingw/msys/1.0/bin"
 fi
@@ -67,7 +67,7 @@ fi
 # # http://superuser.com/questions/324613/installing-a-library-locally-in-home-directory-but-program-doesnt-recognize-it
 # without this ENV i cannot run tmux. another way is to use --disable-shared
 # when building tmux
-if ! __search_string "$LD_LIBRARY_PATH" "$HOME/.local/lib"
+if ! __match "$LD_LIBRARY_PATH" "$HOME/.local/lib"
 then
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/.local/lib"
 fi
@@ -126,7 +126,7 @@ then
         export TMP=/tmp
     fi
 fi
-export TMP="${TMP}/${USER}-tmp"
+__match "$TMP" "${USER}-tmp" >/dev/null || export TMP="${TMP}/${USER}-tmp"
 export TEMP="$TMP"
 mkdir -p "$TMP"
 

emacs.el

@@ -684,12 +684,11 @@ found, otherwise returns nil."
 ;; some modes and hooks
 
 (and (fetch-library
-      "https://raw.github.com/10sr/emacs-lisp/master/remember-major-modes-mode.el")
+      "https://raw.github.com/10sr/emacs-lisp/master/remember-major-modes-mode.el"
+      t)
      (require 'remember-major-modes-mode nil t)
      (remember-major-modes-mode 1)
-     (add-hook 'after-change-major-mode-hook
-               'remember-major-modes-remember))
-
+     )
 
 ;; Detect file type from shebang and set major-mode.
 (add-to-list 'interpreter-mode-alist
@@ -1362,10 +1361,10 @@ If called intearctively, find word at point."
     (my-x-open (dired-get-filename t t)))
 
   (if (eq window-system 'mac)
-      (setq dired-listing-switches "-lhFG")
-    (setq dired-listing-switches "-lhFG --time-style=long-iso")
+      (setq dired-listing-switches "-lhF")
+    (setq dired-listing-switches "-lhF --time-style=long-iso")
     )
-  (setq dired-listing-switches "-lhFG")
+  (setq dired-listing-switches "-lhF")
 
   (put 'dired-find-alternate-file 'disabled nil)
   ;; when using dired-find-alternate-file
@@ -1431,7 +1430,7 @@ If called intearctively, find word at point."
         "https://raw.github.com/10sr/emacs-lisp/master/dired-list-all-mode.el"
         t)
        (lazy-load-eval 'dired-list-all-mode)
-       (setq dired-listing-switches "-lhFG")
+       (setq dired-listing-switches "-lhF")
        (add-hook 'dired-mode-hook
                  (lambda ()
                    (define-key dired-mode-map "a" 'dired-list-all-mode)

fonts.conf

@@ -5,31 +5,32 @@
 
 <fontconfig>
 
-  <alias binding='strong'>
-    <family>serif</family>
-    <prefer>
-      <family>DejaVu Serif</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>monapo</family>
-    </prefer>
-  </alias>
-  <alias binding='strong'>
-    <family>sans-serif</family>
-    <prefer>
-      <family>DejaVu Sans</family>
-      <family>monapo</family>
-    </prefer>
-  </alias>
-  <alias binding='strong'>
-    <family>monospace</family>
-    <prefer>
-      <family>DejaVu Sans Mono</family>
-      <family>monapo</family>
-    </prefer>
-  </alias>
+    <alias binding='strong'>
+        <family>serif</family>
+        <prefer>
+            <family>DejaVu Serif</family>
+        </prefer>
+    </alias>
+    <alias>
+        <family>serif</family>
+        <prefer>
+            <family>monapo</family>
+        </prefer>
+    </alias>
+    <alias binding='strong'>
+        <family>sans-serif</family>
+        <prefer>
+            <family>DejaVu Sans</family>
+            <family>monapo</family>
+        </prefer>
+    </alias>
+    <alias binding='strong'>
+        <family>monospace</family>
+        <prefer>
+            <family>Source Code Pro</family>
+            <family>DejaVu Sans Mono</family>
+            <family>monapo</family>
+        </prefer>
+    </alias>
 
 </fontconfig>