updated for version 7.0037

diff --git a/runtime/keymap/polish-slash.vim b/runtime/keymap/polish-slash.vim
new file mode 100644 (file)
index 0000000..1a2f18c
--- /dev/null
+++ b/runtime/keymap/polish-slash.vim
@@ -0,0 +1,18 @@
+let encoding = &enc
+if encoding == 'latin1'
+    if has("unix")
+       let encoding = 'iso-8859-2'
+    else
+       let encoding = 'cp1250'
+    endif
+endif
+
+if encoding == 'utf-8'
+       source <sfile>:p:h/polish-slash_utf-8.vim
+elseif encoding == 'cp1250'
+       source <sfile>:p:h/polish-slash_cp1250.vim
+elseif encoding == 'iso-8859-2'
+       source <sfile>:p:h/polish-slash_iso-8859-2.vim
+else
+       source <sfile>:p:h/polish-slash_cp852.vim
+endif

diff --git a/src/search.c b/src/search.c
index 1d1bc3b31495f20d75d239ed383fe7a0acab45c8..17dc5bd4071293919aaeb214a80b100070043459 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -3124,13 +3124,14 @@ current_word(oap, count, include, bigword)
                return FAIL;
            if (include != (cls() == 0))
            {
-               if (fwd_word(1L, bigword, TRUE) == FAIL)
+               if (fwd_word(1L, bigword, TRUE) == FAIL && count > 1)
                    return FAIL;
                /*
                 * If end is just past a new-line, we don't want to include
-                * the first character on the line
+                * the first character on the line.
+                * Put cursor on last char of white.
                 */
-               if (oneleft() == FAIL)  /* put cursor on last char of white */
+               if (oneleft() == FAIL)
                    inclusive = FALSE;
            }
            else