# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1587425048 25200
# Node ID 35094cf31de499fb649b4acea0c0f5ea7bc6a8ba
# Parent  2aede5c6c4e32d05d110725f2dfda12043e78557# Parent  8f36fc391ddf4d1bb9c939915fc74e059a7883dc
Merged changes.

diff -r 8f36fc391ddf -r 35094cf31de4 .hgignore
--- a/.hgignore	Fri Apr 10 17:12:43 2020 -0700
+++ b/.hgignore	Mon Apr 20 16:24:08 2020 -0700
@@ -14,10 +14,10 @@
 vim/vimrc-local-pre
 vim/bundle/
 vim/local/
+vim/fzf-history/
 weechat/logs
 weechat/*.log
-mutt/*.gpg
-mutt/variables
+mutt/variables*
 pentadactyl/.pentadactyl
 pentadactyl/info
 qutebrowser/data
diff -r 8f36fc391ddf -r 35094cf31de4 fish/config.fish
--- a/fish/config.fish	Fri Apr 10 17:12:43 2020 -0700
+++ b/fish/config.fish	Mon Apr 20 16:24:08 2020 -0700
@@ -87,6 +87,8 @@
         if git branch >/dev/null 2>/dev/null 
             printf '±' ; return
         end
+    end
+    if set -q __local_has_hg
         if hg root >/dev/null 2>/dev/null
             printf '☿' ; return
         end
diff -r 8f36fc391ddf -r 35094cf31de4 hgrc/hgignore
--- a/hgrc/hgignore	Fri Apr 10 17:12:43 2020 -0700
+++ b/hgrc/hgignore	Mon Apr 20 16:24:08 2020 -0700
@@ -5,6 +5,9 @@
 *.orig
 *.egg-info
 tags
+tags.files
+tags.lock
+tags.temp
 .DS_Store
 Thumbs.db
 __pycache__
diff -r 8f36fc391ddf -r 35094cf31de4 hgrc/hgrc
--- a/hgrc/hgrc	Fri Apr 10 17:12:43 2020 -0700
+++ b/hgrc/hgrc	Mon Apr 20 16:24:08 2020 -0700
@@ -19,6 +19,7 @@
 purge =
 rebase =
 schemes =
+shelve =
 strip =
 
 [alias]
diff -r 8f36fc391ddf -r 35094cf31de4 iterm2/tmux-256color-italic.terminfo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/iterm2/tmux-256color-italic.terminfo	Mon Apr 20 16:24:08 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 8f36fc391ddf -r 35094cf31de4 iterm2/xterm-256color-italic.terminfo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/iterm2/xterm-256color-italic.terminfo	Mon Apr 20 16:24:08 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 8f36fc391ddf -r 35094cf31de4 mutt/fastmailrc
--- a/mutt/fastmailrc	Fri Apr 10 17:12:43 2020 -0700
+++ b/mutt/fastmailrc	Mon Apr 20 16:24:08 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 8f36fc391ddf -r 35094cf31de4 tridactyl/tridactylrc
--- a/tridactyl/tridactylrc	Fri Apr 10 17:12:43 2020 -0700
+++ b/tridactyl/tridactylrc	Mon Apr 20 16:24:08 2020 -0700
@@ -17,3 +17,6 @@
 bind > tabmove +1
 
 bind <F1> buffer #
+
+bind j scrollline 20
+bind k scrollline -20
diff -r 8f36fc391ddf -r 35094cf31de4 vim/ctagsrc
--- a/vim/ctagsrc	Fri Apr 10 17:12:43 2020 -0700
+++ b/vim/ctagsrc	Mon Apr 20 16:24:08 2020 -0700
@@ -28,6 +28,8 @@
 --exclude=*.elf
 --exclude=*.jpg
 --exclude=*.png
+--exclude=*.egg-info
+--exclude=.egg
 --exclude=venv
 --exclude=build
 --exclude=static