updated for version 7.0031

diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index e738b83ba063b401d040ec614a3616ae91b08265..579068c5865dfd060ee1c78e0d65d96a9385a176 100644 (file)
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0aa.  Last change: 2004 Dec 21
+*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Jan 05
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -975,7 +975,7 @@ These two commands will keep on asking for lines, until you type a line
 containing only a ".".  Watch out for lines starting with a backslash, see
 |line-continuation|.
 NOTE: ":append" and ":insert" don't work properly in between ":if" and
-":endif".
+":endif", ":for" and ":endfor", ":while" and ":endwhile".
 
                                                        *:start* *:startinsert*
 :star[tinsert][!]      Start Insert mode just after executing this command.

diff --git a/src/gui_kde_wid.cc b/src/gui_kde_wid.cc
index 52d1c9eadc0bee23435db61b5a877dc44f9703cd..abaaa50277f29b0063c3a18b199b5fb179de8c17 100644 (file)
--- a/src/gui_kde_wid.cc
+++ b/src/gui_kde_wid.cc
@@ -1540,7 +1540,7 @@ SBPool::create(GuiScrollbar * sb, int orient)//{{{
     }
 
     connect(sb->w, SIGNAL(valueChanged(int)), &mapper, SLOT(map()));
-    mapper.setMapping(sb->w, (int)sb);
+    mapper.setMapping(sb->w, (long)sb);
 }//}}}
 
 

diff --git a/src/proto/ex_eval.pro b/src/proto/ex_eval.pro
index 8156c7aa7475c1b7218abc3c2453b558d7208a10..5bf22fa04b9d04b8c4fa7489e7fed3129d9f8095 100644 (file)
--- a/src/proto/ex_eval.pro
+++ b/src/proto/ex_eval.pro
@@ -27,5 +27,5 @@ void enter_cleanup __ARGS((cleanup_T *csp));
 void leave_cleanup __ARGS((cleanup_T *csp));
 int cleanup_conditionals __ARGS((struct condstack *cstack, int searched_cond, int inclusive));
 void ex_endfunction __ARGS((exarg_T *eap));
-int has_while_cmd __ARGS((char_u *p));
+int has_loop_cmd __ARGS((char_u *p));
 /* vim: set ft=c : */