From 03080b554523732b5d53db62866e70bf090031e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Mon, 4 Jan 2021 14:04:04 +0100 Subject: [PATCH 1/4] Remove extraneous closing paren * doc/lispref/modes.texi (SMIE Indentation Example): Remove extraneous closing paren. --- doc/lispref/modes.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 27ca5441f4a..72740868a61 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -4165,7 +4165,7 @@ Here is an example of an indentation function: (`(,_ . ",") (smie-rule-separator kind)) (`(:after . ":=") sample-indent-basic) (`(:before . ,(or `"begin" `"(" `"@{"))) - (if (smie-rule-hanging-p) (smie-rule-parent))) + (if (smie-rule-hanging-p) (smie-rule-parent)) (`(:before . "if") (and (not (smie-rule-bolp)) (smie-rule-prev-p "else") (smie-rule-parent))))) From 33d0c603c6795488ed0283a1e83cb02eb290f567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Tue, 5 Jan 2021 12:17:13 +0100 Subject: [PATCH 2/4] ; * doc/lispref/modes.texi (SMIE Indentation Example): Fix previous commit --- doc/lispref/modes.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 72740868a61..746ea3eddd9 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -4164,8 +4164,8 @@ Here is an example of an indentation function: (`(:elem . basic) sample-indent-basic) (`(,_ . ",") (smie-rule-separator kind)) (`(:after . ":=") sample-indent-basic) - (`(:before . ,(or `"begin" `"(" `"@{"))) - (if (smie-rule-hanging-p) (smie-rule-parent)) + (`(:before . ,(or `"begin" `"(" `"@{")) + (if (smie-rule-hanging-p) (smie-rule-parent))) (`(:before . "if") (and (not (smie-rule-bolp)) (smie-rule-prev-p "else") (smie-rule-parent))))) From 97747e6fb9890ef528cbe21636cc99508efeba2b Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Tue, 5 Jan 2021 14:42:10 +0100 Subject: [PATCH 3/4] Tell people how to remove fontconfig customizations --- etc/PROBLEMS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 7499726678e..cfca598d608 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -693,6 +693,11 @@ versions of gnutls-cli, or use Emacs's built-in gnutls support. ** Characters are displayed as empty boxes or with wrong font under X. +*** This may be due to your local fontconfig customization. +Try removing or moving aside "$XDG_CONFIG_HOME/fontconfig/conf.d" and +"$XDG_CONFIG_HOME/fontconfig/fonts.conf" +($XDG_CONFIG_HOME is treated as "~/.config" if not set) + *** This can occur when two different versions of FontConfig are used. For example, XFree86 4.3.0 has one version and Gnome usually comes with a newer version. Emacs compiled with Gtk+ will then use the From 149d64bbb2b46f63c759fe4754bdf90eb6f2a3cc Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 5 Jan 2021 15:45:45 +0100 Subject: [PATCH 4/4] * doc/misc/tramp.texi (Quick Start Guide): Fix thinko. --- doc/misc/tramp.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index cabbc9d7269..0a968e39452 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -442,7 +442,7 @@ are optional, in case of a missing part a default value is assumed. The default value for an empty local file name part is the remote user's home directory. The shortest remote file name is @file{@trampfn{-,,}}, therefore. The @samp{-} notation for the -default host is used for syntactical reasons, @ref{Default Host}. +default method is used for syntactical reasons, @ref{Default Method}. The @code{method} part describes the connection method used to reach the remote host, see below.