summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2016-03-13 12:44:59 (EDT)
committer P. J. McDermott <pj@pehjota.net>2016-03-13 12:44:59 (EDT)
commit35ca2eb6ee3c8abf9bedeb8961a327d5f4b08d68 (patch)
treea2f85be1c8a2a62f4f024138201e5f30ddaeca3c
parentf22768f0c1771a2b262cbbb4184289a7ccb8451f (diff)
downloadmidori-35ca2eb6ee3c8abf9bedeb8961a327d5f4b08d68.zip
midori-35ca2eb6ee3c8abf9bedeb8961a327d5f4b08d68.tar.gz
midori-35ca2eb6ee3c8abf9bedeb8961a327d5f4b08d68.tar.bz2
Filter JS options in .gitconfig.d/midori
The NoJS extension changes these options constantly.
-rw-r--r--.gitattributes.d/midori1
-rw-r--r--.gitconfig.d/midori4
-rw-r--r--.gitignore.d/midori4
3 files changed, 9 insertions, 0 deletions
diff --git a/.gitattributes.d/midori b/.gitattributes.d/midori
new file mode 100644
index 0000000..2e4ab24
--- /dev/null
+++ b/.gitattributes.d/midori
@@ -0,0 +1 @@
+/.config/midori/config filter=midori-config
diff --git a/.gitconfig.d/midori b/.gitconfig.d/midori
new file mode 100644
index 0000000..b465407
--- /dev/null
+++ b/.gitconfig.d/midori
@@ -0,0 +1,4 @@
+[filter "midori-config"]
+ clean = "sed '/enable-scripts=.*/d; /enable-javascript=.*/d; \
+ s/\\(enable-java-applet=.*\\)$/\\1\\nenable-javascript=true/'"
+ smudge = cat
diff --git a/.gitignore.d/midori b/.gitignore.d/midori
index 50cd17c..6cf8f57 100644
--- a/.gitignore.d/midori
+++ b/.gitignore.d/midori
@@ -5,6 +5,10 @@
!/.config/
!/.config/midori/
!/.config/midori/**/*
+!/.gitattributes.d/
+!/.gitattributes.d/midori
+!/.gitconfig.d/
+!/.gitconfig.d/midori
!/.gitignore.d/
!/.gitignore.d/midori