[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 84372a7 1/3: Merge from origin/emacs-27

From: Glenn Morris
Subject: master 84372a7 1/3: Merge from origin/emacs-27
Date: Thu, 14 Jan 2021 10:55:26 -0500 (EST)

branch: master
commit 84372a710b480e1dd3ec90ae4a57d22284fb71a2
Merge: 707ee6a 149d64b
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    149d64bbb2 * doc/misc/tramp.texi (Quick Start Guide): Fix thinko.
    97747e6fb9 Tell people how to remove fontconfig customizations
    33d0c603c6 ; * doc/lispref/modes.texi (SMIE Indentation Example): Fix...
    03080b5545 Remove extraneous closing paren
 doc/lispref/modes.texi | 2 +-
 doc/misc/tramp.texi    | 2 +-
 etc/PROBLEMS           | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 9d38fe6..abc1254 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4241,7 +4241,7 @@ Here is an example of an indentation function:
     (`(:elem . basic) sample-indent-basic)
     (`(,_ . ",") (smie-rule-separator kind))
     (`(:after . ":=") sample-indent-basic)
-    (`(:before . ,(or `"begin" `"(" `"@{")))
+    (`(:before . ,(or `"begin" `"(" `"@{"))
      (if (smie-rule-hanging-p) (smie-rule-parent)))
     (`(:before . "if")
      (and (not (smie-rule-bolp)) (smie-rule-prev-p "else")
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 358f6fc..4195ef7 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -443,7 +443,7 @@ are optional, in case of a missing part a default value is 
 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.
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 25e129b..15e34ea 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -746,6 +746,11 @@ versions of gnutls-cli, or use Emacs's built-in gnutls 
 ** 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 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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]