diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 7ce599d4e7cce87f735b67ae0e530424d32a7566..04da892afd6ea25ec5d57f097101750cff370bdf 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 11
+*todo.txt*      For Vim version 7.0aa.  Last change: 2005 Mar 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -30,17 +30,22 @@ be worked on, but only if you sponsor Vim development.  See |sponsor|.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+"gq" should always leave the cursor after the formatted text, also when using
+'formatprg'.
+
+More commands like ":argadd" that should not have COUNT?
+
+- Added "undercurl" highlight attribute.  Based on a patch from Marcin Dalecki.
+  Docs for "guisp=Red"
+  Should add another byte for attributes, 200 types is not enough.
+  Implement "undercurl" for printing.
+
 Mac unicode patch (Da Woon Jung):
 - selecting proportional font breaks display
 - UTF-8 text causes display problems.  Font replacement causes this.
 
 Changes to mode bits in mch_open() also in Vim 6.3? (Bjoern Voigt)
 
-Patch for taglist() Yegappan Lakshmanan Feb 27
-- docs: use of ^ and $ in pattern, refer to |tag-regexp|
-	  explain what the fields mean.
-	  use of 'tags' option
-
 autoload:
 - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
   script names and a help file and produces a script that can be sourced to
@@ -61,15 +66,22 @@ Awaiting response:
 PLANNED FOR VERSION 7.0:
 
 -   Add SPELLCHECKER, with easy to add support for many languages.
-    - Do this with syntax highlighting for speed.  And avoids using an
-      external program like ispell or aspell.
+    - Need wordlists for many languages; "language pack"
+    - Commands required:
+	enable/disable spellchecking: 'spell' option (local to win)
+	set spellcheck language (allow English + other lang)
+	    :set langspell=en,du,pl
+	add word to private dict: wrong and OK (in popup menu for evim)
+	    :spell good <word>	    zg
+	    :spell wrong <word>	    zw
+    - Highlighting: SpellBad, SpellRare, SpellDialect
     - "engspchk" from Charles Campbell is a good starting point.
