summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2018-05-27 17:16:42 (EDT)
committer P. J. McDermott <pj@pehjota.net>2018-05-27 17:16:42 (EDT)
commitdb88a85df3531c494cbbf6df271b443017ed559a (patch)
tree6b751aeaa3820bb95303e84466a81e0cb6bc7f10
parent4a7cb3df8e307d1c0e900525b4690f02b42abab8 (diff)
downloadclaws-mail-db88a85df3531c494cbbf6df271b443017ed559a.zip
claws-mail-db88a85df3531c494cbbf6df271b443017ed559a.tar.gz
claws-mail-db88a85df3531c494cbbf6df271b443017ed559a.tar.bz2
Rename "menurc" filter to "gtkaccelmap"
-rw-r--r--.gitattributes.d/claws-mail2
-rw-r--r--.gitconfig.d/claws-mail2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitattributes.d/claws-mail b/.gitattributes.d/claws-mail
index 8f90028..8a200fc 100644
--- a/.gitattributes.d/claws-mail
+++ b/.gitattributes.d/claws-mail
@@ -1,2 +1,2 @@
/.claws-mail/clawsrc* filter=clawsrc
-/.claws-mail/menurc* filter=menurc diff=gtkaccelmap
+/.claws-mail/menurc* filter=gtkaccelmap diff=gtkaccelmap
diff --git a/.gitconfig.d/claws-mail b/.gitconfig.d/claws-mail
index e592e59..f3b8ad6 100644
--- a/.gitconfig.d/claws-mail
+++ b/.gitconfig.d/claws-mail
@@ -2,7 +2,7 @@
clean = "sed 's/^last_opened_folder=.*$/last_opened_folder=/; \
s/^\\(attach_.*_directory=\\).*$/\\1/;'"
smudge = cat
-[filter "menurc"]
+[filter "gtkaccelmap"]
clean = "awk 'NR <=3 {print $0; next;} {print $0 | \"sort\";}'"
smudge = cat
[diff "gtkaccelmap"]