aboutsummaryrefslogtreecommitdiffhomepage
path: root/extras
diff options
context:
space:
mode:
authorGravatar Brendan Taylor <whateley@gmail.com>2011-02-14 21:54:00 -0700
committerGravatar Brendan Taylor <whateley@gmail.com>2011-02-14 21:54:00 -0700
commit940591850179640811bac6cf206fabae61964f55 (patch)
tree23325ce4f6899ef0dc35edc5747c5f2dd76495b6 /extras
parent7e5a921c93a580725b64fee3bdbf0af406d369a3 (diff)
parent6a737a7137c8cfbbe21bb5f0c0182ca2255a5b4c (diff)
Merge commit '6a737a7137' (keis/intcookies) into experimental
Conflicts: docs/README.uzbl-event-manager
Diffstat (limited to 'extras')
-rw-r--r--extras/vim/syntax/uzbl.vim2
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/vim/syntax/uzbl.vim b/extras/vim/syntax/uzbl.vim
index b8572c9..bf7108c 100644
--- a/extras/vim/syntax/uzbl.vim
+++ b/extras/vim/syntax/uzbl.vim
@@ -30,7 +30,7 @@ setl iskeyword=!-~,192-255
syn keyword uzblKeyword back forward scroll reload reload_ign_cache stop
syn keyword uzblKeyword zoom_in zoom_out toggle_zoom_type uri script
-syn keyword uzblKeyword toggle_status spawn sync_spawn sync_sh talk_to_socket
+syn keyword uzblKeyword toggle_status spawn sync_spawn sync_sh sync_spawn_exec
syn keyword uzblKeyword exit search search_reverse search_clear dehilight set
syn keyword uzblKeyword dump_config dump_config_as_events chain print event
syn keyword uzblKeyword request menu_add menu_link_add menu_image_add