aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emacs/.emacs.d/init/ycp-vc.el4
-rw-r--r--misc/.Xresources11
2 files changed, 14 insertions, 1 deletions
diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el
index 7496cef..d30fcc7 100644
--- a/emacs/.emacs.d/init/ycp-vc.el
+++ b/emacs/.emacs.d/init/ycp-vc.el
@@ -81,7 +81,9 @@
(my-package diff-hl
(:delay 30)
(:install t)
- (global-diff-hl-mode)
+ ;; diff-hl-mode can slow down things in buffers visiting large
+ ;; files, so here we only enable it for prog-mode
+ (add-hook 'prog-mode-hook diff-hl-mode)
(diff-hl-flydiff-mode))
(my-package diffview
diff --git a/misc/.Xresources b/misc/.Xresources
new file mode 100644
index 0000000..fe7665d
--- /dev/null
+++ b/misc/.Xresources
@@ -0,0 +1,11 @@
+URxvt.font: xft:Ubuntu Mono:size=15:antialias=true
+URxvt.boldFont: xft:Ubuntu Mono:bold:size=15:antialias=true
+
+! do not scroll with output
+URxvt*scrollTtyOutput: false
+
+! scroll in relation to buffer (with mouse scroll or Shift+Page Up)
+URxvt*scrollWithBuffer: true
+
+! scroll back to the bottom on keypress
+URxvt*scrollTtyKeypress: true