emacs-diffs
[Top][All Lists]
Advanced

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

master d546659 2/3: Merge from origin/emacs-28


From: Eli Zaretskii
Subject: master d546659 2/3: Merge from origin/emacs-28
Date: Wed, 24 Nov 2021 14:38:58 -0500 (EST)

branch: master
commit d546659752d3cd3c3e9c8ac0ec013b64987f5a62
Merge: 9824394 b4f47d2
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-28
    
    b4f47d2 Use @pxref when necessary
---
 doc/lispref/customize.texi | 2 +-
 doc/lispref/edebug.texi    | 2 +-
 doc/lispref/variables.texi | 2 +-
 doc/misc/efaq.texi         | 4 ++--
 doc/misc/flymake.texi      | 2 +-
 doc/misc/gnus.texi         | 4 ++--
 doc/misc/htmlfontify.texi  | 4 ++--
 doc/misc/mh-e.texi         | 8 ++++----
 doc/misc/pcl-cvs.texi      | 4 ++--
 doc/misc/tramp.texi        | 6 +++---
 doc/misc/vhdl-mode.texi    | 6 +++---
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index b93b8bc..00287a7 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -737,7 +737,7 @@ If omitted, @var{key-type} and @var{value-type} default to
 
 The user can add any key matching the specified key type, but you can
 give some keys a preferential treatment by specifying them with the
-@code{:options} (see @ref{Variable Definitions}).  The specified keys
+@code{:options} (@pxref{Variable Definitions}).  The specified keys
 will always be shown in the customize buffer (together with a suitable
 value), with a checkbox to include or exclude or disable the key/value
 pair from the alist.  The user will not be able to edit the keys
diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi
index 7d67cc3..0db7725 100644
--- a/doc/lispref/edebug.texi
+++ b/doc/lispref/edebug.texi
@@ -1267,7 +1267,7 @@ balanced parentheses, recursive processing of forms, and 
recursion via
 indirect specifications.
 
 Here's a table of the possible elements of a specification list, with
