diff runtime/doc/options.txt @ 8876:47f17f66da3d

commit https://github.com/vim/vim/commit/03413f44167c4b5cd0012def9bb331e2518c83cf Author: Bram Moolenaar <Bram@vim.org> Date: Tue Apr 12 21:07:15 2016 +0200 Updated runtime files.
author Christian Brabandt <cb@256bit.org>
date Tue, 12 Apr 2016 21:15:06 +0200
parents c1a5623cfc86
children 0bdeaf7092bc
line wrap: on
line diff
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.4.  Last change: 2016 Apr 03
+*options.txt*	For Vim version 7.4.  Last change: 2016 Apr 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -2646,7 +2646,7 @@ A jump table for the options with a shor
 	also 'gdefault' option.
 	Switching this option on is discouraged!
 
-						*'emoji'* *'emo'*
+					*'emoji'* *'emo'* *'noemoji'* *'noemo'*
 'emoji' 'emo'	boolean (default: on)
 			global
 			{not in Vi}
@@ -3634,7 +3634,7 @@ A jump table for the options with a shor
 		      HANGEUL, HEBREW, JOHAB, MAC, OEM, RUSSIAN, SHIFTJIS,
 		      SYMBOL, THAI, TURKISH, VIETNAMESE ANSI and BALTIC.
 		      Normally you would use "cDEFAULT".
-		qXX - quality XX.  Valid charsets are: PROOF, DRAFT,
+		qXX - quality XX.  Valid quality names are: PROOF, DRAFT,
 		      ANTIALIASED, UNANTIALIASED, CLEARTYPE, DEFAULT.
 		      Normally you would use "qDEFAULT".
 		      Some quality values isn't supported in legacy OSs.