From: Stefan Huber <shuber@sthu.org>
Date: Tue, 15 Oct 2013 11:14:49 +0000 (+0200)
Subject: vim: reactivate all STL idents for prepending
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=02063fc14e491e782b855108b801eb92167ab958;p=shutils.git

vim: reactivate all STL idents for prepending
---

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 8c716d4..a68602e 100644
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -136,9 +136,9 @@ function PrependCppNamespaceToIdent(ns, id)
     " in the middle begin with a star.
 
     " If #include and // and /* and ^* and :: is not prepend:
-    execute ':%s_\(\(#include\|\/\/\|\/\*\|^\s*\*[^/]\).*\|::\)\@<!\<' . a:id . '\>_' . a:ns . '::' . a:id . '_ge'
+    execute ':%s@\(\(#include\|\/\/\|\/\*\|^\s*\*[^/]\).*\|::\)\@<!\<' . a:id . '\>@' . a:ns . '::' . a:id . '@ge'
     " If #include and // and :: is not prepend, but */ is, and no further /* or // are found
-    execute ':%s_\(\(#include\|\/\/\).*\)\@<!\*\/\(\/[^\/\*]\|[^\/]\)*\zs\(::\)\@<!\<' . a:id . '\>_' . a:ns . '::' . a:id . '_ge'
+    execute ':%s@\(\(#include\|\/\/\).*\)\@<!\*\/\(\/[^\/\*]\|[^\/]\)*\zs\(::\)\@<!\<' . a:id . '\>@' . a:ns . '::' . a:id . '@ge'
 
 endfunction
 
@@ -155,7 +155,6 @@ function PrependSTLNamespace()
     let id = id +['queue', 'stack', 'priority_queue']
     let id = id +['ostream', 'istream', 'sstream']
     let id = id +['pair', 'string']
-    let id = ['map']
 
     for i in id
         call PrependCppNamespaceToIdent("std", i)