aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-02-07 23:52:35 +0000
committerRichard M. Stallman2006-02-07 23:52:35 +0000
commitf97b3732a469b1f5c80830b13ceb1eb4bee18e32 (patch)
tree73d9829e861fcc6b389f77f7308097a5a7c69690
parent590e3b9e62211dbf2e26a8d9592e746158734144 (diff)
downloademacs-f97b3732a469b1f5c80830b13ceb1eb4bee18e32.tar.gz
emacs-f97b3732a469b1f5c80830b13ceb1eb4bee18e32.zip
Minor cleanups. "Graphical display", not window system.
-rw-r--r--man/custom.texi8
-rw-r--r--man/frames.texi10
2 files changed, 10 insertions, 8 deletions
diff --git a/man/custom.texi b/man/custom.texi
index 227d74f87e8..c3e33a5969b 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -117,7 +117,7 @@ system crash. @xref{Auto Save}.
117 117
118 Font-Lock mode automatically highlights certain textual units found in 118 Font-Lock mode automatically highlights certain textual units found in
119programs, such as comments, strings, and function names being defined. 119programs, such as comments, strings, and function names being defined.
120This requires a window system that can display multiple fonts. 120This requires a graphical display that can show multiple fonts.
121@xref{Faces}. 121@xref{Faces}.
122 122
123 ISO Accents mode makes the characters @samp{`}, @samp{'}, @samp{"}, 123 ISO Accents mode makes the characters @samp{`}, @samp{'}, @samp{"},
@@ -201,7 +201,7 @@ and set their values, and to save settings permanently in your
201@file{~/.emacs} file (@pxref{Init File}). 201@file{~/.emacs} file (@pxref{Init File}).
202 202
203 The appearance of the example buffers in this section is typically 203 The appearance of the example buffers in this section is typically
204different under a window system, since faces are then used to indicate 204different under a graphical display, since faces are then used to indicate
205buttons, links and editable fields. 205buttons, links and editable fields.
206 206
207@menu 207@menu
@@ -2030,7 +2030,7 @@ Reference Manual}.
2030 2030
2031 When Emacs is started, it normally loads a Lisp program from the 2031 When Emacs is started, it normally loads a Lisp program from the
2032file @file{.emacs} or @file{.emacs.el} in your home directory 2032file @file{.emacs} or @file{.emacs.el} in your home directory
2033(see @ref{General Variables, HOME} if you don't know where that is). 2033(see @ref{General Variables, HOME}, if you don't know where that is).
2034We call this file your @dfn{init file} because it specifies how to 2034We call this file your @dfn{init file} because it specifies how to
2035initialize Emacs for you. You can use the command line switch 2035initialize Emacs for you. You can use the command line switch
2036@samp{-q} to prevent loading your init file, and @samp{-u} (or 2036@samp{-q} to prevent loading your init file, and @samp{-u} (or
@@ -2456,7 +2456,7 @@ currently pretending to be. The idea is that you should get your own
2456editor customizations even if you are running as the super user. 2456editor customizations even if you are running as the super user.
2457 2457
2458 More precisely, Emacs first determines which user's init file to use. 2458 More precisely, Emacs first determines which user's init file to use.
2459It gets the user name from the environment variables @env{LOGNAME} and 2459It gets your user name from the environment variables @env{LOGNAME} and
2460@env{USER}; if neither of those exists, it uses effective user-ID. 2460@env{USER}; if neither of those exists, it uses effective user-ID.
2461If that user name matches the real user-ID, then Emacs uses @env{HOME}; 2461If that user name matches the real user-ID, then Emacs uses @env{HOME};
2462otherwise, it looks up the home directory corresponding to that user 2462otherwise, it looks up the home directory corresponding to that user
diff --git a/man/frames.texi b/man/frames.texi
index 0d28572c1ac..f25399e071b 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -510,8 +510,10 @@ Here's a similar example for specifying a foreground color:
510@kindex C-z @r{(X windows)} 510@kindex C-z @r{(X windows)}
511@findex iconify-or-deiconify-frame 511@findex iconify-or-deiconify-frame
512Iconify the selected Emacs frame (@code{iconify-or-deiconify-frame}). 512Iconify the selected Emacs frame (@code{iconify-or-deiconify-frame}).
513The normal meaning of @kbd{C-z}, to suspend Emacs, is not useful under a 513The normal meaning of @kbd{C-z}, to suspend Emacs, is not useful under
514window system, so it has a different binding in that case. 514a graphical display that allows multiple applications to operate
515simultaneously in their own windies, so Emacs gives @kbd{C-z} a
516different binding in that case.
515 517
516If you type this command on an Emacs frame's icon, it deiconifies the frame. 518If you type this command on an Emacs frame's icon, it deiconifies the frame.
517 519
@@ -967,8 +969,8 @@ customizing the windows that display tooltips.
967@cindex mouse avoidance 969@cindex mouse avoidance
968 970
969@vindex mouse-avoidance-mode 971@vindex mouse-avoidance-mode
970Mouse Avoidance mode keeps the window system mouse pointer away from 972Mouse Avoidance mode keeps the mouse pointer away from point, to avoid
971point, to avoid obscuring text. Whenever it moves the mouse, it also 973obscuring text you want to edit. Whenever it moves the mouse, it also
972raises the frame. To use Mouse Avoidance mode, customize the variable 974raises the frame. To use Mouse Avoidance mode, customize the variable
973@code{mouse-avoidance-mode}. You can set this to various values to 975@code{mouse-avoidance-mode}. You can set this to various values to
974move the mouse in several ways: 976move the mouse in several ways: