Mercurial > dotfiles

changeset 257:3ecf32c893ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 07 Jan 2015 20:54:59 -0800
parents e74cfc5d3040 (current diff) 122919f93598 (diff)
children abb94e9f28d2
files .hgsubstate
diffstat 4 files changed, 17 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Tue Jan 06 23:23:46 2015 -0800
+++ b/.hgsubstate	Wed Jan 07 20:54:59 2015 -0800
@@ -9,12 +9,12 @@
 81c6dd7ce3169e5ad9ba92422ba6e1ce5b074e36 vim/bundle/colorschemes
 9c685131a5facfa0d643feca3a61b41c007d8170 vim/bundle/commentary
 5d2aa8522dfd73a699b77128a310535d9d462061 vim/bundle/ctrlp
-55de0be306844ba8ad63c6e910e9c8f8234a209e vim/bundle/easymotion
+9ceebf91fc137644cf0693561a386ef4071dbf87 vim/bundle/easymotion
 2c8461db084d205903a792a23163faa546f143c9 vim/bundle/fugitive
 eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
 c9dfccf3c2f762f5f1f2b86320f2fd0258998ed0 vim/bundle/gutentags
 204e32721154766e03e99ff857bc798aa5b741dc vim/bundle/haml
-4dfa6c4e679ae326cc7486012f0433a92c64426e vim/bundle/interestingwords
+6e0ac033107bd12c1390cbdf49398393930f3fb6 vim/bundle/interestingwords
 8a8f0ed97c1751d304cf5b7241f2fe27b0e61f81 vim/bundle/jinja
 53a2c9403ba8e8d7f5229eead2e6933ab04c70d1 vim/bundle/lawrencium
 940a8defa0576385dee1ad177bab0b34738540aa vim/bundle/less
@@ -24,13 +24,13 @@
 af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
 c6a872a64530979f4aac46d765c577581cb7fc36 vim/bundle/pythonmode
-12e379989e3258af0934e10173386235c7d69944 vim/bundle/ragtag
-2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 vim/bundle/repeat
+07115a6dee0ae01b7c9c3d92e9ee3219b6780b77 vim/bundle/ragtag
+5eba0f19c87402643eb8a7e7d20d9d5338fd6d71 vim/bundle/repeat
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
 b0ca47f4570385043f270f9278ba6d50d1d2fa00 vim/bundle/supertab
 fa433e0b7330753688f715f3be5d10dc480f20e5 vim/bundle/surround
-30b4ce3411f539f695ab8def7fc69c2f835eb8fe vim/bundle/syntastic
-f9c5f24576e82aae5ab8a5480f1ae48615354e40 vim/bundle/tagbar
+0da7a1e476ef03be22718e813fbc729f9dc163b4 vim/bundle/syntastic
+bfc121dc38271ab3f050609bb2ca377de07d8bd6 vim/bundle/tagbar
 869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
 a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring
--- a/weechat/irc.conf	Tue Jan 06 23:23:46 2015 -0800
+++ b/weechat/irc.conf	Wed Jan 07 20:54:59 2015 -0800
@@ -147,13 +147,13 @@
 freenode.autoconnect
 freenode.autoreconnect
 freenode.autoreconnect_delay
-freenode.nicks
+freenode.nicks = "lordabdul,lordabdul1,lordabdul2,lordabdul3,lordabdul4"
 freenode.username
 freenode.realname
 freenode.local_hostname
 freenode.command = "/msg nickserv identify lordabdul ${sec.data.freenode}"
 freenode.command_delay
-freenode.autojoin = "#duckduckgo,#buildbot"
+freenode.autojoin = "#duckduckgo,#buildbot,#mercurial"
 freenode.autorejoin
 freenode.autorejoin_delay
 freenode.connection_timeout
@@ -181,7 +181,7 @@
 quakenet.autoconnect = on
 quakenet.autoreconnect
 quakenet.autoreconnect_delay
-quakenet.nicks
+quakenet.nicks = "lordabdul,lordabdul2,lordabdul3,lordabdul4"
 quakenet.username
 quakenet.realname
 quakenet.local_hostname
@@ -215,7 +215,7 @@
 sorcery.autoconnect = on
 sorcery.autoreconnect
 sorcery.autoreconnect_delay
-sorcery.nicks
+sorcery.nicks = "lordabdul,lordabdul2,lordabdul3,lordabdul4"
 sorcery.username
 sorcery.realname
 sorcery.local_hostname
@@ -249,7 +249,7 @@
 oftc.autoconnect
 oftc.autoreconnect
 oftc.autoreconnect_delay
-oftc.nicks
+oftc.nicks = "lordabdul,lordabdul2,lordabdul3,lordabdul4"
 oftc.username
 oftc.realname
 oftc.local_hostname
--- a/weechat/sec.conf	Tue Jan 06 23:23:46 2015 -0800
+++ b/weechat/sec.conf	Wed Jan 07 20:54:59 2015 -0800
@@ -10,8 +10,8 @@
 
 [data]
 __passphrase__ = on
-oftc = "FB63607DBD8D19EF3D10786AEE7AB5CDB051A0616E0270D58026F9769E8095C5D597CE72816E8C9FC15FF2CB55FEFC1C569DBFD70612B5B6DA"
-quakenet = "E4BF133249D1925039DCEDF75640B92A99FEA90ABB10398B389AD6F9F7D0E094F84E1D14024E979172EBEF51D682BD1A08614E"
-freenode = "AE89FA83682ED9B0AEFD9749C1819FACFC5BA99061111B2D6D1EA50832843F5A4E52D3DB8BC01FD1CDCCDF8C1743D60D74BB044D3A7B13"
-nick = "53DD67A0E976CCD98D5BE471F028C2BC93AD1CC856DE604ED95488390D3F0BAB44DF3F7ABDBFDAF28A7F671B0C49EE4D4976"
-sorcery = "02D163FC5A2DFECB3EEF8B457248818E176996E9C9A10E163483E498C068E552B2DC23E3BEA390001755BDB31B5FA4972986D295EE5684"
+oftc = "F99FF5351476A94DDE4015A9FAA058015F14477E62D8543F61E5DE1121950682375A6287C8F16EA898E4789204F41E1BAFEE122F1E9501BDA9"
+quakenet = "EC953760A3DB704380615B2F9E7A52BD249D2EE4D7637DFFF22F1C3BE36B43B7F1572523F6BB78D9BB8498F93A7C7124068811"
+freenode = "64B810C5336E5B9A243A7F36D71E189CE32BDE149E663DA98DCFCC16E18EB23D9741B1DDA054189CC474664158409E1C8267B34DD8A7B7"
+nick = "BECC087485681F91441BF725DBDDCC5EC3127B39197AFFC4C8692FF94F2B7C2CA213C84832FD67F4156AD027827F08152084"
+sorcery = "880997891EB0DF236D784D159229EEE3B61F68F9855A6925601397E16D2B04650BBDA27FE58D5E2A139CEC5EED42D3A98137C1B02B3BB3"
--- a/weechat/weechat.conf	Tue Jan 06 23:23:46 2015 -0800
+++ b/weechat/weechat.conf	Wed Jan 07 20:54:59 2015 -0800
@@ -264,6 +264,7 @@
 [notify]
 
 [filter]
+irc_smart = on;*;irc_smart_filter;*
 
 [key]
 ctrl-? = "/input delete_previous_char"