Browse Source

Merge remote branch 'origin/master'

pull/1/head
10sr 11 years ago
parent
commit
0c6f278db2
2 changed files with 31 additions and 30 deletions
  1. +4
    -4
      emacs.el
  2. +27
    -26
      fonts.conf

+ 4
- 4
emacs.el View File

@@ -1361,10 +1361,10 @@ If called intearctively, find word at point."
(my-x-open (dired-get-filename t t))) (my-x-open (dired-get-filename t t)))


(if (eq window-system 'mac) (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) (put 'dired-find-alternate-file 'disabled nil)
;; when using dired-find-alternate-file ;; when using dired-find-alternate-file
@@ -1430,7 +1430,7 @@ If called intearctively, find word at point."
"https://raw.github.com/10sr/emacs-lisp/master/dired-list-all-mode.el" "https://raw.github.com/10sr/emacs-lisp/master/dired-list-all-mode.el"
t) t)
(lazy-load-eval 'dired-list-all-mode) (lazy-load-eval 'dired-list-all-mode)
(setq dired-listing-switches "-lhFG")
(setq dired-listing-switches "-lhF")
(add-hook 'dired-mode-hook (add-hook 'dired-mode-hook
(lambda () (lambda ()
(define-key dired-mode-map "a" 'dired-list-all-mode) (define-key dired-mode-map "a" 'dired-list-all-mode)


+ 27
- 26
fonts.conf View File

@@ -5,31 +5,32 @@


<fontconfig> <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> </fontconfig>

Loading…
Cancel
Save