From 3d6406751b5d5f36fa0d2e48fe5ee0eeadc55808 Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 19 Dec 2010 00:10:16 +1100
Subject: [PATCH] Remove 'linksearch' from the Vim runtime files.

Also mention its removal in NEWS.
---
 melodactyl/contrib/vim/syntax/melodactyl.vim   | 4 ++--
 pentadactyl/NEWS                               | 2 ++
 pentadactyl/contrib/vim/syntax/pentadactyl.vim | 4 ++--
 teledactyl/contrib/vim/syntax/teledactyl.vim   | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/melodactyl/contrib/vim/syntax/melodactyl.vim b/melodactyl/contrib/vim/syntax/melodactyl.vim
index 87f4dd58..b65a2825 100644
--- a/melodactyl/contrib/vim/syntax/melodactyl.vim
+++ b/melodactyl/contrib/vim/syntax/melodactyl.vim
@@ -60,8 +60,8 @@ syn keyword melodactylOption activate act altwildmode awim autocomplete au cdpat
     \ contained nextgroup=melodactylSetMod
 
 let s:toggleOptions = ["banghist", "bh", "errorbells", "eb", "exrc", "ex", "fullscreen", "fs", "hlsearch", "hls",
-    \ "incsearch", "is", "insertmode", "im", "jsdebugger", "jsd", "linksearch", "lks", "more", "online", "searchcase", "sc",
-    \ "showmode", "smd", "shuffle", "strictfocus", "sf", "usermode", "um", "visualbell", "vb"]
+    \ "incsearch", "is", "insertmode", "im", "jsdebugger", "jsd", "more", "online", "searchcase", "sc", "showmode", "smd",
+    \ "shuffle", "strictfocus", "sf", "usermode", "um", "visualbell", "vb"]
 execute 'syn match melodactylOption "\<\%(no\|inv\)\=\%(' .
     \ join(s:toggleOptions, '\|') .
     \ '\)\>!\=" contained nextgroup=melodactylSetMod'
diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS
index b92327bc..e3a78fb3 100644
--- a/pentadactyl/NEWS
+++ b/pentadactyl/NEWS
@@ -49,6 +49,8 @@
     * The concept of completion contexts is now exposed to the user
       (see :h :contexts), allowing for powerful and fine-grained
       completion system customization.
+    * IMPORTANT: 'linksearch' has been removed.  The \l search modifier can
+      still be used for this purpose.
     * IMPORTANT: 'laststatus' has been replaced with the "s" flag in
       'guioptions'.
     * IMPORTANT: 'showstatuslinks' is now a string option.
diff --git a/pentadactyl/contrib/vim/syntax/pentadactyl.vim b/pentadactyl/contrib/vim/syntax/pentadactyl.vim
index af462fbc..d4c33395 100644
--- a/pentadactyl/contrib/vim/syntax/pentadactyl.vim
+++ b/pentadactyl/contrib/vim/syntax/pentadactyl.vim
@@ -61,8 +61,8 @@ syn keyword pentadactylOption activate act altwildmode awim autocomplete au cdpa
     \ contained nextgroup=pentadactylSetMod
 
 let s:toggleOptions = ["banghist", "bh", "errorbells", "eb", "exrc", "ex", "flashblock", "fb", "fullscreen", "fs",
-    \ "hlsearch", "hls", "incsearch", "is", "insertmode", "im", "jsdebugger", "jsd", "linksearch", "lks", "more", "online",
-    \ "private", "pornmode", "searchcase", "sc", "showmode", "smd", "strictfocus", "sf", "usermode", "um", "visualbell", "vb"]
+    \ "hlsearch", "hls", "incsearch", "is", "insertmode", "im", "jsdebugger", "jsd", "more", "online", "private",
+    \ "pornmode", "searchcase", "sc", "showmode", "smd", "strictfocus", "sf", "usermode", "um", "visualbell", "vb"]
 execute 'syn match pentadactylOption "\<\%(no\|inv\)\=\%(' .
     \ join(s:toggleOptions, '\|') .
     \ '\)\>!\=" contained nextgroup=pentadactylSetMod'
diff --git a/teledactyl/contrib/vim/syntax/teledactyl.vim b/teledactyl/contrib/vim/syntax/teledactyl.vim
index bd08d2a6..06a02381 100644
--- a/teledactyl/contrib/vim/syntax/teledactyl.vim
+++ b/teledactyl/contrib/vim/syntax/teledactyl.vim
@@ -55,8 +55,8 @@ syn keyword teledactylOption altwildmode awim archivefolder autocomplete au cdpa
     \ contained nextgroup=teledactylSetMod
 
 let s:toggleOptions = ["autoexternal", "ae", "banghist", "bh", "errorbells", "eb", "exrc", "ex", "fullscreen", "fs",
-    \ "hlsearch", "hls", "incsearch", "is", "insertmode", "im", "jsdebugger", "jsd", "linksearch", "lks", "more", "online",
-    \ "searchcase", "sc", "showmode", "smd", "strictfocus", "sf", "usermode", "um", "visualbell", "vb"]
+    \ "hlsearch", "hls", "incsearch", "is", "insertmode", "im", "jsdebugger", "jsd", "more", "online", "searchcase", "sc",
+    \ "showmode", "smd", "strictfocus", "sf", "usermode", "um", "visualbell", "vb"]
 execute 'syn match teledactylOption "\<\%(no\|inv\)\=\%(' .
     \ join(s:toggleOptions, '\|') .
     \ '\)\>!\=" contained nextgroup=teledactylSetMod'