--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -207,6 +207,8 @@
 'efm'	options.txt	/*'efm'*
 'ei'	options.txt	/*'ei'*
 'ek'	options.txt	/*'ek'*
+'emo'	options.txt	/*'emo'*
+'emoji'	options.txt	/*'emoji'*
 'enc'	options.txt	/*'enc'*
 'encoding'	options.txt	/*'encoding'*
 'endofline'	options.txt	/*'endofline'*
@@ -1286,6 +1288,7 @@
 +termresponse	various.txt	/*+termresponse*
 +textobjects	various.txt	/*+textobjects*
 +tgetent	various.txt	/*+tgetent*
++timers	various.txt	/*+timers*
 +title	various.txt	/*+title*
 +toolbar	various.txt	/*+toolbar*
 +user_commands	various.txt	/*+user_commands*
@@ -2620,6 +2623,8 @@ 90.5	usr_90.txt	/*90.5*
 :p	various.txt	/*:p*
 :pa	repeat.txt	/*:pa*
 :packadd	repeat.txt	/*:packadd*
+:packl	repeat.txt	/*:packl*
+:packloadall	repeat.txt	/*:packloadall*
 :pc	windows.txt	/*:pc*
 :pclose	windows.txt	/*:pclose*
 :pe	if_perl.txt	/*:pe*
@@ -4212,7 +4217,6 @@ E702	eval.txt	/*E702*
 E703	eval.txt	/*E703*
 E704	eval.txt	/*E704*
 E705	eval.txt	/*E705*
-E706	eval.txt	/*E706*
 E707	eval.txt	/*E707*
 E708	eval.txt	/*E708*
 E709	eval.txt	/*E709*
@@ -4444,6 +4448,11 @@ E917	eval.txt	/*E917*
 E918	channel.txt	/*E918*
 E919	repeat.txt	/*E919*
 E92	message.txt	/*E92*
+E920	channel.txt	/*E920*
+E921	channel.txt	/*E921*
+E922	eval.txt	/*E922*
+E923	eval.txt	/*E923*
+E924	quickfix.txt	/*E924*
 E93	windows.txt	/*E93*
 E94	windows.txt	/*E94*
 E95	message.txt	/*E95*
@@ -5170,6 +5179,7 @@ ch_evalexpr()	eval.txt	/*ch_evalexpr()*
 ch_evalraw()	eval.txt	/*ch_evalraw()*
 ch_getbufnr()	eval.txt	/*ch_getbufnr()*
 ch_getjob()	eval.txt	/*ch_getjob()*
+ch_info()	eval.txt	/*ch_info()*
 ch_log()	eval.txt	/*ch_log()*
 ch_logfile()	eval.txt	/*ch_logfile()*
 ch_open()	eval.txt	/*ch_open()*
@@ -5278,7 +5288,7 @@ clipboard-html	options.txt	/*clipboard-h
 clipboard-unnamed	options.txt	/*clipboard-unnamed*
 clipboard-unnamedplus	options.txt	/*clipboard-unnamedplus*
 clojure-indent	indent.txt	/*clojure-indent*
-close-cb	channel.txt	/*close-cb*
+close_cb	channel.txt	/*close_cb*
 cmdarg-variable	eval.txt	/*cmdarg-variable*
 cmdbang-variable	eval.txt	/*cmdbang-variable*
 cmdline-arguments	vi_diff.txt	/*cmdline-arguments*
@@ -5643,10 +5653,11 @@ end	intro.txt	/*end*
 end-of-file	pattern.txt	/*end-of-file*
 enlightened-terminal	syntax.txt	/*enlightened-terminal*
 erlang.vim	syntax.txt	/*erlang.vim*
-err-buf	channel.txt	/*err-buf*
-err-cb	channel.txt	/*err-cb*
-err-name	channel.txt	/*err-name*
-err-timeout	channel.txt	/*err-timeout*
+err_buf	channel.txt	/*err_buf*
+err_cb	channel.txt	/*err_cb*
+err_mode	channel.txt	/*err_mode*
+err_name	channel.txt	/*err_name*
+err_timeout	channel.txt	/*err_timeout*
 errmsg-variable	eval.txt	/*errmsg-variable*
 error-file-format	quickfix.txt	/*error-file-format*
 error-messages	message.txt	/*error-messages*
@@ -6765,10 +6776,11 @@ improved-viminfo	version5.txt	/*improved
 improvements-5	version5.txt	/*improvements-5*
 improvements-6	version6.txt	/*improvements-6*
 improvements-7	version7.txt	/*improvements-7*
-in-bot	channel.txt	/*in-bot*
-in-buf	channel.txt	/*in-buf*
-in-name	channel.txt	/*in-name*
-in-top	channel.txt	/*in-top*
+in_bot	channel.txt	/*in_bot*
+in_buf	channel.txt	/*in_buf*
+in_mode	channel.txt	/*in_mode*
+in_name	channel.txt	/*in_name*
+in_top	channel.txt	/*in_top*
 inactive-buffer	windows.txt	/*inactive-buffer*
 include-search	tagsrch.txt	/*include-search*
 inclusive	motion.txt	/*inclusive*
@@ -6846,21 +6858,22 @@ javascript-indenting	indent.txt	/*javasc
 job	channel.txt	/*job*
 job-callback	channel.txt	/*job-callback*
 job-channel-overview	channel.txt	/*job-channel-overview*
-job-close-cb	channel.txt	/*job-close-cb*
+job-close_cb	channel.txt	/*job-close_cb*
 job-control	channel.txt	/*job-control*
-job-err-cb	channel.txt	/*job-err-cb*
-job-err-io	channel.txt	/*job-err-io*
-job-exit-cb	channel.txt	/*job-exit-cb*
-job-in-io	channel.txt	/*job-in-io*
+job-err_cb	channel.txt	/*job-err_cb*
+job-err_io	channel.txt	/*job-err_io*
+job-exit_cb	channel.txt	/*job-exit_cb*
+job-in_io	channel.txt	/*job-in_io*
 job-options	channel.txt	/*job-options*
-job-out-cb	channel.txt	/*job-out-cb*
-job-out-io	channel.txt	/*job-out-io*
+job-out_cb	channel.txt	/*job-out_cb*
+job-out_io	channel.txt	/*job-out_io*
 job-start	channel.txt	/*job-start*
 job-start-if-needed	channel.txt	/*job-start-if-needed*
 job-start-nochannel	channel.txt	/*job-start-nochannel*
 job-stoponexit	channel.txt	/*job-stoponexit*
 job-term	channel.txt	/*job-term*
 job_getchannel()	eval.txt	/*job_getchannel()*
+job_info()	eval.txt	/*job_info()*
 job_setoptions()	eval.txt	/*job_setoptions()*
 job_start()	eval.txt	/*job_start()*
 job_status()	eval.txt	/*job_status()*
@@ -7511,6 +7524,7 @@ news	intro.txt	/*news*
 nextnonblank()	eval.txt	/*nextnonblank()*
 nice	todo.txt	/*nice*
 no-eval-feature	eval.txt	/*no-eval-feature*
+no-type-checking	eval.txt	/*no-type-checking*
 no_buffers_menu	gui.txt	/*no_buffers_menu*
 non-greedy	pattern.txt	/*non-greedy*
 non-zero-arg	eval.txt	/*non-zero-arg*
@@ -7579,10 +7593,11 @@ os_unix.txt	os_unix.txt	/*os_unix.txt*
 os_vms.txt	os_vms.txt	/*os_vms.txt*
 os_win32.txt	os_win32.txt	/*os_win32.txt*
 other-features	vi_diff.txt	/*other-features*
-out-buf	channel.txt	/*out-buf*
-out-cb	channel.txt	/*out-cb*
-out-name	channel.txt	/*out-name*
-out-timeout	channel.txt	/*out-timeout*
+out_buf	channel.txt	/*out_buf*
+out_cb	channel.txt	/*out_cb*
+out_mode	channel.txt	/*out_mode*
+out_name	channel.txt	/*out_name*
+out_timeout	channel.txt	/*out_timeout*
 p	change.txt	/*p*
 pack-add	repeat.txt	/*pack-add*
 packages	repeat.txt	/*packages*
@@ -8199,7 +8214,6 @@ startup-terminal	term.txt	/*startup-term
 static-tag	tagsrch.txt	/*static-tag*
 status-line	windows.txt	/*status-line*
 statusmsg-variable	eval.txt	/*statusmsg-variable*
-sticky-type-checking	eval.txt	/*sticky-type-checking*
 str2float()	eval.txt	/*str2float()*
 str2nr()	eval.txt	/*str2nr()*
 strcasestr()	eval.txt	/*strcasestr()*
@@ -8580,6 +8594,8 @@ throw-from-catch	eval.txt	/*throw-from-c
 throw-variables	eval.txt	/*throw-variables*
 throwpoint-variable	eval.txt	/*throwpoint-variable*
 time-functions	usr_41.txt	/*time-functions*
+timer_start()	eval.txt	/*timer_start()*
+timer_stop()	eval.txt	/*timer_stop()*
 timestamp	editing.txt	/*timestamp*
 timestamps	editing.txt	/*timestamps*
 tips	tips.txt	/*tips*
@@ -9028,6 +9044,11 @@ win32-term	os_win32.txt	/*win32-term*
 win32-vimrun	gui_w32.txt	/*win32-vimrun*
 win32-win3.1	os_win32.txt	/*win32-win3.1*
 win32s	os_win32.txt	/*win32s*
+win_findbuf()	eval.txt	/*win_findbuf()*
+win_getid()	eval.txt	/*win_getid()*
+win_gotoid()	eval.txt	/*win_gotoid()*
+win_id2tabwin()	eval.txt	/*win_id2tabwin()*
+win_id2win()	eval.txt	/*win_id2win()*
 winbufnr()	eval.txt	/*winbufnr()*
 wincol()	eval.txt	/*wincol()*
 window	windows.txt	/*window*