From a3df92f4839699388b096001b65c43f1a37273a3 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Thu, 19 Aug 2021 18:26:18 +0200
Subject: Remove more mentions of the removed `M-o' facemenu binding

* doc/emacs/text.texi (Fill Commands, Fill Commands): Adjust `M-o'
mentions.

* etc/refcards/refcard.tex (section{Formatting}):
* etc/refcards/pt-br-refcard.tex (section{Formatando}):
* etc/refcards/fr-refcard.tex (section{Formater}): Remove mention
of `M-o'.
---
 doc/emacs/commands.texi        |  2 +-
 doc/emacs/text.texi            |  5 ++---
 etc/facemenu-removal.txt       | 20 --------------------
 etc/refcards/de-refcard.tex    |  2 --
 etc/refcards/fr-refcard.tex    |  2 --
 etc/refcards/pt-br-refcard.tex |  2 --
 etc/refcards/refcard.tex       |  2 --
 7 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 etc/facemenu-removal.txt

diff --git a/doc/emacs/commands.texi b/doc/emacs/commands.texi
index 82a917ce7d1..f56f820b399 100644
--- a/doc/emacs/commands.texi
+++ b/doc/emacs/commands.texi
@@ -121,7 +121,7 @@ C-k} is two key sequences, not one.
   By default, the prefix keys in Emacs are @kbd{C-c}, @kbd{C-h},
 @kbd{C-x}, @kbd{C-x @key{RET}}, @kbd{C-x @@}, @kbd{C-x a}, @kbd{C-x
 n}, @kbd{C-x r}, @kbd{C-x t}, @kbd{C-x v}, @kbd{C-x 4}, @kbd{C-x 5},
-@kbd{C-x 6}, @key{ESC}, @kbd{M-g}, and @kbd{M-o}.  (@key{F1} and
+@kbd{C-x 6}, @key{ESC}, and @kbd{M-g}.  (@key{F1} and
 @key{F2} are aliases for @kbd{C-h} and @kbd{C-x 6}.)  This list is not
 cast in stone; if you customize Emacs, you can make new prefix keys.
 You could even eliminate some of the standard ones, though this is not
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 3b9d5c2ea6e..dc8ca903b72 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -572,7 +572,7 @@ Set the fill column (@code{set-fill-column}).
 Fill each paragraph in the region (@code{fill-region}).
 @item M-x fill-region-as-paragraph
 Fill the region, considering it as one paragraph.
-@item M-o M-s
+@item M-x center-line
 Center a line.
 @end table
 
@@ -621,10 +621,9 @@ numeric argument, it uses that as the new fill column.  With just
 @kbd{C-u} as argument, it sets @code{fill-column} to the current
 horizontal position of point.
 
-@kindex M-o M-s @r{(Text mode)}
 @cindex centering
 @findex center-line
-  The command @kbd{M-o M-s} (@code{center-line}) centers the current line
+  The command @kbd{M-x center-line} centers the current line
 within the current fill column.  With an argument @var{n}, it centers
 @var{n} lines individually and moves past them.  This binding is
 made by Text mode and is available only in that and related modes
diff --git a/etc/facemenu-removal.txt b/etc/facemenu-removal.txt
deleted file mode 100644
index 9a969df0e49..00000000000
--- a/etc/facemenu-removal.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-`facemenu-keymap' (normally bound to `M-o') has been disabled.
-==============================================================
-
-We've disabled the normal `M-o' keymap for a month (until March the
-10th, 2021) in the development version of Emacs to see whether anybody
-uses this feature.
-
-If the removal of this key binding doesn't annoy too many people, the
-plan is to then leave the it unbound, for usage by third-party
-packages and users.
-
-If you wish to restore the binding during the trial period, you can
-put the following in your .emacs file:
-
-(facemenu-keymap-restore)
-
-After the trial period is over, the function will be removed.
-
-If you wish to protest the removal of the `M-o' key binding, please
-send your thoughts to the emacs-devel@gnu.org mailing list.
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index c890acb69f4..9cd0df7a5ed 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -443,8 +443,6 @@ einen Rahmen statt eines Fensters.
 \key{Spalte f\"ur Umbruch auf {\it Argument\/} setzen}{C-x f}
 \key{Pr\"afix f\"ur jede Zeile setzen}{C-x .}
 
-\key{Face setzen}{M-o}
-
 \section{Gro\ss{}- und Kleinschreibung}
 
 \key{Wort in Gro\ss{}buchstaben}{M-u}
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index 34d7ebda19e..ad6db6340d4 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -446,8 +446,6 @@ pas les fen\^etres mais les cadres.
 \key{Placer la marge droite \`a {\it arg\/} colonnes}{C-u {\it arg\/} C-x f}
 \key{D\'efinir le pr\'efixe des lignes}{C-x .}
 
-\key{D\'efinir la fonte}{M-o}
-
 \section{Modifier la casse}
 
 \key{Mettre le mot en capitales}{M-u}
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 2d6680f7931..9226a6d8fba 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -452,8 +452,6 @@ para frame.
 \key{define a coluna limite de preenchimento}{C-x f}
 \key{define um prefixo para cada linha}{C-x .}
 
-\key{formata fonte}{M-o}
-
 \section{Mai{\'u}sculas e Min{\'u}sculas}
 
 \key{Palavra para mai{\'u}sculas}{M-u}
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 4cb8f9d50a2..ae39a4e9f76 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -457,8 +457,6 @@ frame instead of a window.
 \key{set fill column to {\it arg}}{C-x f}
 \key{set prefix each line starts with}{C-x .}
 
-\key{set face}{M-o}
-
 \section{Case Change}
 
 \key{uppercase word}{M-u}
-- 
cgit v1.2.3