From c843a00c38af485fac0fbe0d41f447e7c71b49c3 Mon Sep 17 00:00:00 2001
From: Ubaldo Tiberi <ubaldo.tiberi@volvo.com>
Date: Tue, 4 Aug 2026 12:56:27 +0200
Subject: [PATCH 1/2] Make guiligatures references more visible

---
 runtime/doc/gui.txt     | 3 ++-
 runtime/doc/options.txt | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 89fdb0137f4c8e..b0f5b4d7363f94 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1167,7 +1167,8 @@ Examples: >
     :set guifont=Andale_Mono:h7.5:w4.5
     :set guifont=Cascadia_Code:h14:fss19=1:fcalt=1:fliga=1
 
-See also |font-sizes|.
+See also |font-sizes|. Other relevant options to deal with GUI fonts on
+Windows are 'renderoptions' and 'guiligatures'.
 
 Note on Weights: Fonts often come with a variety of weights.  "Normal" weights
 in Windows have a value of 400 and, left unspecified, this is the value that
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a9d8f06f534565..ed7075a6b1d700 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5796,7 +5796,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The cursor is displayed at the start of the space a Tab character
 	occupies, not at the end as usual in Normal mode.  To get this cursor
 	position while displaying Tabs with spaces, use: >
-		:set list lcs=tab:\ \ 
+		:set list lcs=tab:\ \
 <
 	Note that list mode will also affect formatting (set with 'textwidth'
 	or 'wrapmargin') when 'cpoptions' includes 'L'.  See 'listchars' for
@@ -5866,7 +5866,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			omitted, the "tab" setting is used for leading tabs.
 			|lcs-tab| must also be set for this to work. *E1572*
 			You can combine it with "tab:", for example: >
-				:set listchars=tab:>-,leadtab:.\ 
+				:set listchars=tab:>-,leadtab:.\
 <			This shows leading tabs as periods(.) and other tabs
 			as ">--".
 							*lcs-trail*
@@ -7341,7 +7341,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		    emoji might be rendered beyond the bounding box of drawing
 		    cell.
 
-	Other render types are currently not supported.
+	Other render types are currently not supported. See also 'guiligatures'.
 
 						*'report'*
 'report'		number	(default 2)
@@ -8108,7 +8108,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			feature}
 	String to put at the start of lines that have been wrapped.  Useful
 	values are "> " or "+++ ": >
-		:set showbreak=>\ 
+		:set showbreak=>\
 <	Note the backslash to escape the trailing space.  It's easier like
 	this: >
 		:let &showbreak = '+++ '

From c122cc44218b72b6e6891c1720ab315897c0e694 Mon Sep 17 00:00:00 2001
From: Ubaldo Tiberi <ubaldo.tiberi@volvo.com>
Date: Tue, 4 Aug 2026 13:17:06 +0200
Subject: [PATCH 2/2] Readded trailing whitespaces

---
 runtime/doc/options.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index ed7075a6b1d700..f948e19606caa7 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5796,7 +5796,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The cursor is displayed at the start of the space a Tab character
 	occupies, not at the end as usual in Normal mode.  To get this cursor
 	position while displaying Tabs with spaces, use: >
-		:set list lcs=tab:\ \
+		:set list lcs=tab:\ \ 
 <
 	Note that list mode will also affect formatting (set with 'textwidth'
 	or 'wrapmargin') when 'cpoptions' includes 'L'.  See 'listchars' for
@@ -5866,7 +5866,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			omitted, the "tab" setting is used for leading tabs.
 			|lcs-tab| must also be set for this to work. *E1572*
 			You can combine it with "tab:", for example: >
-				:set listchars=tab:>-,leadtab:.\
+				:set listchars=tab:>-,leadtab:.\ 
 <			This shows leading tabs as periods(.) and other tabs
 			as ">--".
 							*lcs-trail*
@@ -8108,7 +8108,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			feature}
 	String to put at the start of lines that have been wrapped.  Useful
 	values are "> " or "+++ ": >
-		:set showbreak=>\
+		:set showbreak=>\ 
 <	Note the backslash to escape the trailing space.  It's easier like
 	this: >
 		:let &showbreak = '+++ '