From 97878c08e08151528135ae911f69ad627360ff3b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 10 Jan 2001 08:15:32 +0000 Subject: [PATCH] Don't say "X Windows". From Colin Walters . --- man/cmdargs.texi | 15 ++++++++------- man/commands.texi | 25 +++++++++++++------------ man/custom.texi | 6 +++--- man/faq.texi | 16 ++++++++-------- man/frames.texi | 10 +++++----- man/gnus-faq.texi | 2 +- man/msdog.texi | 12 ++++++------ man/mule.texi | 10 +++++----- man/trouble.texi | 8 ++++---- man/viper.texi | 12 ++++++------ man/windows.texi | 6 +++--- 11 files changed, 62 insertions(+), 60 deletions(-) diff --git a/man/cmdargs.texi b/man/cmdargs.texi index ff18c0dbcc5..7195273113b 100644 --- a/man/cmdargs.texi +++ b/man/cmdargs.texi @@ -120,7 +120,8 @@ define new ones, by reading and setting this variable. The initial options specify parameters for the Emacs session. This section describes the more general initial options; some other options -specifically related to X Windows appear in the following sections. +specifically related to the X Window System appear in the following +sections. Some initial options affect the loading of init files. The normal actions of Emacs are to first load @file{site-start.el} if it exists, @@ -468,7 +469,7 @@ Used when initializing the Sun windows system. @node Display X @appendixsec Specifying the Display Name -@cindex display name (X Windows) +@cindex display name (X Window System) @cindex @env{DISPLAY} environment variable The environment variable @env{DISPLAY} tells all X clients, including @@ -524,7 +525,7 @@ remote machine. @node Font X @appendixsec Font Specification Options -@cindex font name (X Windows) +@cindex font name (X Window System) By default, Emacs displays text in the font named @samp{9x15}, which makes each character nine pixels wide and fifteen pixels high. You can @@ -635,7 +636,7 @@ displays the entire font @samp{6x13}. @node Colors X @appendixsec Window Color Options -@cindex color of window (X Windows) +@cindex color of window (X Window System) @cindex text colors, from command line @findex list-colors-display @@ -688,7 +689,7 @@ emacs -ms coral -cr 'slate blue' & @node Window Size X @appendixsec Options for Window Geometry -@cindex geometry (X Windows) +@cindex geometry (X Window System) The @samp{-geometry} option controls the size and position of the initial Emacs frame. Here is the format for specifying the window @@ -751,7 +752,7 @@ which means both sizes are omitted. Thus, @samp{-3} specifies the @node Borders X @appendixsec Internal and External Borders -@cindex borders (X Windows) +@cindex borders (X Window System) An Emacs frame has an internal border and an external border. The internal border is an extra strip of the background color around all @@ -804,7 +805,7 @@ for the initial Emacs frame. @node Icons X @appendixsec Icons -@cindex icons (X Windows) +@cindex icons (X Window System) Most window managers allow the user to ``iconify'' a frame, removing it from sight, and leaving a small, distinctive ``icon'' window in its diff --git a/man/commands.texi b/man/commands.texi index 00db9140150..63a39402c75 100644 --- a/man/commands.texi +++ b/man/commands.texi @@ -49,9 +49,9 @@ distinguish them. But the Emacs character set has room for control variants of all printing characters, and for distinguishing between @kbd{C-a} and -@kbd{C-A}. X Windows makes it possible to enter all these characters. -For example, @kbd{C--} (that's Control-Minus) and @kbd{C-5} are -meaningful Emacs commands under X. +@kbd{C-A}. The X Window System makes it possible to enter all these +characters. For example, @kbd{C--} (that's Control-Minus) and @kbd{C-5} +are meaningful Emacs commands under X. Another Emacs character-set extension is additional modifier bits. Only one modifier bit is commonly used; it is called Meta. Every @@ -79,15 +79,16 @@ using two-character sequences starting with @key{ESC}. Thus, to enter would type @kbd{@key{ESC} C-a}. @key{ESC} is allowed on terminals with @key{META} keys, too, in case you have formed a habit of using it. - X Windows provides several other modifier keys that can be applied to -any input character. These are called @key{SUPER}, @key{HYPER} and -@key{ALT}. We write @samp{s-}, @samp{H-} and @samp{A-} to say that a -character uses these modifiers. Thus, @kbd{s-H-C-x} is short for -@kbd{Super-Hyper-Control-x}. Not all X terminals actually provide keys -for these modifier flags---in fact, many terminals have a key labeled -@key{ALT} which is really a @key{META} key. The standard key bindings -of Emacs do not include any characters with these modifiers. But you -can assign them meanings of your own by customizing Emacs. + The X Window System provides several other modifier keys that can be +applied to any input character. These are called @key{SUPER}, +@key{HYPER} and @key{ALT}. We write @samp{s-}, @samp{H-} and @samp{A-} +to say that a character uses these modifiers. Thus, @kbd{s-H-C-x} is +short for @kbd{Super-Hyper-Control-x}. Not all X terminals actually +provide keys for these modifier flags---in fact, many terminals have a +key labeled @key{ALT} which is really a @key{META} key. The standard +key bindings of Emacs do not include any characters with these +modifiers. But you can assign them meanings of your own by customizing +Emacs. Keyboard input includes keyboard keys that are not characters at all: for example function keys and arrow keys. Mouse buttons are also diff --git a/man/custom.texi b/man/custom.texi index 9bb9b789305..3955e3845c4 100644 --- a/man/custom.texi +++ b/man/custom.texi @@ -1638,9 +1638,9 @@ Keypad PF keys. @end table These names are conventional, but some systems (especially when using -X windows) may use different names. To make certain what symbol is used -for a given function key on your terminal, type @kbd{C-h c} followed by -that key. +X) may use different names. To make certain what symbol is used for a +given function key on your terminal, type @kbd{C-h c} followed by that +key. A key sequence which contains function key symbols (or anything but ASCII characters) must be a vector rather than a string. The vector diff --git a/man/faq.texi b/man/faq.texi index 5608f2442a8..5ab86b9f7c4 100644 --- a/man/faq.texi +++ b/man/faq.texi @@ -1821,7 +1821,7 @@ And evaluate the following Lisp form: @end example @node Turning the volume down, Automatic indentation, Turning off beeping, Common requests -@section How do I turn down the bell volume in Emacs running under X Windows? +@section How do I turn down the bell volume in Emacs running under X? @cindex Bell, volume of @cindex Volume of bell @@ -2113,11 +2113,11 @@ If you need to repeat a command a small number of times, you can use @node Forcing Emacs to iconify itself, Using regular expressions, Forcing the cursor to remain in the same column, Common requests @section How do I tell Emacs to iconify itself? -@cindex Iconification under X Windows -@cindex X Windows and iconification +@cindex Iconification under the X Window System +@cindex X Window System and iconification @cindex Suspending Emacs -@kbd{C-z} iconifies Emacs when running under X Windows and suspends Emacs +@kbd{C-z} iconifies Emacs when running under X and suspends Emacs otherwise. @inforef{Misc X, Misc X, emacs}. @node Using regular expressions, Replacing text across multiple files, Forcing Emacs to iconify itself, Common requests @@ -3005,7 +3005,7 @@ programs, then removing the access. This reduces the risk somewhat by narrowing the time window when hostile users would have access, but @emph{does not eliminate the risk}. -On most computers running Unix and X Windows, you enable and disable +On most computers running Unix and X, you enable and disable access using the @code{xhost} command. To allow all hosts access to your X server, use @@ -3467,7 +3467,7 @@ Emacs 19 and Epoch, an X-aware version of Emacs 18. Emacs (i.e., the version distributed by the FSF) has a larger installed base and now always contains the MULE multilingual facilities. -XEmacs can do some clever tricks with X Windows, such as +XEmacs can do some clever tricks with X and MS-Windows, such as putting arbitrary graphics in a buffer. Similar facilities have been implemented for Emacs as part of a new redisplay implementation for Emacs 21, and are available in the latest Emacs releases. @@ -4209,9 +4209,9 @@ For information on what Emacs does every time it is started, see the @file{lisp/startup.el} file. @node Using function keys under X, Working with function and arrow keys, Terminal setup code works after Emacs has begun, Key bindings -@section How do I use function keys under X Windows? +@section How do I use function keys under X? @cindex Function keys -@cindex X Windows and function keys +@cindex X Window System and function keys @cindex Binding function keys With Emacs 19, functions keys under X are bound like any other key. @xref{Binding keys to commands}, for details. diff --git a/man/frames.texi b/man/frames.texi index 835942e591f..e499bdac962 100644 --- a/man/frames.texi +++ b/man/frames.texi @@ -491,11 +491,11 @@ speedbar for it. @section Multiple Displays @cindex multiple displays - A single Emacs can talk to more than one X Windows display. -Initially, Emacs uses just one display---the one specified with the -@env{DISPLAY} environment variable or with the @samp{--display} option -(@pxref{Initial Options}). To connect to another display, use the -command @code{make-frame-on-display}: + A single Emacs can talk to more than one X display. Initially, Emacs +uses just one display---the one specified with the @env{DISPLAY} +environment variable or with the @samp{--display} option (@pxref{Initial +Options}). To connect to another display, use the command +@code{make-frame-on-display}: @findex make-frame-on-display @table @kbd diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi index 158f1b92c05..48280517837 100644 --- a/man/gnus-faq.texi +++ b/man/gnus-faq.texi @@ -132,7 +132,7 @@ list is mainly for developers and testers. Gnus has a home World Wide Web page at@* @file{http://www.ifi.uio.no/~larsi/ding.html}. -Gnus has a write up in the X Windows Applications FAQ at@* +Gnus has a write up in the X Applications FAQ at@* @file{http://www.ee.ryerson.ca:8080/~elf/xapps/Q-III.html}. The Gnus manual is also available on the World Wide Web. The canonical diff --git a/man/msdog.texi b/man/msdog.texi index 351405ecf8c..fcc83810ce7 100644 --- a/man/msdog.texi +++ b/man/msdog.texi @@ -123,10 +123,10 @@ adding this fragment to your @file{_emacs} init file: @cindex Windows clipboard support Emacs built for MS-DOS supports clipboard operations when it runs on Windows. Commands that put text on the kill ring, or yank text from the -ring, check the Windows clipboard first, just as Emacs does on X Windows -(@pxref{Mouse Commands}). Only the primary selection and the cut buffer -are supported by MS-DOS Emacs on Windows; the secondary selection always -appears as empty. +ring, check the Windows clipboard first, just as Emacs does on the X +Window System (@pxref{Mouse Commands}). Only the primary selection and +the cut buffer are supported by MS-DOS Emacs on Windows; the secondary +selection always appears as empty. Due to the way clipboard access is implemented by Windows, the length of text you can put into the clipboard is limited by the amount @@ -598,8 +598,8 @@ characters (codes 128 through 255) vary from one codepage to another. Each DOS codepage is identified by a 3-digit number, such as 850, 862, etc. - In contrast to X Windows, which lets you use several fonts at the same -time, MS-DOS doesn't allow use of several codepages in a single session. + In contrast to X, which lets you use several fonts at the same time, +MS-DOS doesn't allow use of several codepages in a single session. Instead, MS-DOS loads a single codepage at system startup, and you must reboot MS-DOS to change it@footnote{Normally, one particular codepage is burnt into the display memory, while other codepages can be installed by diff --git a/man/mule.texi b/man/mule.texi index 25a50a220d6..ae6b1444dd5 100644 --- a/man/mule.texi +++ b/man/mule.texi @@ -923,11 +923,11 @@ nonempty. @section Fontsets @cindex fontsets - A font for X Windows typically defines shapes for one alphabet or -script. Therefore, displaying the entire range of scripts that Emacs -supports requires a collection of many fonts. In Emacs, such a -collection is called a @dfn{fontset}. A fontset is defined by a list of -fonts, each assigned to handle a range of character codes. + A font for X typically defines shapes for one alphabet or script. +Therefore, displaying the entire range of scripts that Emacs supports +requires a collection of many fonts. In Emacs, such a collection is +called a @dfn{fontset}. A fontset is defined by a list of fonts, each +assigned to handle a range of character codes. Each fontset has a name, like a font. The available X fonts are defined by the X server; fontsets, however, are defined within Emacs diff --git a/man/trouble.texi b/man/trouble.texi index 3f68690f8eb..fde07235728 100644 --- a/man/trouble.texi +++ b/man/trouble.texi @@ -739,10 +739,10 @@ had a fatal signal. If the symptom of the bug is that Emacs fails to respond, don't assume Emacs is ``hung''---it may instead be in an infinite loop. To find out which, make the problem happen under GDB and stop Emacs once it is not -responding. (If Emacs is using X Windows directly, you can stop Emacs -by typing @kbd{C-z} at the GDB job.) Then try stepping with -@samp{step}. If Emacs is hung, the @samp{step} command won't return. -If it is looping, @samp{step} will return. +responding. (If Emacs is using X directly, you can stop Emacs by typing +@kbd{C-z} at the GDB job.) Then try stepping with @samp{step}. If +Emacs is hung, the @samp{step} command won't return. If it is looping, +@samp{step} will return. If this shows Emacs is hung in a system call, stop it again and examine the arguments of the call. In your bug report, state exactly where in diff --git a/man/viper.texi b/man/viper.texi index b7ad05c36a9..bd00a89faab 100644 --- a/man/viper.texi +++ b/man/viper.texi @@ -401,9 +401,9 @@ change to Vi state.@refill For users who chose to set their user level to 1 at Viper setup time, switching to Emacs state is deliberately made harder in order to not -confuse the novice user. In this case, @kbd{C-z} will either iconify Emacs -(if Emacs runs as an application under X Windows) or it will stop Emacs (if -Emacs runs on a dumb terminal or in an Xterm window). +confuse the novice user. In this case, @kbd{C-z} will either iconify +Emacs (if Emacs runs as an application under X) or it will stop Emacs +(if Emacs runs on a dumb terminal or in an Xterm window). @item Vi state This is the Vi command mode. Any of the Vi commands, such as @kbd{i, o, a}, @@ -1984,8 +1984,8 @@ preferred form is [help], and the Undo key has the preferred form [f14]. You can find out the preferred form of a key by typing @kbd{M-x describe-key-briefly} and then typing the key you want to know about. -Under X Windows, every keyboard key emits its preferred form, so you can -just type +Under the X Window System, every keyboard key emits its preferred form, +so you can just type @lisp (global-set-key [f11] 'calendar) ; L1, Stop @@ -2069,7 +2069,7 @@ for each specific key; @kbd{C-h b} will show all bindings, and @kbd{C-h m} will provide information on the major mode in effect. If Help is not enabled, you can still get help in Vi state by prefixing the above commands with @kbd{\}, e.g., @kbd{\ C-h k} (or you can use the Help menu in the -menu bar, if Emacs runs under X Windows). +menu bar, if Emacs runs under X). Viper users can also change bindings on a per major mode basis. As with global bindings, this can be done separately for each of the three main Viper diff --git a/man/windows.texi b/man/windows.texi index eb1ced74c43..111fafe2fc3 100644 --- a/man/windows.texi +++ b/man/windows.texi @@ -38,9 +38,9 @@ buffer this window is displaying is the current buffer. The terminal's cursor shows the location of point in this window. Each other window has a location of point as well, but since the terminal has only one cursor there is no way to show where those locations are. When multiple -frames are visible in X Windows, each frame has a cursor which appears -in the frame's selected window. The cursor in the selected frame is -solid; the cursor in other frames is a hollow box. +frames are visible in X, each frame has a cursor which appears in the +frame's selected window. The cursor in the selected frame is solid; the +cursor in other frames is a hollow box. Commands to move point affect the value of point for the selected Emacs window only. They do not change the value of point in any other Emacs -- 2.39.2