# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1601525867 25200
# Node ID 015e94f44cc09441577afae1cc84a1aefac9b0ab
# Parent  35094cf31de499fb649b4acea0c0f5ea7bc6a8ba# Parent  823b7336639a3c58943cfe326aa99ad1bb82f3b3
Merged changes.

diff -r 823b7336639a -r 015e94f44cc0 .hgignore
--- a/.hgignore	Thu Sep 24 23:20:11 2020 -0700
+++ b/.hgignore	Wed Sep 30 21:17:47 2020 -0700
@@ -15,10 +15,10 @@
 vim/bundle/
 vim/fzf-history/
 vim/local/
+vim/fzf-history/
 weechat/logs
 weechat/*.log
-mutt/*.gpg
-mutt/variables
+mutt/variables*
 pentadactyl/.pentadactyl
 pentadactyl/info
 qutebrowser/data
diff -r 823b7336639a -r 015e94f44cc0 hgrc/hgignore
--- a/hgrc/hgignore	Thu Sep 24 23:20:11 2020 -0700
+++ b/hgrc/hgignore	Wed Sep 30 21:17:47 2020 -0700
@@ -5,6 +5,9 @@
 *.orig
 *.egg-info
 tags
+tags.files
+tags.lock
+tags.temp
 .DS_Store
 Thumbs.db
 __pycache__
diff -r 823b7336639a -r 015e94f44cc0 iterm2/tmux-256color-italic.terminfo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/iterm2/tmux-256color-italic.terminfo	Wed Sep 30 21:17:47 2020 -0700
@@ -0,0 +1,4 @@
+# Borrowed from: https://alexpearce.me/2014/05/italics-in-iterm2-vim-tmux/
+tmux-256color-italic|screen with 256 colors and italic,
+  ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m,
+  use=xterm-256color,
diff -r 823b7336639a -r 015e94f44cc0 iterm2/xterm-256color-italic.terminfo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/iterm2/xterm-256color-italic.terminfo	Wed Sep 30 21:17:47 2020 -0700
@@ -0,0 +1,4 @@
+# Borrowed from: https://alexpearce.me/2014/05/italics-in-iterm2-vim-tmux/
+xterm-256color-italic|xterm with 256 colors and italic,
+	sitm=\E[3m, ritm=\E[23m,
+    use=xterm-256color,
diff -r 823b7336639a -r 015e94f44cc0 mutt/fastmailrc
--- a/mutt/fastmailrc	Thu Sep 24 23:20:11 2020 -0700
+++ b/mutt/fastmailrc	Wed Sep 30 21:17:47 2020 -0700
@@ -30,7 +30,9 @@
 set ssl_starttls = no
 
 set imap_check_subscribed
+set imap_list_subscribed
+
 set imap_idle
-
+#unset imap_passive
 
 # vim: ft=muttrc
diff -r 823b7336639a -r 015e94f44cc0 tridactyl/tridactylrc
--- a/tridactyl/tridactylrc	Thu Sep 24 23:20:11 2020 -0700
+++ b/tridactyl/tridactylrc	Wed Sep 30 21:17:47 2020 -0700
@@ -7,6 +7,9 @@
 set hintfiltermode vimperator-reflow
 set hintnames numeric
 
+bind j scrollline 20
+bind k scrollline -20
+
 bind J tabprev
 bind K tabnext
 
@@ -14,3 +17,6 @@
 bind > tabmove +1
 
 bind <F1> buffer #
+
+bind j scrollline 20
+bind k scrollline -20