diff options
| author |  Tom Willemsen | 2012-09-25 22:20:43 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-09-25 22:20:43 +0200 |
| commit | 5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d (patch) | |
| tree | f534c84e67552c694dfa0cb5a6178446801612f2 /.Xdefaults | |
| parent | b2de3d6412ba51111ce9b51cc2a3b384735e040a (diff) | |
| parent | 73700816128c0788e822710dbad5e0bd3d8d54bf (diff) | |
| download | dotfiles-5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d.tar.gz dotfiles-5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/init.el
Diffstat (limited to '.Xdefaults')
| -rw-r--r-- | .Xdefaults | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -16,10 +16,9 @@ urxvt.perl-ext-common: default,matcher,searchable-scrollback urxvt.urlLauncher: firefox urxvt.matcher.button: 1 -urxvt.font: xft:osaka_unicode:weight=medium:pixelsize=18 -urxvt.boldFont: xft:osaka_unicode:weight=black:pixelsize=18 -urxvt.italicFont: xft:osaka_unicode:slant=italic:pixelsize=18 -! urxvt.transparent: true +urxvt.font: xft:Monaco:weight=medium:pixelsize=18 +urxvt.boldFont: xft:Monaco:weight=black:pixelsize=18 +urxvt.italicFont: xft:Monaco:slant=italic:pixelsize=18 urxvt.background: #252a2b urxvt.foreground: #eeeeec @@ -53,11 +52,11 @@ Xft.rgba: rgb Xft.hinting: true Xft.hintstyle: hintslight -Emacs.font: DejaVu Sans Mono:weight=medium:pixelsize=18 +! Emacs.font: DejaVu Sans Mono:weight=medium:pixelsize=18 Emacs.menuBar: off Emacs.toolbar: off Emacs.useXIM: off -Emacs.background: #252a2b +! Emacs.background: #252a2b xfontsel.sampleText: \ static void print_sample_message(XWindow *win) {\n\ |