-their meanings (see @ref{Specification Examples}, for the referenced
+their meanings (@pxref{Specification Examples}, for the referenced
 examples):
 
 @table @code
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index d224700..1ae0e5e 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -363,7 +363,7 @@ where you are in Emacs.
 @cindex evaluation error
 @cindex infinite recursion
 This variable defines the limit on the total number of local variable
-bindings and @code{unwind-protect} cleanups (see @ref{Cleanups,,
+bindings and @code{unwind-protect} cleanups (@pxref{Cleanups,,
 Cleaning Up from Nonlocal Exits}) that are allowed before Emacs
 signals an error (with data @code{"Variable binding depth exceeds
 max-specpdl-size"}).
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index cdb6f9b..757418a 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -151,7 +151,7 @@ and @key{Meta}
 
 @item
 @key{DEL}: @key{Delete}, usually @strong{not} the same as
-@key{Backspace}; same as @kbd{C-?} (see @ref{Backspace invokes help}, if
+@key{Backspace}; same as @kbd{C-?} (@pxref{Backspace invokes help}, if
 deleting invokes Emacs help)
 
 @item
@@ -793,7 +793,7 @@ informational files about Emacs and relevant aspects of the 
GNU project
 are available for you to read.
 
 The following files (and others) are available in the @file{etc}
-directory of the Emacs distribution (see @ref{File-name conventions}, if
+directory of the Emacs distribution (@pxref{File-name conventions}, if
 you're not sure where that is).  Many of these files are available via
 the Emacs @samp{Help} menu, or by typing @kbd{C-h ?} (@kbd{M-x
 help-for-help}).
diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index f741ee5..5f02a15 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -1145,7 +1145,7 @@ file are parsed.
 For @file{file.h}, the include directives to look for are
 @code{#include "file.h"}, @code{#include "../file.h"}, etc.  Each
 include is checked against a list of include directories
-(see @ref{Getting the include directories}) to be sure it points to the
+(@pxref{Getting the include directories}) to be sure it points to the
 correct @file{file.h}.
 
 First matching master file found stops the search.  The master file is then
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 796bb3b..a18afec 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -1004,7 +1004,7 @@ The fundamental building blocks of Gnus are @dfn{servers},
 @dfn{groups}, and @dfn{articles}.  Servers can be local or remote.
 Each server maintains a list of groups, and those groups contain
 articles.  Because Gnus presents a unified interface to a wide variety
-of servers, the vocabulary doesn't always quite line up (see @ref{FAQ
+of servers, the vocabulary doesn't always quite line up (@pxref{FAQ
 - Glossary}, for a more complete glossary).  Thus a local maildir is
 referred to as a ``server'' (@pxref{Finding the News}) the same as a
 Usenet or IMAP server is; ``groups'' (@pxref{Group Buffer}) might mean
@@ -28890,7 +28890,7 @@ gnus-agent-cache nil)} reverts to the old behavior.
 @item
 Dired integration
 
-@code{gnus-dired-minor-mode} (see @ref{Other modes}) installs key
+@code{gnus-dired-minor-mode} (@pxref{Other modes}) installs key
 bindings in dired buffers to send a file as an attachment, open a file
 using the appropriate mailcap entry, and print a file using the mailcap
 entry.
diff --git a/doc/misc/htmlfontify.texi b/doc/misc/htmlfontify.texi
index 1674565..b221692 100644
--- a/doc/misc/htmlfontify.texi
+++ b/doc/misc/htmlfontify.texi
@@ -633,7 +633,7 @@ Convert an Emacs :foreground property to a CSS color 
property.
 (hfy-flatten-style @var{style})
 @end lisp
 
-Take @var{style} (see @ref{hfy-face-to-style-i}, @ref{hfy-face-to-style})
+Take @var{style} (@pxref{hfy-face-to-style-i}, @pxref{hfy-face-to-style})
 and merge any multiple attributes appropriately.  Currently only font-size is
 merged down to a single occurrence---others may need special handling, but I
 haven't encountered them yet.  Returns a @ref{hfy-style-assoc}.
@@ -841,7 +841,7 @@ See @ref{hfy-display-class} for details of valid values for 
@var{class}.
 @end lisp
 
 Find face in effect at point P@.  If overlays are to be considered
-(see @ref{hfy-optimizations}) then this may return a @code{defface} style
+(@pxref{hfy-optimizations}) then this may return a @code{defface} style
 list of face properties instead of a face symbol.
 
 @item hfy-bgcol
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index bc788eb..d96c243 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -1018,16 +1018,16 @@ Send multimedia messages (@pxref{Adding Attachments}).
 Read HTML messages (@pxref{HTML}).
 @c -------------------------
 @item
-Use aliases and identities (see @ref{Aliases}, @pxref{Identities}).
+Use aliases and identities (@pxref{Aliases}, @pxref{Identities}).
 @c -------------------------
 @item
-Create different views of your mail (see @ref{Threading}, @pxref{Limits}).
+Create different views of your mail (@pxref{Threading}, @pxref{Limits}).
 @c -------------------------
 @item
 Deal with junk mail (@pxref{Junk}).
 @c -------------------------
 @item
-Handle signed and encrypted messages (see @ref{Reading PGP},
+Handle signed and encrypted messages (@pxref{Reading PGP},
 @pxref{Sending PGP}).
 @c -------------------------
 @item
@@ -1038,7 +1038,7 @@ Process mail that was sent with @command{shar} or 
@command{uuencode}
 Use sequences conveniently (@pxref{Sequences}).
 @c -------------------------
 @item
-Use the speedbar, tool bar, and menu bar (see @ref{Speedbar}, see @ref{Tool
+Use the speedbar, tool bar, and menu bar (@pxref{Speedbar}, @pxref{Tool
 Bar}, @pxref{Menu Bar}).
 @c -------------------------
 @item
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 4ba067f..833326c 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -524,8 +524,8 @@ you can use in PCL-CVS@.  They are grouped together by type.
 Most commands in PCL-CVS require that you have a @file{*cvs*}
 buffer.  The commands that you use to get one are listed below.
 For each, a @samp{cvs} process will be run, the output will be parsed by
-PCL-CVS, and the result will be printed in the @file{*cvs*} buffer (see
-@ref{Buffer contents}, for a description of the buffer's contents).
+PCL-CVS, and the result will be printed in the @file{*cvs*} buffer
+(@pxref{Buffer contents}, for a description of the buffer's contents).
 
 @table @kbd
 @item M-x cvs-update
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 0825e85..1f6d4ad 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3388,8 +3388,8 @@ returns the exit code for it.  When the user option
 indication that the process has been interrupted, and returns a
 corresponding string.
 
-This remote process handling does not apply to @acronym{GVFS} (see
-@ref{GVFS-based methods}) because the remote file system is mounted on
+This remote process handling does not apply to @acronym{GVFS}
+(@pxref{GVFS-based methods}) because the remote file system is mounted on
 the local host and @value{tramp} accesses it by changing the
 @code{default-directory}.
 
@@ -3410,7 +3410,7 @@ might also add their name to this environment variable, 
like
 For @value{tramp} to find the command on the remote, it must be
 accessible through the default search path as setup by @value{tramp}
 upon first connection.  Alternatively, use an absolute path or extend
-@code{tramp-remote-path} (see @ref{Remote programs}):
+@code{tramp-remote-path} (@pxref{Remote programs}):
 
 @lisp
 @group
diff --git a/doc/misc/vhdl-mode.texi b/doc/misc/vhdl-mode.texi
index fef98a7..7022582 100644
--- a/doc/misc/vhdl-mode.texi
+++ b/doc/misc/vhdl-mode.texi
@@ -243,7 +243,7 @@ components.  Also notice that the first component,
 @vindex vhdl-offsets-alist
 @vindex offsets-alist @r{(vhdl-)}
 Indentation for the current line is calculated using the syntactic
-component list derived in step 1 above (see @ref{Syntactic
+component list derived in step 1 above (@pxref{Syntactic
 Analysis}).  Each component contributes to the final total indentation
 of the line in two ways.
 
@@ -668,7 +668,7 @@ not handled by the mode directly.
 @cindex custom indentation functions
 One of the most common ways to customize VHDL Mode is by writing
 @dfn{custom indentation functions} and associating them with specific
-syntactic symbols (see @ref{Syntactic Symbols}).  VHDL Mode itself
+syntactic symbols (@pxref{Syntactic Symbols}).  VHDL Mode itself
 uses custom indentation functions to provide more sophisticated
 indentation, for example when lining up selected signal assignments:
 @example
@@ -732,7 +732,7 @@ operator on the first line of the statement.  Here is the 
lisp code
 @end example
 @noindent
 Custom indent functions take a single argument, which is a syntactic
-component cons cell (see @ref{Syntactic Analysis}).  The
+component cons cell (@pxref{Syntactic Analysis}).  The
 function returns an integer offset value that will be added to the
 running total indentation for the line.  Note that what actually gets
 returned is the difference between the column that the signal assignment



reply via email to

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