vim: reactivate all STL idents for prepending

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 8c716d410c85344ece65201c3fee7c818bb2d6e4..a68602e9d83d09117f284bd94698d742a1ef8110 100644 (file)
--- 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)