From cad8913c89fa2c15d6d6ac4fe0c63b6731981472 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 20 Apr 2021 15:12:10 +0300 Subject: Improve filling-related documentation * doc/emacs/text.texi (Auto Fill, Fill Commands): Mention special line-breaking rules for CJK characters and the kinsoku rules. (Bug#47856) * lisp/textmodes/fill.el (fill-separate-heterogeneous-words-with-space): Doc fix. --- doc/emacs/text.texi | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) (limited to 'doc/emacs/text.texi') diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 208f8a19a9a..2f924b4f7f5 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -502,8 +502,8 @@ text. @cindex mode, Auto Fill @dfn{Auto Fill} mode is a buffer-local minor mode (@pxref{Minor -Modes}) in which lines are broken automatically at spaces when the -line becomes too wide. +Modes}) in which lines are broken automatically when the line becomes +too wide and you type @kbd{@key{SPC}} or @kbd{@key{RET}}. @table @kbd @item M-x auto-fill-mode @@ -522,12 +522,21 @@ certain major modes, add @code{auto-fill-mode} to the mode hooks (@pxref{Major Modes}). When Auto Fill mode is enabled, the mode indicator @samp{Fill} appears in the mode line (@pxref{Mode Line}). - Auto Fill mode breaks lines automatically at spaces whenever they -get longer than the desired width. This line breaking occurs only -when you type @key{SPC} or @key{RET}. If you wish to insert a space -or newline without permitting line-breaking, type @kbd{C-q @key{SPC}} -or @kbd{C-q C-j} respectively. Also, @kbd{C-o} inserts a newline -without line breaking. + Auto Fill mode breaks lines automatically at the appropriate places +whenever lines get longer than the desired width. This line breaking +occurs only when you type @kbd{@key{SPC}} or @kbd{@key{RET}}. If you +wish to insert a space or newline without permitting line-breaking, +type @kbd{C-q @key{SPC}} or @kbd{C-q C-j} respectively. Also, +@kbd{C-o} inserts a newline without line breaking. + +@cindex kinsoku line-breaking rules + The place where Auto Fill breaks a line depends on the line's +characters. For characters from @acronym{ASCII}, Latin, and most +other scripts Emacs breaks a line on space characters, to keep the +words intact. But for CJK scripts, a line can be broken between any +two characters. (If you load the @file{kinsoku} library, Emacs will +avoid breaking a line between certain pairs of CJK characters, where +special rules prohibit that.) When Auto Fill mode breaks a line, it tries to obey the @dfn{adaptive fill prefix}: if a fill prefix can be deduced from the @@ -549,6 +558,9 @@ described in the next section. (@pxref{Fill Commands}). @end ifnottex + A similar feature that wraps long lines automatically at display +time is Visual Line Mode (@pxref{Visual Line Mode}). + @node Fill Commands @subsection Explicit Fill Commands @@ -571,7 +583,11 @@ Center a line. current paragraph. It redistributes the line breaks within the paragraph, and deletes any excess space and tab characters occurring within the paragraph, in such a way that the lines end up fitting -within a certain maximum width. +within a certain maximum width. Like Auto Fill mode, this and other +filling commands usually break lines at space characters, but for CJK +characters these commands can break a line between almost any two +characters, and they can also obey the kinsoku rules. @xref{Auto +Fill}. @findex fill-region Normally, @kbd{M-q} acts on the paragraph where point is, but if @@ -645,8 +661,8 @@ or before @samp{)}, @samp{:} or @samp{?}); and even if preceded by a non-whitespace character). Emacs can display an indicator in the @code{fill-column} position -using the Display fill column indicator mode -(@pxref{Displaying Boundaries, display-fill-column-indicator}). +using the Display fill column indicator mode (@pxref{Displaying +Boundaries, display-fill-column-indicator}). @node Fill Prefix @subsection The Fill Prefix -- cgit v1.2.3 From bf8b8cc6c57e051e11306aa9c409dc4ed8c442bc Mon Sep 17 00:00:00 2001 From: Sebastian Urban Date: Sun, 16 May 2021 15:29:39 +0200 Subject: Improve some quotation quoting in the Emacs manual * doc/emacs/text.texi (Quotation Marks, Quotation Marks): * doc/emacs/display.texi (Text Display): Fix some issues when quoting quote marks and the like (bug#35885). * doc/emacs/emacs.texi: Switch on double-sided printing headings. Copyright-paperwork-exempt: yes --- doc/emacs/basic.texi | 2 +- doc/emacs/display.texi | 8 ++++---- doc/emacs/emacs.texi | 1 + doc/emacs/text.texi | 15 +++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'doc/emacs/text.texi') diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 4a34fd36c5d..666a479582a 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi @@ -112,7 +112,7 @@ just like digits. Case is ignored. @cindex curly quotes, inserting @cindex curved quotes, inserting A few common Unicode characters can be inserted via a command -starting with @kbd{C-x 8}. For example, @kbd{C-x 8 [} inserts @t{‘} +starting with @w{@kbd{C-x 8}}. For example, @kbd{C-x 8 [} inserts @t{‘} which is Unicode code-point U+2018 @sc{left single quotation mark}, sometimes called a left single ``curved quote'' or ``curly quote''. Similarly, @w{@kbd{C-x 8 ]}}, @kbd{C-x 8 @{} and @kbd{C-x 8 @}} insert the diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 58d08b43c0e..5fccdaa8343 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -1649,10 +1649,10 @@ for details. @cindex curved quotes, and terminal capabilities @cindex @code{homoglyph} face -Emacs tries to determine if the curved quotes @samp{‘} and @samp{’} +Emacs tries to determine if the curved quotes @t{‘} and @t{’} can be displayed on the current display. By default, if this seems to -be so, then Emacs will translate the @acronym{ASCII} quotes (@samp{`} -and @samp{'}), when they appear in messages and help texts, to these +be so, then Emacs will translate the @acronym{ASCII} quotes @w{(@samp{`} +and @samp{'})}, when they appear in messages and help texts, to these curved quotes. You can influence or inhibit this translation by customizing the user option @code{text-quoting-style} (@pxref{Keys in Documentation,,, elisp, The Emacs Lisp Reference Manual}). @@ -1661,7 +1661,7 @@ Documentation,,, elisp, The Emacs Lisp Reference Manual}). known to look just like @acronym{ASCII} characters, they are shown with the @code{homoglyph} face. Curved quotes that are known not to be displayable are shown as their @acronym{ASCII} approximations -@t{`}, @t{'}, and @t{"} with the @code{homoglyph} face. +@samp{`}, @samp{'}, and @samp{"} with the @code{homoglyph} face. @node Cursor Display @section Displaying the Cursor diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 590dc42d155..e0de3bb43aa 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -99,6 +99,7 @@ Cover art by Etienne Suvasa; cover design by Matt Lee. @end titlepage +@headings double @summarycontents @contents diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 2c9d486c331..f2fe2480154 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -421,13 +421,12 @@ beginning of a line. @cindex curved quotes @cindex guillemets @findex electric-quote-mode -@c The funny quoting below is to make the printed version look -@c correct. FIXME. + One common way to quote is the typewriter convention, which quotes -using straight apostrophes @t{'like this'} or double-quotes @t{"like +using straight apostrophes @samp{'like this'} or double-quotes @samp{"like this"}. Another common way is the curved quote convention, which uses -left and right single or double quotation marks `@t{like this}' or -``@t{like this}''@footnote{ +left and right single or double quotation marks @t{‘like this’} or +@t{“like this”}@footnote{ The curved single quote characters are U+2018 @sc{left single quotation mark} and U+2019 @sc{right single quotation mark}; the curved double quotes are U+201C @sc{left double quotation mark} and U+201D @sc{right double @@ -445,7 +444,7 @@ default quotes listed above, by customizing the variable @code{electric-quote-chars}, a list of four characters, where the items correspond to the left single quote, the right single quote, the left double quote and the right double quote, respectively, whose -default value is @code{'(?@r{`} ?@r{'} ?@r{``} ?@r{''})}. +default value is @w{@code{'(@w{?}‘ ?’ ?“ ?”)}}. @vindex electric-quote-paragraph @vindex electric-quote-comment @@ -461,7 +460,7 @@ variables. @vindex electric-quote-replace-double You can also set the option @code{electric-quote-replace-double} to -a non-@code{nil} value. Then, typing @t{"} insert an appropriate +a non-@code{nil} value. Then, typing @kbd{"} insert an appropriate curved double quote depending on context: @t{“} at the beginning of the buffer or after a line break, whitespace, opening parenthesis, or quote character, and @t{”} otherwise. @@ -473,7 +472,7 @@ To toggle it globally, type type @kbd{C-q `} or @kbd{C-q '} instead of @kbd{`} or @kbd{'}. To insert a curved quote even when Electric Quote is disabled or inactive, you can type @kbd{C-x 8 [} for @t{‘}, @kbd{C-x 8 ]} for -@t{’}, @kbd{C-x 8 @{} for ``, and @kbd{C-x 8 @}} for ''. +@t{’}, @kbd{C-x 8 @{} for @t{“}, and @kbd{C-x 8 @}} for @t{”}. @xref{Inserting Text}. Note that the value of @code{electric-quote-chars} does not affect these keybindings, they are not keybindings of @code{electric-quote-mode} but bound in -- cgit v1.2.3 From 31ed5a8c12b23011d23ccaec2b7a8d532013c83e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 4 Jul 2021 14:55:42 +0300 Subject: Avoid deprecation warnings with Texinfo 6.8 * doc/lispref/functions.texi (Function Safety): * doc/misc/srecode.texi (Parts of SRecode): * doc/misc/wisent.texi (Wisent Semantic, Wisent Lex): * doc/misc/pcl-cvs.texi (Editing files): * doc/misc/bovine.texi (top, Starting Rules) (Bovine Grammar Rules, How Lexical Tokens Match) (Optional Lambda Expression): * doc/emacs/msdos.texi (Windows Keyboard): * doc/emacs/buffers.texi (Several Buffers): * doc/emacs/text.texi (Text): Avoid using @inforef, which is deprecated. --- doc/emacs/buffers.texi | 3 --- doc/emacs/msdos.texi | 9 --------- doc/emacs/text.texi | 2 +- doc/lispref/functions.texi | 11 ++++++----- doc/misc/bovine.texi | 25 ++++++++++++++----------- doc/misc/pcl-cvs.texi | 2 +- doc/misc/srecode.texi | 2 +- doc/misc/wisent.texi | 6 +++--- 8 files changed, 26 insertions(+), 34 deletions(-) (limited to 'doc/emacs/text.texi') diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index bec7f37547c..c4e5bc32b7c 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi @@ -586,9 +586,6 @@ every @code{auto-revert-interval} seconds if you enable Auto Revert mode in this buffer, as long as it is not marked modified. Global Auto Revert mode applies to the @file{*Buffer List*} buffer only if @code{global-auto-revert-non-file-buffers} is non-@code{nil}. -@iftex -@inforef{Auto Reverting the Buffer Menu,, emacs-xtra}, for details. -@end iftex @ifnottex @xref{Auto Reverting the Buffer Menu, global-auto-revert-non-file-buffers}, for details. @end ifnottex diff --git a/doc/emacs/msdos.texi b/doc/emacs/msdos.texi index 4b58f6aa2f7..33d389acd50 100644 --- a/doc/emacs/msdos.texi +++ b/doc/emacs/msdos.texi @@ -549,10 +549,6 @@ meanings by enabling CUA Mode (@pxref{CUA Bindings}). Another optional feature which will make Emacs behave like other Windows applications is Delete Selection mode (@pxref{Using Region}). -@iftex -@inforef{Windows Keyboard, , emacs}, for information about additional -Windows-specific variables in this category. -@end iftex @ifnottex @vindex w32-alt-is-meta @cindex @code{Alt} key (MS-Windows) @@ -1176,11 +1172,6 @@ the default when such software is detected when running Emacs. When this variable is non-@code{nil}, other variables affecting the cursor display have no effect. -@iftex -@inforef{Windows Misc, , emacs}, for information about additional -Windows-specific variables in this category. -@end iftex - @ifnottex @vindex w32-grab-focus-on-raise @cindex frame focus policy, MS-Windows diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index f2fe2480154..c9c4be3c61d 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -61,7 +61,7 @@ use Picture mode, a special major mode for editing such pictures. @cindex autotyping @cindex automatic typing The automatic typing features may be useful when writing text. -@inforef{Top,The Autotype Manual,autotype}. +@xref{Top, Autotyping, The Autotype Manual, autotype}. @end ifinfo @menu diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 64883bf0f63..77d1465c876 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -2421,11 +2421,12 @@ opposed to an unspecified one). @cindex safety of functions Some major modes, such as SES, call functions that are stored in user -files. (@inforef{Top, ,ses}, for more information on SES@.) User -files sometimes have poor pedigrees---you can get a spreadsheet from -someone you've just met, or you can get one through email from someone -you've never met. So it is risky to call a function whose source code -is stored in a user file until you have determined that it is safe. +files. (@xref{Top, Simple Emacs Spreadsheet,,ses}, for more +information on SES@.) User files sometimes have poor pedigrees---you +can get a spreadsheet from someone you've just met, or you can get one +through email from someone you've never met. So it is risky to call a +function whose source code is stored in a user file until you have +determined that it is safe. @defun unsafep form &optional unsafep-vars Returns @code{nil} if @var{form} is a @dfn{safe} Lisp expression, or diff --git a/doc/misc/bovine.texi b/doc/misc/bovine.texi index 780f0addb59..9bfb117d1a5 100644 --- a/doc/misc/bovine.texi +++ b/doc/misc/bovine.texi @@ -78,13 +78,13 @@ The @dfn{bovine} parser is the original @semantic{} parser, and is an implementation of an @acronym{LL} parser. It is good for simple languages. It has many conveniences making grammar writing easy. The conveniences make it less powerful than a Bison-like @acronym{LALR} -parser. For more information, @inforef{Top, The Wisent Parser Manual, +parser. For more information, @pxref{Top,, Wisent Parser Development, wisent}. Bovine @acronym{LL} grammars are stored in files with a @file{.by} extension. When compiled, the contents is converted into a file of the form @file{NAME-by.el}. This, in turn is byte compiled. -@inforef{top, Grammar Framework Manual, grammar-fw}. +@xref{top,, Grammar Framework Manual, grammar-fw}. @ifnottex @insertcopying @@ -105,7 +105,8 @@ the form @file{NAME-by.el}. This, in turn is byte compiled. In Bison, one and only one nonterminal is designated as the ``start'' symbol. In @semantic{}, one or more nonterminals can be designated as the ``start'' symbol. They are declared following the @code{%start} -keyword separated by spaces. @inforef{start Decl, ,grammar-fw}. +keyword separated by spaces. @xref{start Decl,, Grammar Framework +Manual, grammar-fw}. If no @code{%start} keyword is used in a grammar, then the very first is used. Internally the first start nonterminal is targeted by the @@ -115,7 +116,8 @@ parser harness. To find locally defined variables, the local context handler needs to parse the body of functional code. The @code{scopestart} declaration specifies the name of a nonterminal used as the goal to parse a local -context, @inforef{scopestart Decl, ,grammar-fw}. Internally the +context, @pxref{scopestart Decl,, Grammar Framework Manual, +grammar-fw}. Internally the scopestart nonterminal is targeted by the reserved symbol @code{bovine-inner-scope}, so it can be found by the parser harness. @@ -124,7 +126,7 @@ scopestart nonterminal is targeted by the reserved symbol The rules are what allow the compiler to create tags from a language file. Once the setup is done in the prologue, you can start writing -rules. @inforef{Grammar Rules, ,grammar-fw}. +rules. @xref{Grammar Rules,, Grammar Framework Manual, grammar-fw}. @example @var{result} : @var{components1} @var{optional-semantic-action1}) @@ -146,8 +148,8 @@ A particular @var{result} written into your grammar becomes the parser's goal. It is designated by a @code{%start} statement (@pxref{Starting Rules}). The value returned by the associated @var{optional-semantic-action} is the parser's result. It should be -a tree of @semantic{} @dfn{tags}, @inforef{Semantic Tags, , -semantic-appdev}. +a tree of @semantic{} @dfn{tags}, @pxref{Semantic Tags,, Semantic +Application Development, semantic-appdev}. @var{components} is made up of symbols. A symbol such as @code{FOO} means that a syntactic token of class @code{FOO} must be matched. @@ -170,8 +172,9 @@ For instance: @end example Means that @code{FOO} is a reserved language keyword, matched as such -by looking up into a keyword table, @inforef{keyword Decl, -,grammar-fw}. This is because @code{"foo"} will be converted to +by looking up into a keyword table, @pxref{keyword Decl,, Grammar +Framework Manual, grammar-fw}. This is because @code{"foo"} will be +converted to @code{FOO} in the lexical analysis stage. Thus the symbol @code{FOO} won't be available any other way. @@ -383,8 +386,8 @@ Is an optional set of labeled values such as @code{:constant-flag t :parent Create a tag with @var{name} of respectively the class @code{variable}, @code{function}, @code{type}, @code{include}, @code{package}, and @code{code}. -See @inforef{Creating Tags, , semantic-appdev} for the lisp -functions these translate into. +See @ref{Creating Tags,, Semantic Application Development, +semantic-appdev}, for the lisp functions these translate into. @end table If the symbol @code{%quotemode backquote} is specified, then use diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi index 0d4f9769115..4ba067fd81f 100644 --- a/doc/misc/pcl-cvs.texi +++ b/doc/misc/pcl-cvs.texi @@ -839,7 +839,7 @@ files. @item f Find the file that the cursor points to (@code{cvs-mode-find-file}). If the cursor points to a directory, run @code{dired} on that directory; -@inforef{Dired, , emacs}. +@pxref{Dired, Emacs Manual, , emacs}. @item o Like @kbd{f}, but use another window diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi index a0e999b6812..1f7473c151a 100644 --- a/doc/misc/srecode.texi +++ b/doc/misc/srecode.texi @@ -259,7 +259,7 @@ contexts to have the same name. Some standard contexts are @code{file}, @code{declaration}, and @code{classdecl}. A context can be automatically derived as well based on the parsing -state from @i{Semantic}. @inforef{Top, Semantic Manual, semantic}. +state from @i{Semantic}. @xref{Top, Semantic Manual,, semantic}. @section Applications Commands that do a particular user task which involves also writing diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi index dc5b8e4d205..c0bb7b10a46 100644 --- a/doc/misc/wisent.texi +++ b/doc/misc/wisent.texi @@ -1575,7 +1575,7 @@ To use the Wisent parser with @semantic{} you have to define your grammar in @dfn{WY} form, a grammar format very close to the one used by Bison. -Please @inforef{top, Semantic Grammar Framework Manual, grammar-fw} +Please see @ref{top, Semantic Grammar Framework Manual,, grammar-fw}, for more information on @semantic{} grammars. @menu @@ -1962,8 +1962,8 @@ See implementation of the function @code{wisent-skip-token} in @findex semantic-lex The lexical analysis step of @semantic{} is performed by the general -function @code{semantic-lex}. For more information, @inforef{Writing -Lexers, ,semantic-langdev}. +function @code{semantic-lex}. For more information, see @ref{Writing +Lexers, Semantic Language Development,,semantic-langdev}. @code{semantic-lex} produces lexical tokens of the form: -- cgit v1.2.3 From 59f80ffc7daa15802bf8b010543277f60163f04f Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 31 Jul 2021 22:22:42 +0200 Subject: Document outline-minor-mode-cycle in the manual. * doc/emacs/text.texi (Outline Mode): Document outline-minor-mode-cycle. --- doc/emacs/text.texi | 6 ++++++ etc/NEWS | 1 + 2 files changed, 7 insertions(+) (limited to 'doc/emacs/text.texi') diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index c9c4be3c61d..1fe278131ff 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -997,6 +997,12 @@ specific file (@pxref{File Variables}). major mode's special commands. (The variable @code{outline-minor-mode-prefix} controls the prefix used.) + If the @code{outline-minor-mode-cycle} user option is +non-@code{nil}, the @kbd{TAB} and @kbd{S-TAB} keys are enabled on the +outline heading lines. @kbd{TAB} cycles hiding, showing the +sub-heading, and showing all for the current section. @kbd{S-TAB} +does the same for the entire buffer. + @menu * Outline Format:: What the text of an outline looks like. * Outline Motion:: Special commands for moving through outlines. diff --git a/etc/NEWS b/etc/NEWS index 1a7f20bb8b4..3cda75d8040 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -479,6 +479,7 @@ Typing 'TAB' on a heading line cycles the current section between anywhere in the buffer cycles the whole buffer between "only top-level headings", "all headings and subheadings", and "show all" states. ++++ *** New user option 'outline-minor-mode-cycle'. This user option customizes 'outline-minor-mode', with the difference that 'TAB' and 'S-TAB' on heading lines cycle heading visibility. -- cgit v1.2.3 From 3019d628e2a07c7be79ee8ae878c55f836d9989f Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 31 Jul 2021 22:25:38 +0200 Subject: Add an index entry for outline-minor-mode-cycle * doc/emacs/text.texi (Outline Mode): Document outline-minor-mode-cycle. --- doc/emacs/text.texi | 1 + 1 file changed, 1 insertion(+) (limited to 'doc/emacs/text.texi') diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 1fe278131ff..3b9d5c2ea6e 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -997,6 +997,7 @@ specific file (@pxref{File Variables}). major mode's special commands. (The variable @code{outline-minor-mode-prefix} controls the prefix used.) +@vindex outline-minor-mode-cycle If the @code{outline-minor-mode-cycle} user option is non-@code{nil}, the @kbd{TAB} and @kbd{S-TAB} keys are enabled on the outline heading lines. @kbd{TAB} cycles hiding, showing the -- cgit v1.2.3 From a3df92f4839699388b096001b65c43f1a37273a3 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen 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 (limited to 'doc/emacs/text.texi') 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