# HG changeset patch # User Steve Losh # Date 1349885129 14400 # Node ID 8724f02b290871ee6d1f2080a68874d3edad9fc0 # Parent 1d45e21ca4d76c3b38ed3b22b55a55e2a8898cf1 Moar. diff -r 1d45e21ca4d7 -r 8724f02b2908 .hgsubstate --- a/.hgsubstate Sun Sep 30 12:01:01 2012 -0400 +++ b/.hgsubstate Wed Oct 10 12:05:29 2012 -0400 @@ -3,8 +3,8 @@ 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim 9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack -cb09bd4000f0d0a971d15f93bc5f8b98a587915a vim/bundle/badwolf -ed67c4908fa033eef6cdfacc8141750e99f1345b vim/bundle/clam +65adfb4b8907a83556b4d43234b115bacd958472 vim/bundle/badwolf +8533fffd9fbb690dfc8e334f91a10c72e35a6dce vim/bundle/clam dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary 3c6182371db8e8ede3789d21b52386569eda2208 vim/bundle/ctrlp 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion diff -r 1d45e21ca4d7 -r 8724f02b2908 dotcss/flickr.com.css --- a/dotcss/flickr.com.css Sun Sep 30 12:01:01 2012 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -body { - background: green !important; -} -.spaceball { - display: none !important; -} diff -r 1d45e21ca4d7 -r 8724f02b2908 vim/bundle/watchit/plugin/watchit.vim --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/bundle/watchit/plugin/watchit.vim Wed Oct 10 12:05:29 2012 -0400 @@ -0,0 +1,177 @@ +" This file is all from +" http://vim.wikia.com/wiki/Have_Vim_check_automatically_if_the_file_has_changed_externally + +" If you are using a console version of Vim, or dealing +" with a file that changes externally (e.g. a web server log) +" then Vim does not always check to see if the file has been changed. +" The GUI version of Vim will check more often (for example on Focus change), +" and prompt you if you want to reload the file. +" +" There can be cases where you can be working away, and Vim does not +" realize the file has changed. This command will force Vim to check +" more often. +" +" Calling this command sets up autocommands that check to see if the +" current buffer has been modified outside of vim (using checktime) +" and, if it has, reload it for you. +" +" This check is done whenever any of the following events are triggered: +" * BufEnter +" * CursorMoved +" * CursorMovedI +" * CursorHold +" * CursorHoldI +" +" In other words, this check occurs whenever you enter a buffer, move the cursor, +" or just wait without doing anything for 'updatetime' milliseconds. +" +" Normally it will ask you if you want to load the file, even if you haven't made +" any changes in vim. This can get annoying, however, if you frequently need to reload +" the file, so if you would rather have it to reload the buffer *without* +" prompting you, add a bang (!) after the command (WatchForChanges!). +" This will set the autoread option for that buffer in addition to setting up the +" autocommands. +" +" If you want to turn *off* watching for the buffer, just call the command again while +" in the same buffer. Each time you call the command it will toggle between on and off. +" +" WatchForChanges sets autocommands that are triggered while in *any* buffer. +" If you want vim to only check for changes to that buffer while editing the buffer +" that is being watched, use WatchForChangesWhileInThisBuffer instead. +" +command! -bang WatchForChanges :call WatchForChanges(@%, {'toggle': 1, 'autoread': 0}) +command! -bang WatchForChangesWhileInThisBuffer :call WatchForChanges(@%, {'toggle': 1, 'autoread': 0, 'while_in_this_buffer_only': 1}) +command! -bang WatchForChangesAllFile :call WatchForChanges('*', {'toggle': 1, 'autoread': 0}) + +" WatchForChanges function +" +" This is used by the WatchForChanges* commands, but it can also be +" useful to call this from scripts. For example, if your script executes a +" long-running process, you can have your script run that long-running process +" in the background so that you can continue editing other files, redirects its +" output to a file, and open the file in another buffer that keeps reloading itself +" as more output from the long-running command becomes available. +" +" Arguments: +" * bufname: The name of the buffer/file to watch for changes. +" Use '*' to watch all files. +" * options (optional): A Dict object with any of the following keys: +" * autoread: If set to 1, causes autoread option to be turned on for the buffer in +" addition to setting up the autocommands. +" * toggle: If set to 1, causes this behavior to toggle between on and off. +" Mostly useful for mappings and commands. In scripts, you probably want to +" explicitly enable or disable it. +" * disable: If set to 1, turns off this behavior (removes the autocommand group). +" * while_in_this_buffer_only: If set to 0 (default), the events will be triggered no matter which +" buffer you are editing. (Only the specified buffer will be checked for changes, +" though, still.) If set to 1, the events will only be triggered while +" editing the specified buffer. +" * more_events: If set to 1 (the default), creates autocommands for the events +" listed above. Set to 0 to not create autocommands for CursorMoved, CursorMovedI, +" (Presumably, having too much going on for those events could slow things down, +" since they are triggered so frequently...) +function! WatchForChanges(bufname, ...) + " Figure out which options are in effect + if a:bufname == '*' + let id = 'WatchForChanges'.'AnyBuffer' + " If you try to do checktime *, you'll get E93: More than one match for * is given + let bufspec = '' + else + if bufnr(a:bufname) == -1 + echoerr "Buffer " . a:bufname . " doesn't exist" + return + end + let id = 'WatchForChanges'.bufnr(a:bufname) + let bufspec = a:bufname + end + + if len(a:000) == 0 + let options = {} + else + if type(a:1) == type({}) + let options = a:1 + else + echoerr "Argument must be a Dict" + end + end + let autoread = has_key(options, 'autoread') ? options['autoread'] : 0 + let toggle = has_key(options, 'toggle') ? options['toggle'] : 0 + let disable = has_key(options, 'disable') ? options['disable'] : 0 + let more_events = has_key(options, 'more_events') ? options['more_events'] : 1 + let while_in_this_buffer_only = has_key(options, 'while_in_this_buffer_only') ? options['while_in_this_buffer_only'] : 0 + + if while_in_this_buffer_only + let event_bufspec = a:bufname + else + let event_bufspec = '*' + end + + let reg_saved = @" + "let autoread_saved = &autoread + let msg = "\n" + + " Check to see if the autocommand already exists + redir @" + silent! exec 'au '.id + redir END + let l:defined = (@" !~ 'E216: No such group or event:') + + " If not yet defined... + if !l:defined + if l:autoread + let msg = msg . 'Autoread enabled - ' + if a:bufname == '*' + set autoread + else + setlocal autoread + end + end + silent! exec 'augroup '.id + if a:bufname != '*' + "exec "au BufDelete ".a:bufname . " :silent! au! ".id . " | silent! augroup! ".id + "exec "au BufDelete ".a:bufname . " :echomsg 'Removing autocommands for ".id."' | au! ".id . " | augroup! ".id + exec "au BufDelete ".a:bufname . " execute 'au! ".id."' | execute 'augroup! ".id."'" + end + exec "au BufEnter ".event_bufspec . " :checktime ".bufspec + exec "au CursorHold ".event_bufspec . " :checktime ".bufspec + exec "au CursorHoldI ".event_bufspec . " :checktime ".bufspec + + " The following events might slow things down so we provide a way to disable them... + " vim docs warn: + " Careful: Don't do anything that the user does + " not expect or that is slow. + if more_events + exec "au CursorMoved ".event_bufspec . " :checktime ".bufspec + exec "au CursorMovedI ".event_bufspec . " :checktime ".bufspec + end + augroup END + let msg = msg . 'Now watching ' . bufspec . ' for external updates...' + end + + " If they want to disable it, or it is defined and they want to toggle it, + if l:disable || (l:toggle && l:defined) + if l:autoread + let msg = msg . 'Autoread disabled - ' + if a:bufname == '*' + set noautoread + else + setlocal noautoread + end + end + " Using an autogroup allows us to remove it easily with the following + " command. If we do not use an autogroup, we cannot remove this + " single :checktime command + " augroup! checkforupdates + silent! exec 'au! '.id + silent! exec 'augroup! '.id + let msg = msg . 'No longer watching ' . bufspec . ' for external updates.' + elseif l:defined + let msg = msg . 'Already watching ' . bufspec . ' for external updates' + end + + " echo msg + let @"=reg_saved +endfunction + +let autoreadargs={'autoread':1} +execute WatchForChanges("*",autoreadargs) diff -r 1d45e21ca4d7 -r 8724f02b2908 vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Sun Sep 30 12:01:01 2012 -0400 +++ b/vim/custom-dictionary.utf-8.add Wed Oct 10 12:05:29 2012 -0400 @@ -91,3 +91,4 @@ bikeshed bikesheds inbox +iPhone diff -r 1d45e21ca4d7 -r 8724f02b2908 vim/vimrc --- a/vim/vimrc Sun Sep 30 12:01:01 2012 -0400 +++ b/vim/vimrc Wed Oct 10 12:05:29 2012 -0400 @@ -653,6 +653,7 @@ au BufNewFile,BufRead *.t set filetype=cram au Syntax cram setlocal foldlevel=1 + au FileType cram nnoremap ee :e augroup END " }}} diff -r 1d45e21ca4d7 -r 8724f02b2908 weechat/alias.conf --- a/weechat/alias.conf Sun Sep 30 12:01:01 2012 -0400 +++ b/weechat/alias.conf Wed Oct 10 12:05:29 2012 -0400 @@ -1,5 +1,5 @@ # -# alias.conf -- WeeChat v0.3.8 +# alias.conf -- weechat v0.3.7 # [cmd] diff -r 1d45e21ca4d7 -r 8724f02b2908 weechat/buffers.conf --- a/weechat/buffers.conf Sun Sep 30 12:01:01 2012 -0400 +++ b/weechat/buffers.conf Wed Oct 10 12:05:29 2012 -0400 @@ -1,5 +1,5 @@ # -# buffers.conf -- WeeChat v0.3.8 +# buffers.conf -- weechat v0.3.7 # [color] diff -r 1d45e21ca4d7 -r 8724f02b2908 weechat/logger.conf --- a/weechat/logger.conf Sun Sep 30 12:01:01 2012 -0400 +++ b/weechat/logger.conf Wed Oct 10 12:05:29 2012 -0400 @@ -1,14 +1,10 @@ # -# logger.conf -- WeeChat v0.3.8 +# logger.conf -- weechat v0.3.7 # [look] backlog = 20 -[color] -backlog_end = darkgray -backlog_line = darkgray - [file] auto_log = on flush_delay = 120 diff -r 1d45e21ca4d7 -r 8724f02b2908 weechat/plugins.conf --- a/weechat/plugins.conf Sun Sep 30 12:01:01 2012 -0400 +++ b/weechat/plugins.conf Wed Oct 10 12:05:29 2012 -0400 @@ -1,5 +1,5 @@ # -# plugins.conf -- WeeChat v0.3.8 +# plugins.conf -- weechat v0.3.7 # [var] diff -r 1d45e21ca4d7 -r 8724f02b2908 weechat/relay.conf --- a/weechat/relay.conf Sun Sep 30 12:01:01 2012 -0400 +++ b/weechat/relay.conf Wed Oct 10 12:05:29 2012 -0400 @@ -1,5 +1,5 @@ # -# relay.conf -- WeeChat v0.3.8 +# relay.conf -- weechat v0.3.7 # [look] diff -r 1d45e21ca4d7 -r 8724f02b2908 weechat/rmodifier.conf --- a/weechat/rmodifier.conf Sun Sep 30 12:01:01 2012 -0400 +++ b/weechat/rmodifier.conf Wed Oct 10 12:05:29 2012 -0400 @@ -1,5 +1,5 @@ # -# rmodifier.conf -- WeeChat v0.3.8 +# rmodifier.conf -- weechat v0.3.7 # [look] diff -r 1d45e21ca4d7 -r 8724f02b2908 weechat/urlgrab.conf --- a/weechat/urlgrab.conf Sun Sep 30 12:01:01 2012 -0400 +++ b/weechat/urlgrab.conf Wed Oct 10 12:05:29 2012 -0400 @@ -1,5 +1,5 @@ # -# urlgrab.conf -- WeeChat v0.3.8 +# urlgrab.conf -- weechat v0.3.7 # [color] diff -r 1d45e21ca4d7 -r 8724f02b2908 weechat/weechat.conf --- a/weechat/weechat.conf Sun Sep 30 12:01:01 2012 -0400 +++ b/weechat/weechat.conf Wed Oct 10 12:05:29 2012 -0400 @@ -1,5 +1,5 @@ # -# weechat.conf -- WeeChat v0.3.8 +# weechat.conf -- weechat v0.3.7 # [debug] @@ -58,22 +58,19 @@ mouse_timer_delay = 100 nickmode = on nickmode_empty = off -paste_bracketed = off -paste_bracketed_timer_delay = 10 paste_max_lines = 3 prefix_action = " *" prefix_align = right prefix_align_max = 15 prefix_align_min = 0 -prefix_align_more = "+" +prefix_align_more = on prefix_buffer_align = right prefix_buffer_align_max = 0 -prefix_buffer_align_more = "+" +prefix_buffer_align_more = on prefix_error = "=!=" prefix_join = "✔" prefix_network = "--" prefix_quit = "✘" -prefix_same_nick = "" prefix_suffix = "|" read_marker = line read_marker_always_show = on @@ -169,7 +166,6 @@ [proxy] [network] -connection_timeout = 60 gnutls_ca_file = "%h/ssl/CAs.pem" gnutls_handshake_timeout = 30 diff -r 1d45e21ca4d7 -r 8724f02b2908 weechat/xfer.conf --- a/weechat/xfer.conf Sun Sep 30 12:01:01 2012 -0400 +++ b/weechat/xfer.conf Wed Oct 10 12:05:29 2012 -0400 @@ -1,5 +1,5 @@ # -# xfer.conf -- WeeChat v0.3.8 +# xfer.conf -- weechat v0.3.7 # [look]