aboutsummaryrefslogtreecommitdiffstats
path: root/meld
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2021-06-25 12:56:30 +0200
committerMattias Andrée <maandree@kth.se>2021-06-25 12:56:30 +0200
commit5a7db2f34aa6a6787d98a001b6d28be97f36abf4 (patch)
tree52db199005cc5daee35b5c0e9b3d28b534449e1c /meld
downloaddotfiles-5a7db2f34aa6a6787d98a001b6d28be97f36abf4.tar.gz
dotfiles-5a7db2f34aa6a6787d98a001b6d28be97f36abf4.tar.bz2
dotfiles-5a7db2f34aa6a6787d98a001b6d28be97f36abf4.tar.xz
First commit
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
-rw-r--r--meld/Makefile15
-rw-r--r--meld/meldrc.ini14
2 files changed, 29 insertions, 0 deletions
diff --git a/meld/Makefile b/meld/Makefile
new file mode 100644
index 0000000..bda9978
--- /dev/null
+++ b/meld/Makefile
@@ -0,0 +1,15 @@
+.POSIX:
+
+# Unfortunely meldrc.ini contains both (for us unless) state and settings,
+# therefore we are making a copy instead of a link. Otherwise running meld
+# could make changes to our dotfiles.
+
+install:
+ mkdir -p -- ~/.config/meld
+ cp -- meldrc.ini ~/.config/meld/
+
+uninstall:
+ -unlink -- ~/.config/meld/meldrc.ini
+ -rm -rf -- ~/.config/meld
+
+.PHONY: install uninstall
diff --git a/meld/meldrc.ini b/meld/meldrc.ini
new file mode 100644
index 0000000..fba8e9b
--- /dev/null
+++ b/meld/meldrc.ini
@@ -0,0 +1,14 @@
+[DEFAULT]
+use_custom_font = True
+custom_font = Fixed 10
+tab_size = 8
+edit_wrap_lines = 0
+highlight_current_line = True
+show_line_numbers = False
+show_whitespace = False
+use_syntax_highlighting = False
+edit_command_type = custom
+edit_command_custom = emacs
+dirdiff_time_resolution_ns = 1
+text_codecs = utf8
+vc_show_commit_margin = True