-    - Keep wordlist in syntax group, load it only once and use it several
-      times later.  Sort of global syntax items.
-    - Add "undercurl" highlight attribute.  Set color separately.
-      Patch from Marcin Dalecki. (2004 Dec)
-      Perhaps use "guicurl=Red" instead?
-      If underline and undercurl are both there use undercurl only.
+    - Do not use an external program like ispell or aspell: too slow and
+      doesn't work everywhere.
+    - Check spelling after syntax highlighting.  Also when there is no syntax
+      highlighting!
+    - Keep wordlist globally, load it only once and use it several times
+      later.  Sort of global syntax items.
     - Use wordlists from openoffice (myspell).  Work together with them to
       update the wordlist.  (Adri Verhoef, Aad Nales)
     - Support for approximate-regexps will help (agrep
diff --git a/runtime/lang/menu_vi_vn.vim b/runtime/lang/menu_vi_vn.vim
index efc008334712ab4adc448717c0bdb5697febc758..4b2b21f1dedab93a93317a86ffc2508636ab78ff 100644
--- a/runtime/lang/menu_vi_vn.vim
+++ b/runtime/lang/menu_vi_vn.vim
@@ -1,7 +1,7 @@
 " Menu Translations:	Vietnamese
 " Maintainer:		Phan Vinh Thinh <teppi@vnlinux.org>
-" Last Change:		23 Feb 2005
-" URL:			http://iatp.vspu.ac.ru/phan/vietvim/lang/menu_vi_VN.vim
+" Last Change:		12 Mar 2005
+" URL:			http://iatp.vspu.ac.ru/phan/vietvim/lang/menu_vi_vn.vim
 "
 "
 " Adopted for VietVim project by Phan Vinh Thinh.
@@ -20,8 +20,8 @@ scriptencoding utf-8
 " Top
 menutrans &File				&Tập\ tin
 menutrans &Edit				&Soạn\ thảo
-menutrans &Tools			&Công\ cụ
-menutrans &Syntax			Cú\ &pháp
+menutrans &Tools			Cô&ng\ cụ
+menutrans &Syntax			&Cú\ pháp
 menutrans &Buffers			&Bộ\ đệm
 menutrans &Window			Cử&a\ sổ
 menutrans &Help				Trợ\ &giúp
@@ -55,18 +55,18 @@ menutrans Save\ &As\.\.\.<Tab>:sav	Ghi\ n&hÆ°\.\.\.<Tab>:sav
 menutrans Split\ &Diff\ with\.\.\.	&So\ sánh\ với\.\.\.
 menutrans Split\ Patched\ &By\.\.\.	So\ sánh\ đã\ vá\ lỗi\ &bởi\.\.\.
 "--------------------
-menutrans &Print			&In
-menutrans Sa&ve-Exit<Tab>:wqa		Ghi\ nhớ\ rồ&i\ thoát <Tab>:wqa
-menutrans E&xit<Tab>:qa			Th&oát<Tab>:qa
+menutrans &Print			In\ &ra
+menutrans Sa&ve-Exit<Tab>:wqa		Ghi\ nhớ\ rồi\ th&oát <Tab>:wqa
+menutrans E&xit<Tab>:qa			&Thoát<Tab>:qa
 "
 "
 " Edit menu
 menutrans &Undo<Tab>u			&Hủy\ bước<Tab>u
 menutrans &Redo<Tab>^R			&Làm\ lại<Tab>^R
-menutrans Rep&eat<Tab>\.		Lặ&p lại<Tab>\.
+menutrans Rep&eat<Tab>\.		Lặ&p\ lại<Tab>\.
 "--------------------
 menutrans Cu&t<Tab>"+x			&Cắt<Tab>"+x
-menutrans &Copy<Tab>"+y			&Sao chép<Tab>"+y
+menutrans &Copy<Tab>"+y			&Sao\ chép<Tab>"+y
 menutrans &Paste<Tab>"+gP		&Dán<Tab>"+gP
 menutrans Put\ &Before<Tab>[p		Dán\ trướ&c<Tab>[p
 menutrans Put\ &After<Tab>]p		Dán\ sa&u<Tab>]p
@@ -74,31 +74,31 @@ menutrans &Delete<Tab>x			&Xóa<Tab>x
 menutrans &Select\ All<Tab>ggVG		Chọ&n\ tất\ cả<Tab>ggVG
 "--------------------
 menutrans &Find\.\.\.<Tab>/		&Tìm\ kiếm\.\.\.<Tab>/
-menutrans Find\ and\ Rep&lace\.\.\.     Tìm\ &kiếm\ và\ thay\ thế\.\.\.
-menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s     Tìm\ &kiếm\ và\ thay\ thế\.\.\.<Tab>:%s
-menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s     Tìm\ &kiếm\ và\ thay\ thế\.\.\<Tab>:s
+menutrans Find\ and\ Rep&lace\.\.\.     Tìm\ kiếm\ &và\ thay\ thế\.\.\.
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:%s     Tìm\ kiếm\ &và\ thay\ thế\.\.\.<Tab>:%s
+menutrans Find\ and\ Rep&lace\.\.\.<Tab>:s     Tìm\ kiếm\ &và\ thay\ thế\.\.\<Tab>:s
 "--------------------
-menutrans Settings\ &Window		&Cửa\ sổ\ thiết\ lập
-menutrans &Global\ Settings		Thiết\ &lập\ toàn\ cầu
-menutrans F&ile\ Settings		Thiết\ lập\ tập\ t&in
+menutrans Settings\ &Window		Cửa\ &sổ\ thiết\ lập
+menutrans &Global\ Settings		Thiết\ lập\ t&oàn\ cầu
+menutrans F&ile\ Settings		&Thiết\ lập\ tập\ t&in
 menutrans C&olor\ Scheme		Phối\ hợp\ màu\ &sắc
 menutrans &Keymap			Sơ\ đồ\ &bàn\ phím
 menutrans Select\ Fo&nt\.\.\.		Chọn\ &phông\ chữ\.\.\.
 ">>>----------------- Edit/Global settings
 menutrans Toggle\ Pattern\ &Highlight<Tab>:set\ hls!     &Chiếu\ sáng\ từ\ tìm\ thấy <Tab>:set\ hls!
-menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		 &Lờ\ đi\ kiểu\ chữ<Tab>:set\ ic!
+menutrans Toggle\ &Ignore-case<Tab>:set\ ic!		 &Không\ tính\ đến\ kiểu\ chữ<Tab>:set\ ic!
 menutrans Toggle\ &Showmatch<Tab>:set\ sm!		 Cho\ &biết\ phần\ tử\ có\ cặp<Tab>:set\ sm!
-menutrans &Context\ lines				 &Dòng\ quanh\ con\ trỏ
+menutrans &Context\ lines				 Số\ &dòng\ quanh\ con\ trỏ
 menutrans &Virtual\ Edit				 &Soạn\ thảo\ ảo
-menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		 C&hế\ độ\ chèn<Tab>:set\ im!
+menutrans Toggle\ Insert\ &Mode<Tab>:set\ im!		 Chế\ độ\ chè&n<Tab>:set\ im!
 menutrans Toggle\ Vi\ C&ompatible<Tab>:set\ cp!		 Tương\ thích\ với\ &Vi<Tab>:set\ cp!
 menutrans Search\ &Path\.\.\.				 Đường\ dẫn\ tìm\ &kiếm\.\.\.
-menutrans Ta&g\ Files\.\.\.				 Tập\ tin\ thẻ\ &ghi\.\.\.
+menutrans Ta&g\ Files\.\.\.				 Tập\ tin\ t&hẻ\ ghi\.\.\.
 "
-menutrans Toggle\ &Toolbar				 Thanh\ côn&g\ cụ
-menutrans Toggle\ &Bottom\ Scrollbar			 Thanh\ kéo\ ở\ &dưới
-menutrans Toggle\ &Left\ Scrollbar			 Thanh\ kéo\ ở\ &bên trái
-menutrans Toggle\ &Right\ Scrollbar			 Thanh\ kéo\ ở\ &bên phải
+menutrans Toggle\ &Toolbar				 Ẩn/hiện\ th&anh\ công\ cụ
+menutrans Toggle\ &Bottom\ Scrollbar		Ẩn/hiện\ thanh\ kéo\ nằ&m\ dưới
+menutrans Toggle\ &Left\ Scrollbar			 Ẩn/hiện\ thanh\ ké&o\ bên\ trái
+menutrans Toggle\ &Right\ Scrollbar			 Ẩn/hiện\ thanh\ kéo\ bên\ &phải
 ">>>->>>------------- Edit/Global settings/Virtual edit
 menutrans Never						 Tắt
 menutrans Block\ Selection				 Khi\ chọn\ khối
@@ -106,18 +106,38 @@ menutrans Insert\ mode					 Trong\ chế\ độ\ Chèn
 menutrans Block\ and\ Insert				 Khi\ chọn\ khối\ và\ Chèn
 menutrans Always					 Luôn\ luôn\ bật
 ">>>----------------- Edit/File settings
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	 Đánh\ số\ &dòng<Tab>:set\ nu!
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	 Đánh\ &số\ dòng<Tab>:set\ nu!
 menutrans Toggle\ &List\ Mode<Tab>:set\ list!		 &Chế\ độ\ danh\ sách<Tab>:set\ list!
 menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		 &Ngắt\ những\ dòng\ dài<Tab>:set\ wrap!
 menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	 Ngắt\ từ\ nguyên\ &vẹn<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!		 Dấ&u\ trắng\ thay\ cho\ tab<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!		 Tự\ độn&g\ thụt\ dòng<Tab>:set\ ai!
+menutrans Toggle\ &expand-tab<Tab>:set\ et!		 &Dấu\ trắng\ thay\ cho\ tab<Tab>:set\ et!
+menutrans Toggle\ &auto-indent<Tab>:set\ ai!		 &Tự\ động\ thụt\ dòng<Tab>:set\ ai!
 menutrans Toggle\ &C-indenting<Tab>:set\ cin!		 T&hụt\ dòng\ kiểu\ C<Tab>:set\ cin!
 ">>>---
 menutrans &Shiftwidth					 Chiều\ &rộng\ thụt\ dòng
 menutrans Soft\ &Tabstop				 Chiều\ rộng\ T&ab
-menutrans Te&xt\ Width\.\.\.				 Chiều\ rộng\ &văn\ bản\.\.\.
-menutrans &File\ Format\.\.\.				 Định\ dạng\ tập\ t&in\.\.\.
+menutrans Te&xt\ Width\.\.\.				 Chiều\ rộng\ văn\ &bản\.\.\.
+menutrans &File\ Format\.\.\.				 Định\ dạng\ tậ&p\ tin\.\.\.
+">>>----------------- Edit/File settings/Color Scheme
+menutrans default			Mặc\ định
+">>>----------------- Edit/File settings/Keymap
+menutrans None						Không\ dùng
+menutrans arabic					Ả\ rập
+menutrans czech						Séc
+menutrans esperanto					Etperantô
+menutrans greek						Hy\ Lạp
+menutrans hebrew					Do\ thái
+menutrans hebrewp					Do\ thái\ p
+menutrans lithuania-baltic			Lát-vi\ Bal-tíc
+menutrans magyar					Hungari
+menutrans persian-iranian			Iran\ Ba\ TÆ°
+menutrans persian					Ba\ TÆ°
+menutrans russian-jcuken			Nga\ jcuken
+menutrans russian-jcukenwin			Nga\ jcukenwin
+menutrans russian-yawerty			Nga\ yawerty
+menutrans serbian-latin				Xéc-bi\ La-tinh
+menutrans serbian					Xéc-bi
+menutrans slovak					slovak
 "
 "
 "
@@ -136,24 +156,24 @@ menutrans &Next\ Error<Tab>:cn				&Lỗi\ tiếp\ theo<Tab>:cn
 menutrans &Previous\ Error<Tab>:cp			Lá»—i\ t&rÆ°á»›c<Tab>:cp
 menutrans &Older\ List<Tab>:cold			Danh\ sách\ &cũ\ hơn<Tab>:cold
 menutrans N&ewer\ List<Tab>:cnew			Danh\ sách\ &mới\ hơn<Tab>:cnew
-menutrans Error\ &Window				Cửa\ sổ\ &lỗi
-menutrans &Set\ Compiler				Chọn\ trình\ biên\ &dịch
+menutrans Error\ &Window				Cử&a\ sổ\ lỗi
+menutrans &Set\ Compiler				C&họn\ trình\ biên\ dịch
 "-------------------
-menutrans &Convert\ to\ HEX<Tab>:%!xxd			&Chuyển\ thành\ HEX<Tab>:%!xxd
+menutrans &Convert\ to\ HEX<Tab>:%!xxd			Ch&uyển\ thành\ HEX<Tab>:%!xxd
 menutrans Conve&rt\ back<Tab>:%!xxd\ -r			Chuyển\ từ\ HE&X<Tab>:%!xxd\ -r
 ">>>---------------- Folds
-menutrans &Enable/Disable\ folds<Tab>zi			Bật/tắt\ nếp\ &gấp<Tab>zi
-menutrans &View\ Cursor\ Line<Tab>zv			Xe&m\ dòng\ có\ con\ trỏ<Tab>zv
-menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		Chỉ\ &xem\ dòng\ có\ con\ trỏ<Tab>zMzx
+menutrans &Enable/Disable\ folds<Tab>zi			&Bật/tắt\ nếp\ gấp<Tab>zi
+menutrans &View\ Cursor\ Line<Tab>zv			&Xem\ dòng\ có\ con\ trỏ<Tab>zv
+menutrans Vie&w\ Cursor\ Line\ only<Tab>zMzx		&Chỉ\ xem\ dòng\ có\ con\ trỏ<Tab>zMzx
 menutrans C&lose\ more\ folds<Tab>zm			Đóng\ &nhiều\ nếp\ gấp\ hơn<Tab>zm
 menutrans &Close\ all\ folds<Tab>zM			Đóng\ mọi\ nếp\ &gấp<Tab>zM
 menutrans &Open\ all\ folds<Tab>zR			&Mở\ mọi\ nếp\ gấp<Tab>zR
-menutrans O&pen\ more\ folds<Tab>zr			Отк&рыть\ больше\ складок<Tab>zr
+menutrans O&pen\ more\ folds<Tab>zr			Mở\ n&hiều\ nếp\ gấp\ hơn<Tab>zr
 menutrans Fold\ Met&hod					&Phương\ pháp\ gấp
 menutrans Create\ &Fold<Tab>zf				&Tạo\ nếp\ gấp<Tab>zf
-menutrans &Delete\ Fold<Tab>zd				&Xóa\ nếp\ gấp<Tab>zd
+menutrans &Delete\ Fold<Tab>zd				Xó&a\ nếp\ gấp<Tab>zd
 menutrans Delete\ &All\ Folds<Tab>zD			Xóa\ mọ&i\ nếp\ gấp<Tab>zD
-menutrans Fold\ col&umn\ width				&Chiều\ rộng\ cột\ nếp\ gấp
+menutrans Fold\ col&umn\ width				Chiều\ &rộng\ cột\ nếp\ gấp
 ">>>->>>----------- Tools/Folds/Fold Method
 menutrans M&anual					&Thủ\ công
 menutrans I&ndent					Thụt\ &dòng
@@ -166,7 +186,7 @@ menutrans &Get\ Block					&Thay\ đổi\ bộ\ đệm\ này
 menutrans &Put\ Block					T&hay\ đổi\ bộ\ đệm\ khác
 ">>>--------------- Tools/Diff/Error window
 menutrans &Update<Tab>:cwin				&Cập\ nhật<Tab>:cwin
-menutrans &Close<Tab>:cclose				Đón&g<Tab>:cclose
+menutrans &Close<Tab>:cclose				Đó&ng<Tab>:cclose
 menutrans &Open<Tab>:copen				&Mở<Tab>:copen
 "
 "
@@ -180,8 +200,23 @@ menutrans &Manual					&Bằng\ tay
 menutrans A&utomatic					Tá»±\ Ä‘á»™&ng
 menutrans on/off\ for\ &This\ file			Bật\ tắt\ &cho\ tập\ tin\ này
 menutrans Co&lor\ test					&Kiểm\ tra\ màu\ sắc
-menutrans &Highlight\ test				Kiểm\ tra\ c&hiếu\ sáng
+menutrans &Highlight\ test				Kiểm\ tra\ chiếu\ &sáng
 menutrans &Convert\ to\ HTML				&Chuyển\ thành\ HTML
+">>>---------------- Syntax/AB
+menutrans Apache\ config					Cấu\ hình\ Apache
+menutrans Ant\ build\ file					Tập\ tin\ biên\ dịch\ Ant
+menutrans Apache-style\ config				Cấu\ hình\ phong\ cách\ Apache
+menutrans Arc\ Macro\ Language				Ngôn\ ngữ\ Macro\ Arc
+menutrans Arch\ inventory					Kiểm\ kê\ Arch
+menutrans ASP\ with\ VBScript				ASP\ vá»›i\ VBScript
+menutrans ASP\ with\ Perl					ASP\ vá»›i\ Perl
+menutrans BC\ calculator					Máy\ tính\ BC
+menutrans BDF\ font							Phông\ chữ\ BDF
+menutrans blank								không\ dùng
+">>>---------------- Syntax/C
+menutrans Calendar							Lịch
+menutrans Cheetah\ template					Mẫu\ Cheetah
+menutrans Config							Cấu\ hình
 "
 "
 " Buffers menu
@@ -198,18 +233,18 @@ menutrans [No\ File]					[Không\ có\ tập\ tin]
 "
 menutrans &New<Tab>^Wn					&Má»›i<Tab>^Wn
 menutrans S&plit<Tab>^Ws				&Chia\ đôi<Tab>^Ws
-menutrans Sp&lit\ To\ #<Tab>^W^^			Chia &tá»›i #<Tab>^W^^
+menutrans Sp&lit\ To\ #<Tab>^W^^			Chia\ &tá»›i\ #<Tab>^W^^
 menutrans Split\ &Vertically<Tab>^Wv			Chia\ &dọc<Tab>^Wv
-menutrans Split\ File\ E&xplorer			&Mở\ trình\ duyệt\ tập\ tin
+menutrans Split\ File\ E&xplorer			Mở\ trình\ &duyệt\ tập\ tin
 "
 menutrans &Close<Tab>^Wc				Đó&ng<Tab>^Wc
 menutrans Close\ &Other(s)<Tab>^Wo			Đóng\ các\ cửa\ sổ\ &khác<Tab>^Wo
 "
-menutrans Move\ &To					Ch&uyển tới
+menutrans Move\ &To					C&huyển\ tới
 menutrans Rotate\ &Up<Tab>^WR				&Lên\ trên<Tab>^WR
 menutrans Rotate\ &Down<Tab>^Wr				&Xuống\ dưới<Tab>^Wr
 "
-menutrans &Equal\ Size<Tab>^W=				Cân\ bằng\ &kích\ thước<Tab>^W=
+menutrans &Equal\ Size<Tab>^W=				Cân\ &bằng\ kích\ thước<Tab>^W=
 menutrans &Max\ Height<Tab>^W_				Chiều\ c&ao\ lớn\ nhất<Tab>^W_
 menutrans M&in\ Height<Tab>^W1_				Chiều\ ca&o\ nhỏ\ nhất<Tab>^W1_
 menutrans Max\ &Width<Tab>^W\|				Chiều\ &rộng\ lớn\ nhất<Tab>^W\|
@@ -245,13 +280,13 @@ if has("toolbar")
     tmenu ToolBar.Open					Mở tập tin
     tmenu ToolBar.Save					Ghi nhớ tập tin
     tmenu ToolBar.SaveAll				Ghi nhớ tất cả
-    tmenu ToolBar.Print					In
+    tmenu ToolBar.Print					In ra
     tmenu ToolBar.Undo					Hủy bước
     tmenu ToolBar.Redo					Làm lại
     tmenu ToolBar.Cut					Cắt
     tmenu ToolBar.Copy					Sao chép
     tmenu ToolBar.Paste					Dán
-    tmenu ToolBar.Find					Tìm...
+    tmenu ToolBar.Find					Tìm kiếm
     tmenu ToolBar.FindNext				Tìm tiếp theo
     tmenu ToolBar.FindPrev				Tìm ngược lại
     tmenu ToolBar.Replace				Thay thế...
diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim
index ced8e96d91a1fa92aead470f7f87a72167c49852..78691710f5ccd09561d296ac6075b7da3db45180 100644
--- a/runtime/syntax/logtalk.vim
+++ b/runtime/syntax/logtalk.vim
@@ -2,7 +2,7 @@
 "
 " Language:	Logtalk
 " Maintainer:	Paulo Moura <pmoura@logtalk.org>
-" Last Change:	2004 July 7
+" Last Change:	March 12, 2005
 
 
 " Quit when a syntax file was already loaded:
@@ -69,13 +69,14 @@ syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="implements("	m
 
 " Logtalk directives
 
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- alias("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- initialization("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- info("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
-syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- mode("		matchgroup=logtalkDirTag	end=")\."	contains=logtalkOperator,logtalkAtom
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- mode("		matchgroup=logtalkDirTag	end=")\."	contains=logtalkOperator, logtalkAtom
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- dynamic("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn match	logtalkDirTag		":- dynamic\."
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- discontiguous("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
-syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- multifile("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- multifile("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- public("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- protected("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
 syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- private("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
@@ -104,10 +105,9 @@ syn match	logtalkBuiltIn		"\<current_event\ze("
 
 syn match	logtalkBuiltIn		"\<\(current\|set\)_logtalk_flag\ze("
 
-syn match	logtalkBuiltIn		"\<logtalk_\(compile\|load\)\ze("
+syn match	logtalkBuiltIn		"\<logtalk_\(compile\|l\(ibrary_path\|oad\)\)\ze("
 
-syn match	logtalkBuiltIn		"\<forall\ze("
-syn match	logtalkBuiltIn		"\<retractall\ze("
+syn match	logtalkBuiltIn		"\<\(for\|retract\)all\ze("
 
 
 " Logtalk built-in methods
@@ -131,6 +131,7 @@ syn match	logtalkBuiltInMethod	"\<f\(ind\|or\)all\ze("
 syn match	logtalkBuiltInMethod	"\<before\ze("
 syn match	logtalkBuiltInMethod	"\<after\ze("
 
+syn match	logtalkBuiltInMethod	"\<expand_term\ze("
 syn match	logtalkBuiltInMethod	"\<phrase\ze("
 
 
@@ -191,7 +192,7 @@ syn match	logtalkKeyword		"\<copy_term\ze("
 
 " Arithemtic evaluation
 
-syn keyword	logtalkOperator		is
+syn match	logtalkOperator		"\<is\>"
 
 
 " Arithemtic comparison
@@ -327,7 +328,7 @@ syn match	logtalkNumber		"\<0o[0-7]\+\>"
 syn match	logtalkNumber		"\<0x[0-9a-fA-F]\+\>"
 
 
-syn sync ccomment maxlines=50
+syn sync ccomment logtalkBlockComment maxlines=50
 
 
 " Define the default highlighting.
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 2e58851d5f9f54802ac98b806cfc8cdd6b158439..791762c042f7134b4b1b46ff286ce408e633fa02 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5867,7 +5867,6 @@ struct sign
     int		sn_text_hl;	/* highlight ID for text */
 };
 
-#define MAX_TYPENR 255		/* depends on sattr_T */
 static sign_T	*first_sign = NULL;
 static int	last_sign_typenr = MAX_TYPENR;	/* is decremented */
 
diff --git a/src/proto/gui_x11.pro b/src/proto/gui_x11.pro
index 7308cd3de7c0dae67f48cbc0eb6c33f48da44715..f49f590f4c4c2006cb7c21f2d3b7fc85eb8c1e03 100644
--- a/src/proto/gui_x11.pro
+++ b/src/proto/gui_x11.pro
@@ -27,6 +27,7 @@ int fontset_height2 __ARGS((XFontSet fs));
 guicolor_T gui_mch_get_color __ARGS((char_u *reqname));
 void gui_mch_set_fg_color __ARGS((guicolor_T color));
 void gui_mch_set_bg_color __ARGS((guicolor_T color));
+void gui_mch_set_sp_color __ARGS((guicolor_T color));
 void gui_mch_draw_string __ARGS((int row, int col, char_u *s, int len, int flags));
 int gui_mch_haskey __ARGS((char_u *name));
 int gui_get_x11_windis __ARGS((Window *win, Display **dis));