load resources, dont just merge them

[etc/xsession.git] / .Xdefaults

diff --git a/.Xdefaults b/.Xdefaults
index 987ef66640d7aee7f975410a436cd7d6b04844cd..10cfb9b8fcf4dd6bac8d7e46a0a5ef3bfafa414b 100644 (file)
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -30,7 +30,9 @@ URxvt.scrollstyle:             plain
 URxvt.secondaryScroll:         true
 URxvt.print-pipe:              cat > $(mktemp /tmp/$(date +%Y-%m-%d-%H%M%S)-urxvt_XXXXXX.txt)
 
-URxvt.searchable-scrollback:   CM-s
+URxvt.keysym.MC-s:             searchable-scrollback:start
+!The following is required due to #839770
+URxvt.keysym.M-s:              builtin:
 
 URxvt.mapAlert:                true
 
@@ -38,24 +40,20 @@ URxvt.cutchars:                "\`\"'&()*,;<=>?@[]^{|}⇝·/:"
 
 Rxvt.loginShell:               true
 
-URxvt.perl-ext-common:         default,matcher,selection,selection-pastebin
+URxvt.perl-ext-common:         default,matcher,confirm-paste,-readline
 
-URxvt.keysym.C-Return:         perl:matcher
+URxvt.keysym.C-Return:         matcher:select
+URxvt.keysym.MC-Return:        matcher:last
 URxvt.matcher.rend.0:          Uline
-URxvt.matcher.pattern.1:       \\B(/\\S+?)\072(\\d+)\\b
-URxvt.matcher.launcher.1:      gvim +$2 $1
+URxvt.matcher.pattern.1:       \\B(\.?/\\S+?)\072(\\d+)\\b
+URxvt.matcher.launcher.1:      x-terminal-emulator -e vim +$2 $1
 URxvt.matcher.rend.1:          Uline
-//URxvt.matcher.pattern.2:       \\B\043(\\d{6})\\b
-////URxvt.matcher.launcher.2:      sensible-browser bugs.debian.org/$1
-//URxvt.matcher.launcher.2:      echo bug \$1
-//URxvt.matcher.rend.2:          Uline
-
-URxvt.selection-pastebin.cmd:  pub %
-URxvt.selection-pastebin.url:  http\072\057\057scratch.madduck.net/%
-URxvt.keysym.C-M-p:            perl:selection-pastebin:remote-pastebin
+!URxvt.matcher.pattern.2:       \\B\043(\\d{6})\\b
+!URxvt.matcher.launcher.2:      sensible-browser http://bugs.debian.org/$1
+!URxvt.matcher.rend.2:          Uline
 
 // URxvt.depth:                   32
 // URxvt.background:              rgba:0000/0000/0000/dddd
 URxvt.transparent:             false
 
-URxvt.termName:                        rxvt-unicode
+URxvt.termName:                 rxvt-unicode