diff options
| author | Miles Bader | 2005-02-06 12:06:02 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-02-06 12:06:02 +0000 |
| commit | a359f0e0ff878285654e2f0bcc7bd3b4340c778c (patch) | |
| tree | cc0aff13c751bb8ab7ccaae29082bab32e15fd13 /man | |
| parent | f3d3402885646e6fa79f1ad59fb8a1f9017851d7 (diff) | |
| parent | 56c30d721096a64f151f9ea6e3c76562380da895 (diff) | |
| download | emacs-a359f0e0ff878285654e2f0bcc7bd3b4340c778c.tar.gz emacs-a359f0e0ff878285654e2f0bcc7bd3b4340c778c.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-11
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-69
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-71
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-72
src/dispextern.h (xassert): Enable unconditionally.
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-73
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-81
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13
Update from CVS
Diffstat (limited to 'man')
| -rw-r--r-- | man/ChangeLog | 52 | ||||
| -rw-r--r-- | man/basic.texi | 2 | ||||
| -rw-r--r-- | man/buffers.texi | 66 | ||||
| -rw-r--r-- | man/cmdargs.texi | 7 | ||||
| -rw-r--r-- | man/dired.texi | 5 | ||||
| -rw-r--r-- | man/files.texi | 49 | ||||
| -rw-r--r-- | man/fixit.texi | 2 | ||||
| -rw-r--r-- | man/frames.texi | 168 | ||||
| -rw-r--r-- | man/text.texi | 36 | ||||
| -rw-r--r-- | man/windows.texi | 15 |
10 files changed, 255 insertions, 147 deletions
diff --git a/man/ChangeLog b/man/ChangeLog index 2559bdfaa61..71185265be5 100644 --- a/man/ChangeLog +++ b/man/ChangeLog | |||
| @@ -1,4 +1,54 @@ | |||
| 1 | 2005-01-31 Luc Teirlinck <teirllm@auburn.edu> | 1 | 2005-02-05 Eli Zaretskii <eliz@gnu.org> |
| 2 | |||
| 3 | * frames.texi (Frame Parameters): Add an xref to the description | ||
| 4 | of list-colors-display. Add a pointer to the X docs about colors. | ||
| 5 | |||
| 6 | * cmdargs.texi (Colors): Mention 16-, 88- and 256-color modes. | ||
| 7 | Impove docs of list-colors-display. | ||
| 8 | |||
| 9 | 2005-02-03 Lute Kamstra <lute@gnu.org> | ||
| 10 | |||
| 11 | * frames.texi (Frames, Drag and Drop): Fix typos. | ||
| 12 | |||
| 13 | 2005-02-03 Richard M. Stallman <rms@gnu.org> | ||
| 14 | |||
| 15 | * windows.texi (Basic Window): Mention color-change in mode line. | ||
| 16 | (Change Window): Explain dragging vertical boundaries. | ||
| 17 | |||
| 18 | * text.texi (Sentences): Clarify. | ||
| 19 | (Paragraphs): Explain M-a and blank lines. | ||
| 20 | (Outline Mode): Clarify text and menu. | ||
| 21 | (Hard and Soft Newlines): Mention use-hard-newlines. | ||
| 22 | |||
| 23 | * frames.texi (Frames): Delete unnecessary mention of Windows. | ||
| 24 | (Mouse Commands): Likewise. Mention xterm mouse support. | ||
| 25 | (Clipboard): Clarify. | ||
| 26 | (Mouse References): Mention use of Mouse-1 for following links. | ||
| 27 | (Menu Mouse Clicks): Clarify. | ||
| 28 | (Mode Line Mouse): Clarify. | ||
| 29 | (Drag and Drop): Rewrite. | ||
| 30 | |||
| 31 | * fixit.texi (Spelling): Fix typo. | ||
| 32 | |||
| 33 | * files.texi (File Names): Clarify. | ||
| 34 | (Visiting): Update conditions for use of file dialog. Clarify. | ||
| 35 | (Saving): Doc d as answer in save-some-buffers. | ||
| 36 | (Remote Files): Clean up the text. | ||
| 37 | |||
| 38 | * dired.texi (Misc Dired Commands): Delete dired-marked-files. | ||
| 39 | |||
| 40 | * buffers.texi (Select Buffer): Doc next-buffer and prev-buffer. | ||
| 41 | (List Buffers): Clarify. | ||
| 42 | (Several Buffers): Doc T command. | ||
| 43 | (Buffer Convenience): Clarify menu. | ||
| 44 | |||
| 45 | * basic.texi (Undo): Clarify last change. | ||
| 46 | |||
| 47 | 2005-02-02 Matt Hodges <MPHodges@member.fsf.org> | ||
| 48 | |||
| 49 | * fixit.texi (Spelling): Fix typo. | ||
| 50 | |||
| 51 | 2005-02-01 Luc Teirlinck <teirllm@auburn.edu> | ||
| 2 | 52 | ||
| 3 | * basic.texi (Undo): Update description of `undo-outer-limit'. | 53 | * basic.texi (Undo): Update description of `undo-outer-limit'. |
| 4 | 54 | ||
diff --git a/man/basic.texi b/man/basic.texi index 29bf6d4e207..1598de2632a 100644 --- a/man/basic.texi +++ b/man/basic.texi | |||
| @@ -400,7 +400,7 @@ value of @code{undo-strong-limit} is 30000. | |||
| 400 | Regardless of the values of those variables, the most recent change | 400 | Regardless of the values of those variables, the most recent change |
| 401 | is never discarded unless it gets bigger than @code{undo-outer-limit} | 401 | is never discarded unless it gets bigger than @code{undo-outer-limit} |
| 402 | (normally 3,000,000). At that point, Emacs discards the undo data and | 402 | (normally 3,000,000). At that point, Emacs discards the undo data and |
| 403 | warns you about it. This is the only situation in which you can not | 403 | warns you about it. This is the only situation in which you cannot |
| 404 | undo the last command. If this happens, you can increase the value of | 404 | undo the last command. If this happens, you can increase the value of |
| 405 | @code{undo-outer-limit} to make it even less likely to happen in the | 405 | @code{undo-outer-limit} to make it even less likely to happen in the |
| 406 | future. But if you didn't expect the command to create such large | 406 | future. But if you didn't expect the command to create such large |
diff --git a/man/buffers.texi b/man/buffers.texi index 558b636de60..97234966b4b 100644 --- a/man/buffers.texi +++ b/man/buffers.texi | |||
| @@ -67,6 +67,10 @@ megabytes. | |||
| 67 | @table @kbd | 67 | @table @kbd |
| 68 | @item C-x b @var{buffer} @key{RET} | 68 | @item C-x b @var{buffer} @key{RET} |
| 69 | Select or create a buffer named @var{buffer} (@code{switch-to-buffer}). | 69 | Select or create a buffer named @var{buffer} (@code{switch-to-buffer}). |
| 70 | @item C-x @key{LEFT} | ||
| 71 | Select the previous buffer in the list of existing buffers. | ||
| 72 | @item C-x @key{RIGHT} | ||
| 73 | Select the next buffer in the list of existing buffers. | ||
| 70 | @item C-x 4 b @var{buffer} @key{RET} | 74 | @item C-x 4 b @var{buffer} @key{RET} |
| 71 | Similar, but select @var{buffer} in another window | 75 | Similar, but select @var{buffer} in another window |
| 72 | (@code{switch-to-buffer-other-window}). | 76 | (@code{switch-to-buffer-other-window}). |
| @@ -84,6 +88,16 @@ name you want (@pxref{Completion}). An empty argument to @kbd{C-x b} | |||
| 84 | specifies the buffer that was current most recently among those not | 88 | specifies the buffer that was current most recently among those not |
| 85 | now displayed in any window. | 89 | now displayed in any window. |
| 86 | 90 | ||
| 91 | @kindex C-x @key{LEFT} | ||
| 92 | @kindex C-x @key{RIGHT} | ||
| 93 | @findex next-buffer | ||
| 94 | @findex prev-buffer | ||
| 95 | For conveniently switching between a few buffers, use the commands | ||
| 96 | @kbd{C-x @key{LEFT}} and @kbd{C-x @key{RIGHT}}. @kbd{C-x @key{RIGHT}} | ||
| 97 | (@code{prev-buffer}) selects the previous buffer (following the order | ||
| 98 | of most recent selection), while @kbd{C-x @key{LEFT}} | ||
| 99 | (@code{next-buffer}) moves through buffers in the reverse direction. | ||
| 100 | |||
| 87 | @kindex C-x 4 b | 101 | @kindex C-x 4 b |
| 88 | @findex switch-to-buffer-other-window | 102 | @findex switch-to-buffer-other-window |
| 89 | @vindex even-window-heights | 103 | @vindex even-window-heights |
| @@ -141,9 +155,9 @@ List the existing buffers (@code{list-buffers}). | |||
| 141 | @cindex listing current buffers | 155 | @cindex listing current buffers |
| 142 | @kindex C-x C-b | 156 | @kindex C-x C-b |
| 143 | @findex list-buffers | 157 | @findex list-buffers |
| 144 | To display a list of all the buffers that exist, type @kbd{C-x C-b}. | 158 | To display a list of existing buffers, type @kbd{C-x C-b}. Each |
| 145 | Each line in the list shows one buffer's name, major mode and visited | 159 | line in the list shows one buffer's name, major mode and visited file. |
| 146 | file. The buffers are listed in the order that they were current; the | 160 | The buffers are listed in the order that they were current; the |
| 147 | buffers that were current most recently come first. | 161 | buffers that were current most recently come first. |
| 148 | 162 | ||
| 149 | @samp{*} in the first field of a line indicates the buffer is ``modified.'' | 163 | @samp{*} in the first field of a line indicates the buffer is ``modified.'' |
| @@ -171,7 +185,7 @@ directory @file{~/cvs/emacs/src/}. You can list only buffers that are | |||
| 171 | visiting files by giving the command a prefix; for instance, by typing | 185 | visiting files by giving the command a prefix; for instance, by typing |
| 172 | @kbd{C-u C-x C-b}. | 186 | @kbd{C-u C-x C-b}. |
| 173 | 187 | ||
| 174 | @code{list-buffers} omits buffers whose name begins with a blank, | 188 | @code{list-buffers} omits buffers whose names begin with a space, |
| 175 | unless they visit files: such buffers are used internally by Emacs. | 189 | unless they visit files: such buffers are used internally by Emacs. |
| 176 | 190 | ||
| 177 | @need 2000 | 191 | @need 2000 |
| @@ -332,8 +346,9 @@ Similar, but do it in another window. | |||
| 332 | buffers@footnote{Buffers which don't visit files and whose names begin | 346 | buffers@footnote{Buffers which don't visit files and whose names begin |
| 333 | with a space are omitted: these are used internally by Emacs.} into the | 347 | with a space are omitted: these are used internally by Emacs.} into the |
| 334 | buffer @samp{*Buffer List*}, and selects that buffer in Buffer Menu | 348 | buffer @samp{*Buffer List*}, and selects that buffer in Buffer Menu |
| 335 | mode. The list in the @samp{*Buffer List*} buffer looks exactly as | 349 | mode. |
| 336 | described in @ref{List Buffers}. The buffer is read-only, and can be | 350 | |
| 351 | The buffer is read-only, and can be | ||
| 337 | changed only through the special commands described in this section. | 352 | changed only through the special commands described in this section. |
| 338 | The usual Emacs cursor motion commands can be used in the @samp{*Buffer | 353 | The usual Emacs cursor motion commands can be used in the @samp{*Buffer |
| 339 | List*} buffer. The following commands apply to the buffer described on | 354 | List*} buffer. The following commands apply to the buffer described on |
| @@ -411,21 +426,32 @@ any buffers previously marked with the @kbd{m} command. If you have not | |||
| 411 | marked any buffers, this command is equivalent to @kbd{1}. | 426 | marked any buffers, this command is equivalent to @kbd{1}. |
| 412 | @end table | 427 | @end table |
| 413 | 428 | ||
| 414 | All that @code{buffer-menu} does directly is create and switch to a | 429 | There is also a command that affects the entire buffer list: |
| 415 | suitable buffer, and turn on Buffer Menu mode. Everything else | 430 | |
| 431 | @table @kbd | ||
| 432 | @item T | ||
| 433 | Delete, or reinsert, lines for non-file buffers. This command toggles | ||
| 434 | the inclusion of such buffers in the buffer list. | ||
| 435 | @end table | ||
| 436 | |||
| 437 | What @code{buffer-menu} actually does is create and switch to a | ||
| 438 | suitable buffer, and turn on Buffer Menu mode in it. Everything else | ||
| 416 | described above is implemented by the special commands provided in | 439 | described above is implemented by the special commands provided in |
| 417 | Buffer Menu mode. One consequence of this is that you can switch from | 440 | Buffer Menu mode. One consequence of this is that you can switch from |
| 418 | the @samp{*Buffer List*} buffer to another Emacs buffer, and edit there. | 441 | the @samp{*Buffer List*} buffer to another Emacs buffer, and edit |
| 419 | You can reselect the @samp{*Buffer List*} buffer later, to perform the | 442 | there. You can reselect the @samp{*Buffer List*} buffer later, to |
| 420 | operations already requested, or you can kill it, or pay no further | 443 | perform the operations already requested, or you can kill it, or pay |
| 421 | attention to it. | 444 | no further attention to it. |
| 422 | 445 | ||
| 423 | The only difference between @code{buffer-menu} and @code{list-buffers} | 446 | The list in the @samp{*Buffer List*} buffer looks exactly like the |
| 424 | is that @code{buffer-menu} switches to the @samp{*Buffer List*} buffer | 447 | buffer list described in @ref{List Buffers}, because they really are |
| 425 | in the selected window; @code{list-buffers} displays it in another | 448 | the same. The only difference between @code{buffer-menu} and |
| 426 | window. If you run @code{list-buffers} (that is, type @kbd{C-x C-b}) | 449 | @code{list-buffers} is that @code{buffer-menu} switches to the |
| 427 | and select the buffer list manually, you can use all of the commands | 450 | @samp{*Buffer List*} buffer in the selected window; |
| 428 | described here. | 451 | @code{list-buffers} displays the same buffer in another window. If |
| 452 | you run @code{list-buffers} (that is, type @kbd{C-x C-b}) and select | ||
| 453 | the buffer list manually, you can use all of the commands described | ||
| 454 | here. | ||
| 429 | 455 | ||
| 430 | Normally, the buffer @samp{*Buffer List*} is not updated automatically when | 456 | Normally, the buffer @samp{*Buffer List*} is not updated automatically when |
| 431 | buffers are created and killed; its contents are just text. If you have | 457 | buffers are created and killed; its contents are just text. If you have |
| @@ -506,7 +532,7 @@ minibuffer. | |||
| 506 | convenient to switch between buffers. | 532 | convenient to switch between buffers. |
| 507 | 533 | ||
| 508 | @menu | 534 | @menu |
| 509 | * Uniquify:: Buffer names can contain directory parts. | 535 | * Uniquify:: Making buffer names unique with directory parts. |
| 510 | * Iswitchb:: Switching between buffers with substrings. | 536 | * Iswitchb:: Switching between buffers with substrings. |
| 511 | * Buffer Menus:: Configurable buffer menu. | 537 | * Buffer Menus:: Configurable buffer menu. |
| 512 | @end menu | 538 | @end menu |
diff --git a/man/cmdargs.texi b/man/cmdargs.texi index 960f2d0bd65..d131baa094a 100644 --- a/man/cmdargs.texi +++ b/man/cmdargs.texi | |||
| @@ -874,6 +874,9 @@ displays the entire font @samp{6x13}. | |||
| 874 | parts of the Emacs display. To find out what colors are available on | 874 | parts of the Emacs display. To find out what colors are available on |
| 875 | your system, type @kbd{M-x list-colors-display}, or press | 875 | your system, type @kbd{M-x list-colors-display}, or press |
| 876 | @kbd{C-Mouse-2} and select @samp{Display Colors} from the pop-up menu. | 876 | @kbd{C-Mouse-2} and select @samp{Display Colors} from the pop-up menu. |
| 877 | (A particular window system might support many more colors, but the | ||
| 878 | list displayed by @code{list-colors-display} shows their portable | ||
| 879 | subset that can be safely used on any display supported by Emacs.) | ||
| 877 | If you do not specify colors, on windowed displays the default for the | 880 | If you do not specify colors, on windowed displays the default for the |
| 878 | background is white and the default for all other colors is black. On a | 881 | background is white and the default for all other colors is black. On a |
| 879 | monochrome display, the foreground is black, the background is white, | 882 | monochrome display, the foreground is black, the background is white, |
| @@ -947,7 +950,9 @@ specified by the ANSI escape sequences for the 8 standard colors. | |||
| 947 | Use color mode for @var{num} colors. If @var{num} is -1, turn off | 950 | Use color mode for @var{num} colors. If @var{num} is -1, turn off |
| 948 | color support (equivalent to @samp{never}); if it is 0, use the | 951 | color support (equivalent to @samp{never}); if it is 0, use the |
| 949 | default color support for this terminal (equivalent to @samp{auto}); | 952 | default color support for this terminal (equivalent to @samp{auto}); |
| 950 | otherwise use an appropriate standard mode for @var{num} colors. If | 953 | otherwise use an appropriate standard mode for @var{num} colors. |
| 954 | Depending on your terminal's capabilities, Emacs might be able to turn | ||
| 955 | on a color mode for 8, 16, 88, or 256 as the value of @var{num}. If | ||
| 951 | there is no mode that supports @var{num} colors, Emacs acts as if | 956 | there is no mode that supports @var{num} colors, Emacs acts as if |
| 952 | @var{num} were 0, i.e.@: it uses the terminal's default color support | 957 | @var{num} were 0, i.e.@: it uses the terminal's default color support |
| 953 | mode. | 958 | mode. |
diff --git a/man/dired.texi b/man/dired.texi index 464aa34c6c2..0390848faf6 100644 --- a/man/dired.texi +++ b/man/dired.texi | |||
| @@ -1116,13 +1116,10 @@ marked file. As a special case, if no prefix argument is given and | |||
| 1116 | point is on a directory headerline, @kbd{w} gives you the name of that | 1116 | point is on a directory headerline, @kbd{w} gives you the name of that |
| 1117 | directory without looking for marked files. | 1117 | directory without looking for marked files. |
| 1118 | 1118 | ||
| 1119 | @vindex dired-marked-files | ||
| 1120 | The main purpose of the @kbd{w} command is so that you can yank the | 1119 | The main purpose of the @kbd{w} command is so that you can yank the |
| 1121 | file names into arguments for other Emacs commands. It also displays | 1120 | file names into arguments for other Emacs commands. It also displays |
| 1122 | what was pushed onto the kill ring, so you can use it to display the | 1121 | what was pushed onto the kill ring, so you can use it to display the |
| 1123 | list of currently marked files in the echo area. It also stores the | 1122 | list of currently marked files in the echo area. |
| 1124 | list of names in the variable @code{dired-marked-files}, for use in | ||
| 1125 | Lisp expressions. | ||
| 1126 | @end table | 1123 | @end table |
| 1127 | 1124 | ||
| 1128 | @ignore | 1125 | @ignore |
diff --git a/man/files.texi b/man/files.texi index 2ab9d5aaaa6..df7809309e8 100644 --- a/man/files.texi +++ b/man/files.texi | |||
| @@ -120,7 +120,7 @@ is not defined). | |||
| 120 | only when done before Emacs is started. | 120 | only when done before Emacs is started. |
| 121 | 121 | ||
| 122 | @cindex home directory shorthand | 122 | @cindex home directory shorthand |
| 123 | You can use the @file{~/} in a file name to mean your home directory, | 123 | You can use @file{~/} in a file name to mean your home directory, |
| 124 | or @file{~@var{user-id}/} to mean the home directory of a user whose | 124 | or @file{~@var{user-id}/} to mean the home directory of a user whose |
| 125 | login name is @code{user-id}. (On DOS and Windows systems, where a user | 125 | login name is @code{user-id}. (On DOS and Windows systems, where a user |
| 126 | doesn't have a home directory, Emacs substitutes @file{~/} with the | 126 | doesn't have a home directory, Emacs substitutes @file{~/} with the |
| @@ -208,11 +208,13 @@ While in the minibuffer, you can abort @kbd{C-x C-f} by typing | |||
| 208 | about this, see @ref{Completion Options}. | 208 | about this, see @ref{Completion Options}. |
| 209 | 209 | ||
| 210 | @cindex file selection dialog | 210 | @cindex file selection dialog |
| 211 | When Emacs is built with a suitable GUI toolkit, it pops up the | 211 | When Emacs is built with a suitable GUI toolkit, commands invoked |
| 212 | standard File Selection dialog of that toolkit instead of prompting for | 212 | with the mouse or the menu bar use the toolkit's standard File |
| 213 | the file name in the minibuffer. On Unix and GNU/Linux platforms, Emacs | 213 | Selection dialog instead of prompting for the file name in the |
| 214 | does that when built with LessTif and Motif toolkits; on MS-Windows, the | 214 | minibuffer. On Unix and GNU/Linux platforms, Emacs does that when |
| 215 | GUI version does that by default. | 215 | built with GTK, LessTif, and Motif toolkits; on MS-Windows, the GUI |
| 216 | version does that by default. @xref{Dialog Boxes}, for info | ||
| 217 | on customization of this. | ||
| 216 | 218 | ||
| 217 | Your confirmation that @kbd{C-x C-f} has completed successfully is the | 219 | Your confirmation that @kbd{C-x C-f} has completed successfully is the |
| 218 | appearance of new text on the screen and a new buffer name in the mode | 220 | appearance of new text on the screen and a new buffer name in the mode |
| @@ -253,10 +255,10 @@ carriage-return linefeed or just carriage-return if appropriate. | |||
| 253 | @vindex find-file-run-dired | 255 | @vindex find-file-run-dired |
| 254 | If the file you specify is actually a directory, @kbd{C-x C-f} invokes | 256 | If the file you specify is actually a directory, @kbd{C-x C-f} invokes |
| 255 | Dired, the Emacs directory browser, so that you can ``edit'' the contents | 257 | Dired, the Emacs directory browser, so that you can ``edit'' the contents |
| 256 | of the directory (@pxref{Dired}). Dired is a convenient way to delete, | 258 | of the directory (@pxref{Dired}). Dired is a convenient way to view, delete, |
| 257 | look at, or operate on the files in the directory. However, if the | 259 | or operate on the files in the directory. However, if the variable |
| 258 | variable @code{find-file-run-dired} is @code{nil}, then it is an error | 260 | @code{find-file-run-dired} is @code{nil}, then it is an error to try |
| 259 | to try to visit a directory. | 261 | to visit a directory. |
| 260 | 262 | ||
| 261 | Files which are actually collections of other files, or @dfn{file | 263 | Files which are actually collections of other files, or @dfn{file |
| 262 | archives}, are visited in special modes which invoke a Dired-like | 264 | archives}, are visited in special modes which invoke a Dired-like |
| @@ -407,6 +409,9 @@ about other buffers. | |||
| 407 | View the buffer that you are currently being asked about. When you exit | 409 | View the buffer that you are currently being asked about. When you exit |
| 408 | View mode, you get back to @code{save-some-buffers}, which asks the | 410 | View mode, you get back to @code{save-some-buffers}, which asks the |
| 409 | question again. | 411 | question again. |
| 412 | @item d | ||
| 413 | Diff the buffer against its corresponding file, so you can see | ||
| 414 | what changes you would be saving. | ||
| 410 | @item C-h | 415 | @item C-h |
| 411 | Display a help message about these options. | 416 | Display a help message about these options. |
| 412 | @end table | 417 | @end table |
| @@ -3085,26 +3090,24 @@ syntax: | |||
| 3085 | @end example | 3090 | @end example |
| 3086 | 3091 | ||
| 3087 | @noindent | 3092 | @noindent |
| 3088 | When you do this, Emacs may use the FTP program to access files on the | 3093 | To carry out this request, Emacs uses either the FTP program or a |
| 3089 | remote host, or Emacs may use a remote-login program (such as | 3094 | remote-login program such as @command{ssh}, @command{rlogin}, or |
| 3090 | @command{ssh}, @command{rlogin}, or @command{telnet}) to do this. | 3095 | @command{telnet}. You can always specify in the file name which |
| 3091 | 3096 | method to use---for example, | |
| 3092 | You can always specify in the file name which method should be used to | ||
| 3093 | access the remote files, for example | ||
| 3094 | @file{/ftp:@var{user}@@@var{host}:@var{filename}} uses FTP, whereas | 3097 | @file{/ftp:@var{user}@@@var{host}:@var{filename}} uses FTP, whereas |
| 3095 | @file{/ssh:@var{user}@@@var{host}:@var{filename}} uses @command{ssh}. | 3098 | @file{/ssh:@var{user}@@@var{host}:@var{filename}} uses @command{ssh}. |
| 3096 | When you don't specify a method in the file name, Emacs determines a | 3099 | When you don't specify a method in the file name, Emacs chooses |
| 3097 | default method according to the following rules: | 3100 | the method as follows: |
| 3098 | 3101 | ||
| 3099 | @enumerate | 3102 | @enumerate |
| 3100 | @item | 3103 | @item |
| 3101 | If the host name starts with @samp{ftp.} (with dot), then Emacs assumes | 3104 | If the host name starts with @samp{ftp.} (with dot), then Emacs uses |
| 3102 | the @command{ftp} method. | 3105 | FTP. |
| 3103 | @item | 3106 | @item |
| 3104 | If the user name is @samp{ftp} or @samp{anonymous}, then Emacs assumes | 3107 | If the user name is @samp{ftp} or @samp{anonymous}, then Emacs uses |
| 3105 | the @command{ftp} method. | 3108 | FTP. |
| 3106 | @item | 3109 | @item |
| 3107 | Otherwise, Emacs assumes the @command{ssh} method. | 3110 | Otherwise, Emacs uses @command{ssh}. |
| 3108 | @end enumerate | 3111 | @end enumerate |
| 3109 | 3112 | ||
| 3110 | @noindent | 3113 | @noindent |
diff --git a/man/fixit.texi b/man/fixit.texi index 84121842b8c..04fa823e76e 100644 --- a/man/fixit.texi +++ b/man/fixit.texi | |||
| @@ -159,7 +159,7 @@ checker program Ispell, which is not part of Emacs. | |||
| 159 | @table @kbd | 159 | @table @kbd |
| 160 | @item M-x flyspell-mode | 160 | @item M-x flyspell-mode |
| 161 | Enable Flyspell mode, which highlights all misspelled words. | 161 | Enable Flyspell mode, which highlights all misspelled words. |
| 162 | @item M-x flyspell-progmode | 162 | @item M-x flyspell-prog-mode |
| 163 | Enable Flyspell mode for comments and strings only. | 163 | Enable Flyspell mode for comments and strings only. |
| 164 | @item M-$ | 164 | @item M-$ |
| 165 | Check and correct spelling of the word at point (@code{ispell-word}). | 165 | Check and correct spelling of the word at point (@code{ispell-word}). |
diff --git a/man/frames.texi b/man/frames.texi index 2d6c953d2e4..5c0c42b3d8b 100644 --- a/man/frames.texi +++ b/man/frames.texi | |||
| @@ -29,10 +29,6 @@ frame. | |||
| 29 | so that you can use many of the features described in this chapter. | 29 | so that you can use many of the features described in this chapter. |
| 30 | @xref{MS-DOS Input}, for more information. | 30 | @xref{MS-DOS Input}, for more information. |
| 31 | 31 | ||
| 32 | @cindex MS Windows | ||
| 33 | Emacs compiled for MS Windows mostly supports the same features as | ||
| 34 | under X. | ||
| 35 | |||
| 36 | @menu | 32 | @menu |
| 37 | * Mouse Commands:: Moving, cutting, and pasting, with the mouse. | 33 | * Mouse Commands:: Moving, cutting, and pasting, with the mouse. |
| 38 | * Secondary Selection:: Cutting without altering point and mark. | 34 | * Secondary Selection:: Cutting without altering point and mark. |
| @@ -48,7 +44,7 @@ under X. | |||
| 48 | * Frame Parameters:: Changing the colors and other modes of frames. | 44 | * Frame Parameters:: Changing the colors and other modes of frames. |
| 49 | * Scroll Bars:: How to enable and disable scroll bars; how to use them. | 45 | * Scroll Bars:: How to enable and disable scroll bars; how to use them. |
| 50 | * Wheeled Mice:: Using mouse wheels for scrolling. | 46 | * Wheeled Mice:: Using mouse wheels for scrolling. |
| 51 | * Drag and drop:: Using drag and drop to open files and insert text. | 47 | * Drag and Drop:: Using drag and drop to open files and insert text. |
| 52 | * Menu Bars:: Enabling and disabling the menu bar. | 48 | * Menu Bars:: Enabling and disabling the menu bar. |
| 53 | * Tool Bars:: Enabling and disabling the tool bar. | 49 | * Tool Bars:: Enabling and disabling the tool bar. |
| 54 | * Dialog Boxes:: Controlling use of dialog boxes. | 50 | * Dialog Boxes:: Controlling use of dialog boxes. |
| @@ -64,7 +60,9 @@ under X. | |||
| 64 | 60 | ||
| 65 | The mouse commands for selecting and copying a region are mostly | 61 | The mouse commands for selecting and copying a region are mostly |
| 66 | compatible with the @code{xterm} program. You can use the same mouse | 62 | compatible with the @code{xterm} program. You can use the same mouse |
| 67 | commands for copying between Emacs and other X client programs. | 63 | commands for copying between Emacs and other window-based programs. |
| 64 | Most of these commands also work in Emacs when you run it under an | ||
| 65 | @code{xterm} terminal. | ||
| 68 | 66 | ||
| 69 | @kindex DELETE @r{(and mouse selection)} | 67 | @kindex DELETE @r{(and mouse selection)} |
| 70 | If you select a region with any of these mouse commands, and then | 68 | If you select a region with any of these mouse commands, and then |
| @@ -188,8 +186,6 @@ you want. Then yank it in Emacs with @kbd{C-y} or @kbd{Mouse-2}. | |||
| 188 | system for X selections, use @kbd{C-x @key{RET} x} or @kbd{C-x | 186 | system for X selections, use @kbd{C-x @key{RET} x} or @kbd{C-x |
| 189 | @key{RET} X}. @xref{Specify Coding}. | 187 | @key{RET} X}. @xref{Specify Coding}. |
| 190 | 188 | ||
| 191 | These cutting and pasting commands also work on MS-Windows. | ||
| 192 | |||
| 193 | @cindex primary selection | 189 | @cindex primary selection |
| 194 | @cindex cut buffer | 190 | @cindex cut buffer |
| 195 | @cindex selection, primary | 191 | @cindex selection, primary |
| @@ -270,7 +266,7 @@ that matters is which window you click on. @xref{Mouse Commands}. | |||
| 270 | @cindex OpenWindows | 266 | @cindex OpenWindows |
| 271 | @cindex Gnome | 267 | @cindex Gnome |
| 272 | 268 | ||
| 273 | As well as the primary and secondary selection types, X supports a | 269 | Apart from the primary and secondary selection types, X supports a |
| 274 | @dfn{clipboard} selection type which is used by some applications, | 270 | @dfn{clipboard} selection type which is used by some applications, |
| 275 | particularly under OpenWindows and Gnome. | 271 | particularly under OpenWindows and Gnome. |
| 276 | 272 | ||
| @@ -287,28 +283,42 @@ unlike most systems. | |||
| 287 | 283 | ||
| 288 | @node Mouse References | 284 | @node Mouse References |
| 289 | @section Following References with the Mouse | 285 | @section Following References with the Mouse |
| 286 | @kindex Mouse-1 @r{(selection)} | ||
| 290 | @kindex Mouse-2 @r{(selection)} | 287 | @kindex Mouse-2 @r{(selection)} |
| 291 | 288 | ||
| 292 | Some Emacs buffers display lists of various sorts. These include | 289 | Some read-only Emacs buffers include references you can follow, or |
| 293 | lists of files, of buffers, of possible completions, of matches for | 290 | commands you can activate. These include names of files, of buffers, |
| 294 | a pattern, and so on. | 291 | of possible completions, of matches for a pattern, as well as the |
| 295 | 292 | buttons in Help buffers and customization buffers. You can follow the | |
| 296 | Since yanking text into these buffers is not very useful, most of them | 293 | reference or activate the command by moving point to it and typing |
| 297 | define @kbd{Mouse-2} specially, as a command to use or view the item you | 294 | @key{RET}. You can also do this with the mouse, using either |
| 298 | click on. | 295 | @kbd{Mouse-1} or @kbd{Mouse-2}. |
| 299 | 296 | ||
| 300 | For example, if you click @kbd{Mouse-2} on a file name in a Dired | 297 | Since yanking text into a read-only buffer is not allowed, these |
| 301 | buffer, you visit that file. If you click @kbd{Mouse-2} on an error | 298 | buffers generally define @kbd{Mouse-2} to follow a reference or |
| 302 | message in the @samp{*Compilation*} buffer, you go to the source code | 299 | activate a command. For example, if you click @kbd{Mouse-2} on a file |
| 303 | for that error message. If you click @kbd{Mouse-2} on a completion in | 300 | name in a Dired buffer, you visit that file. If you click |
| 304 | the @samp{*Completions*} buffer, you choose that completion. | 301 | @kbd{Mouse-2} on an error message in the @samp{*Compilation*} buffer, |
| 302 | you go to the source code for that error message. If you click | ||
| 303 | @kbd{Mouse-2} on a completion in the @samp{*Completions*} buffer, you | ||
| 304 | choose that completion. | ||
| 305 | |||
| 306 | @vindex mouse-1-click-follows-link | ||
| 307 | However, most applications use @kbd{Mouse-1} to do this sort of | ||
| 308 | thing, so Emacs implements this too. If you click @kbd{Mouse-1} | ||
| 309 | quickly on a reference or button, it follows or activates. If you | ||
| 310 | click slowly, it moves point as usual. Dragging, meaning moving the | ||
| 311 | mouse while it is held down, also has its usual behavior of setting | ||
| 312 | the region. The variable @code{mouse-1-click-follows-link} controls | ||
| 313 | whether @kbd{Mouse-1} has this behavior. | ||
| 305 | 314 | ||
| 306 | @vindex mouse-highlight | 315 | @vindex mouse-highlight |
| 307 | You can usually tell when @kbd{Mouse-2} has this special sort of | 316 | You can usually tell when @kbd{Mouse-1} and @kbd{Mouse-2} have this |
| 308 | meaning because the sensitive text highlights when you move the mouse | 317 | special sort of meaning because the sensitive text highlights when you |
| 309 | over it. The variable @code{mouse-highlight} controls whether to do | 318 | move the mouse over it. The variable @code{mouse-highlight} controls |
| 310 | this highlighting always (even when such text appears where the mouse | 319 | whether to do this highlighting always (even when such text appears |
| 311 | already is), never, or only immediately after you move the mouse. | 320 | where the mouse already is), never, or only immediately after you move |
| 321 | the mouse. | ||
| 312 | 322 | ||
| 313 | @node Menu Mouse Clicks | 323 | @node Menu Mouse Clicks |
| 314 | @section Mouse Clicks for Menus | 324 | @section Mouse Clicks for Menus |
| @@ -331,16 +341,17 @@ for editing formatted text. @xref{Formatted Text}. | |||
| 331 | 341 | ||
| 332 | @item C-Mouse-3 | 342 | @item C-Mouse-3 |
| 333 | @kindex C-Mouse-3 | 343 | @kindex C-Mouse-3 |
| 334 | This menu is mode-specific. For most modes if Menu-bar mode is on, this | 344 | This menu is mode-specific. For most modes if Menu-bar mode is on, |
| 335 | menu has the same items as all the mode-specific menu-bar menus put | 345 | this menu has the same items as all the mode-specific menu-bar menus |
| 336 | together. Some modes may specify a different menu for this | 346 | put together. Some modes may specify a different menu for this |
| 337 | button.@footnote{Some systems use @kbd{Mouse-3} for a mode-specific | 347 | button.@footnote{Some systems use @kbd{Mouse-3} for a mode-specific |
| 338 | menu. We took a survey of users, and found they preferred to keep | 348 | menu. We took a survey of users, and found they preferred to keep |
| 339 | @kbd{Mouse-3} for selecting and killing regions. Hence the decision to | 349 | @kbd{Mouse-3} for selecting and killing regions. Hence the decision |
| 340 | use @kbd{C-Mouse-3} for this menu.} If Menu-bar mode is off, this menu | 350 | to use @kbd{C-Mouse-3} for this menu. To use @kbd{Mouse-3} instead, |
| 341 | contains all the items which would be present in the menu bar---not just | 351 | do @code{(global-set-key [mouse-3] 'mouse-popup-menubar-stuff)}.} If |
| 342 | the mode-specific ones---so that you can access them without having to | 352 | Menu-bar mode is off, this menu contains all the items which would be |
| 343 | display the menu bar. | 353 | present in the menu bar---not just the mode-specific ones---so that |
| 354 | you can access them without having to display the menu bar. | ||
| 344 | 355 | ||
| 345 | @item S-Mouse-1 | 356 | @item S-Mouse-1 |
| 346 | This menu is for specifying the frame's principal font. | 357 | This menu is for specifying the frame's principal font. |
| @@ -357,9 +368,9 @@ windows. | |||
| 357 | @table @kbd | 368 | @table @kbd |
| 358 | @item Mouse-1 | 369 | @item Mouse-1 |
| 359 | @kindex Mouse-1 @r{(mode line)} | 370 | @kindex Mouse-1 @r{(mode line)} |
| 360 | @kbd{Mouse-1} on a mode line selects the window above. By dragging | 371 | @kbd{Mouse-1} on a mode line selects the window it belongs to. By |
| 361 | @kbd{Mouse-1} on the mode line, you can move it, thus changing the | 372 | dragging @kbd{Mouse-1} on the mode line, you can move it, thus |
| 362 | height of the windows above and below. | 373 | changing the height of the windows above and below. |
| 363 | 374 | ||
| 364 | @item Mouse-2 | 375 | @item Mouse-2 |
| 365 | @kindex Mouse-2 @r{(mode line)} | 376 | @kindex Mouse-2 @r{(mode line)} |
| @@ -367,9 +378,9 @@ height of the windows above and below. | |||
| 367 | 378 | ||
| 368 | @item Mouse-3 | 379 | @item Mouse-3 |
| 369 | @kindex Mouse-3 @r{(mode line)} | 380 | @kindex Mouse-3 @r{(mode line)} |
| 370 | @kbd{Mouse-3} on a mode line deletes the window above. If the frame has | 381 | @kbd{Mouse-3} on a mode line deletes the window it belongs to. If the |
| 371 | only one window, it buries the current buffer instead and switches to | 382 | frame has only one window, it buries the current buffer instead, and |
| 372 | another buffer. | 383 | switches to another buffer. |
| 373 | 384 | ||
| 374 | @item C-Mouse-2 | 385 | @item C-Mouse-2 |
| 375 | @kindex C-mouse-2 @r{(mode line)} | 386 | @kindex C-mouse-2 @r{(mode line)} |
| @@ -639,7 +650,6 @@ whether that feature is also in use for the same buffer name. | |||
| 639 | 650 | ||
| 640 | @node Frame Parameters | 651 | @node Frame Parameters |
| 641 | @section Setting Frame Parameters | 652 | @section Setting Frame Parameters |
| 642 | @cindex colors | ||
| 643 | @cindex Auto-Raise mode | 653 | @cindex Auto-Raise mode |
| 644 | @cindex Auto-Lower mode | 654 | @cindex Auto-Lower mode |
| 645 | 655 | ||
| @@ -653,10 +663,16 @@ window management behavior of the selected frame. | |||
| 653 | @findex set-border-color | 663 | @findex set-border-color |
| 654 | @findex auto-raise-mode | 664 | @findex auto-raise-mode |
| 655 | @findex auto-lower-mode | 665 | @findex auto-lower-mode |
| 666 | @cindex colors | ||
| 656 | @table @kbd | 667 | @table @kbd |
| 657 | @item M-x set-foreground-color @key{RET} @var{color} @key{RET} | 668 | @item M-x set-foreground-color @key{RET} @var{color} @key{RET} |
| 658 | Specify color @var{color} for the foreground of the selected frame. | 669 | Specify color @var{color} for the foreground of the selected frame. |
| 659 | (This also changes the foreground color of the default face.) | 670 | (This also changes the foreground color of the default face.) You can |
| 671 | specify @var{color} either by its symbolic name or by its RGB | ||
| 672 | numerical specification@footnote{ | ||
| 673 | See the X Window System documentation for more details. On a typical | ||
| 674 | GNU or Unix system, the command @kbd{man 7 X} or @kbd{man -s 7 X} will | ||
| 675 | display the X manual page that explains how to specify colors.}. | ||
| 660 | 676 | ||
| 661 | @item M-x set-background-color @key{RET} @var{color} @key{RET} | 677 | @item M-x set-background-color @key{RET} @var{color} @key{RET} |
| 662 | Specify color @var{color} for the background of the selected frame. | 678 | Specify color @var{color} for the background of the selected frame. |
| @@ -674,7 +690,8 @@ Specify color @var{color} for the border of the selected frame. | |||
| 674 | 690 | ||
| 675 | @item M-x list-colors-display | 691 | @item M-x list-colors-display |
| 676 | Display the defined color names and show what the colors look like. | 692 | Display the defined color names and show what the colors look like. |
| 677 | This command is somewhat slow. | 693 | This command is somewhat slow. @xref{Colors, list-colors-display, |
| 694 | Display available colors}. | ||
| 678 | 695 | ||
| 679 | @item M-x auto-raise-mode | 696 | @item M-x auto-raise-mode |
| 680 | Toggle whether or not the selected frame should auto-raise. Auto-raise | 697 | Toggle whether or not the selected frame should auto-raise. Auto-raise |
| @@ -798,19 +815,24 @@ generating appropriate events for Emacs. | |||
| 798 | @code{mouse-wheel-scroll-amount} determine where and by how much | 815 | @code{mouse-wheel-scroll-amount} determine where and by how much |
| 799 | buffers are scrolled. | 816 | buffers are scrolled. |
| 800 | 817 | ||
| 801 | @node Drag and drop | 818 | @node Drag and Drop |
| 802 | @section Drag and drop in Emacs. | 819 | @section Drag and Drop |
| 803 | |||
| 804 | @cindex drag and drop | 820 | @cindex drag and drop |
| 805 | Emacs supports drag and drop so that dropping of files and text is handled. | ||
| 806 | Currently supported drag and drop protocols are XDND, Motif and the old | ||
| 807 | KDE 1.x protocol. There is no drag support yet. | ||
| 808 | When text is dropped on Emacs, Emacs inserts the text where it is dropped. | ||
| 809 | When a file is dragged from a file manager to Emacs, Emacs opens that file. | ||
| 810 | As a special case, if a file is dropped on a dired buffer the file is | ||
| 811 | copied or moved (depends on exactly how it is dragged and the application | ||
| 812 | it was dragged from) to the directory the dired buffer is displaying. | ||
| 813 | 821 | ||
| 822 | Emacs supports @dfn{drag and drop} using the mouse. For instance, | ||
| 823 | dropping text onto an Emacs frame inserts the text where it is dropped. | ||
| 824 | Dropping a file onto an Emacs frame visits that file. As a special | ||
| 825 | case, dropping the file on a Dired buffer moves or copies the file | ||
| 826 | (according to the conventions of the application it came from) into the | ||
| 827 | directory displayed in that buffer. | ||
| 828 | |||
| 829 | @vindex x-dnd-open-file-other-window | ||
| 830 | Dropping a file normally visits it in the window you drop it on. If | ||
| 831 | you prefer to visit the file in a new window in such cases, customize | ||
| 832 | the variable @code{x-dnd-open-file-other-window}. | ||
| 833 | |||
| 834 | @ignore | ||
| 835 | @c ??? To Lisp manual | ||
| 814 | @vindex x-dnd-test-function | 836 | @vindex x-dnd-test-function |
| 815 | @vindex x-dnd-known-types | 837 | @vindex x-dnd-known-types |
| 816 | When a user drags something from another application over Emacs, that other | 838 | When a user drags something from another application over Emacs, that other |
| @@ -822,26 +844,24 @@ which accepts drops if the type of the data to be dropped is present in | |||
| 822 | @code{x-dnd-known-types} if you want Emacs to accept or reject drops based | 844 | @code{x-dnd-known-types} if you want Emacs to accept or reject drops based |
| 823 | on some other criteria. | 845 | on some other criteria. |
| 824 | 846 | ||
| 825 | @vindex x-dnd-open-file-other-window | ||
| 826 | A file is normally opened in the window it is dropped on, but if you | ||
| 827 | prefer the file to be opened in a new window you can customize the variable | ||
| 828 | @code{x-dnd-open-file-other-window}. | ||
| 829 | |||
| 830 | @vindex x-dnd-types-alist | 847 | @vindex x-dnd-types-alist |
| 831 | If you want to change the way Emacs handles drop of different types | 848 | If you want to change the way Emacs handles drop of different types |
| 832 | or add a new type, you shall customize @code{x-dnd-types-alist}. This | 849 | or add a new type, customize @code{x-dnd-types-alist}. This requires |
| 833 | requires detailed knowledge of what types other applications use | 850 | detailed knowledge of what types other applications use for drag and |
| 834 | for drag and drop. | 851 | drop. |
| 835 | 852 | ||
| 836 | @vindex x-dnd-protocol-alist | 853 | @vindex x-dnd-protocol-alist |
| 837 | When an URL is dropped on Emacs it may be a file, but it may also be | 854 | When an URL is dropped on Emacs it may be a file, but it may also be |
| 838 | another URL type (ftp, http, etc.). Emacs first checks | 855 | another URL type (ftp, http, etc.). Emacs first checks |
| 839 | @code{x-dnd-protocol-alist} to determine what to do with the URL. If there | 856 | @code{x-dnd-protocol-alist} to determine what to do with the URL. If |
| 840 | is no match there and if @code{browse-url-browser-function} is an alist, | 857 | there is no match there and if @code{browse-url-browser-function} is |
| 841 | Emacs looks for a match there. If no match is found the text for the URL | 858 | an alist, Emacs looks for a match there. If no match is found the |
| 842 | is inserted. If you want to alter Emacs behaviour you can customize these | 859 | text for the URL is inserted. If you want to alter Emacs behavior, |
| 843 | variables. | 860 | you can customize these variables. |
| 861 | @end ignore | ||
| 844 | 862 | ||
| 863 | The drag and drop protocols XDND, Motif and the | ||
| 864 | old KDE 1.x protocol are currently supported. | ||
| 845 | 865 | ||
| 846 | @node Menu Bars | 866 | @node Menu Bars |
| 847 | @section Menu Bars | 867 | @section Menu Bars |
| @@ -873,20 +893,20 @@ menus. | |||
| 873 | @cindex mode, Tool Bar | 893 | @cindex mode, Tool Bar |
| 874 | @cindex icons, toolbar | 894 | @cindex icons, toolbar |
| 875 | 895 | ||
| 876 | The @dfn{tool bar} is a line (or multiple lines) of icons at the top | 896 | The @dfn{tool bar} is a line (or lines) of icons at the top of the |
| 877 | of the Emacs window. You can click on these icons with the mouse | 897 | Emacs window, just below the menu bar. You can click on these icons |
| 878 | to do various jobs. | 898 | with the mouse to do various jobs. |
| 879 | 899 | ||
| 880 | The global tool bar contains general commands. Some major modes | 900 | The global tool bar contains general commands. Some major modes |
| 881 | define their own tool bars to replace it. A few ``special'' modes | 901 | define their own tool bars to replace it. A few ``special'' modes |
| 882 | that are not designed for ordinary editing remove some items from the | 902 | that are not designed for ordinary editing remove some items from the |
| 883 | global tool bar. | 903 | global tool bar. |
| 884 | 904 | ||
| 885 | Tool bars work only on a graphical display. The tool bar uses colored | 905 | Tool bars work only on a graphical display. The tool bar uses colored |
| 886 | XPM icons if Emacs was built with XPM support. Otherwise, the tool | 906 | XPM icons if Emacs was built with XPM support. Otherwise, the tool |
| 887 | bar uses monochrome icons (PBM or XBM format). | 907 | bar uses monochrome icons (PBM or XBM format). |
| 888 | 908 | ||
| 889 | You can turn display of tool bars on or off with @kbd{M-x | 909 | You can turn display of tool bars on or off with @kbd{M-x |
| 890 | tool-bar-mode}. | 910 | tool-bar-mode}. |
| 891 | 911 | ||
| 892 | @node Dialog Boxes | 912 | @node Dialog Boxes |
diff --git a/man/text.texi b/man/text.texi index a83e78cc211..8eaa6178a8d 100644 --- a/man/text.texi +++ b/man/text.texi | |||
| @@ -185,9 +185,9 @@ Kill back to the beginning of the sentence (@code{backward-kill-sentence}). | |||
| 185 | The commands @kbd{M-a} and @kbd{M-e} (@code{backward-sentence} and | 185 | The commands @kbd{M-a} and @kbd{M-e} (@code{backward-sentence} and |
| 186 | @code{forward-sentence}) move to the beginning and end of the current | 186 | @code{forward-sentence}) move to the beginning and end of the current |
| 187 | sentence, respectively. They were chosen to resemble @kbd{C-a} and | 187 | sentence, respectively. They were chosen to resemble @kbd{C-a} and |
| 188 | @kbd{C-e}, which move to the beginning and end of a line. Unlike them, | 188 | @kbd{C-e}, which move to the beginning and end of a line. Unlike |
| 189 | @kbd{M-a} and @kbd{M-e} if repeated or given numeric arguments move over | 189 | them, @kbd{M-a} and @kbd{M-e} move over successive sentences if |
| 190 | successive sentences. | 190 | repeated. |
| 191 | 191 | ||
| 192 | Moving backward over a sentence places point just before the first | 192 | Moving backward over a sentence places point just before the first |
| 193 | character of the sentence; moving forward places point right after the | 193 | character of the sentence; moving forward places point right after the |
| @@ -238,11 +238,10 @@ set @code{sentence-end} to this value: | |||
| 238 | @end example | 238 | @end example |
| 239 | 239 | ||
| 240 | @noindent | 240 | @noindent |
| 241 | You should also set the variable @code{sentence-end-double-space} to | 241 | This is what setting the variable @code{sentence-end-double-space} to |
| 242 | @code{nil} so that the fill commands expect and leave just one space at | 242 | @code{nil} automatically does. But note that this makes it impossible |
| 243 | the end of a sentence. Note that this makes it impossible to | 243 | to distinguish between periods that end sentences and those that |
| 244 | distinguish between periods that end sentences and those that indicate | 244 | indicate abbreviations. |
| 245 | abbreviations. | ||
| 246 | 245 | ||
| 247 | @node Paragraphs | 246 | @node Paragraphs |
| 248 | @section Paragraphs | 247 | @section Paragraphs |
| @@ -269,8 +268,8 @@ paragraph, while @kbd{M-@}} moves to the end of the current or next | |||
| 269 | paragraph. Blank lines and text-formatter command lines separate | 268 | paragraph. Blank lines and text-formatter command lines separate |
| 270 | paragraphs and are not considered part of any paragraph. In Indented | 269 | paragraphs and are not considered part of any paragraph. In Indented |
| 271 | Text mode, but not in Text mode, an indented line also starts a new | 270 | Text mode, but not in Text mode, an indented line also starts a new |
| 272 | paragraph. (If a paragraph is preceded by a blank line, these | 271 | paragraph. If there is a blank line before the paragraph, @kbd{M-@{} |
| 273 | commands treat that blank line as the beginning of the paragraph.) | 272 | moves to the blank line, because that is convenient in practice. |
| 274 | 273 | ||
| 275 | In major modes for programs, paragraphs begin and end only at blank | 274 | In major modes for programs, paragraphs begin and end only at blank |
| 276 | lines. This makes the paragraph commands continue to be useful even | 275 | lines. This makes the paragraph commands continue to be useful even |
| @@ -894,11 +893,11 @@ invisible so that you can see the outline structure. Type @kbd{M-x | |||
| 894 | outline-mode} to switch to Outline mode as the major mode of the current | 893 | outline-mode} to switch to Outline mode as the major mode of the current |
| 895 | buffer. | 894 | buffer. |
| 896 | 895 | ||
| 897 | When Outline mode makes a line invisible, the line does not appear on | 896 | When Outline mode makes a line invisible, the line does not appear |
| 898 | the screen. The screen appears exactly as if the invisible line were | 897 | on the screen. The screen appears exactly as if the invisible line |
| 899 | deleted, except that an ellipsis (three periods in a row) appears at the | 898 | were deleted, except that an ellipsis (three periods in a row) appears |
| 900 | end of the previous visible line (only one ellipsis no matter how many | 899 | at the end of the previous visible line. (Multiple consecutive |
| 901 | invisible lines follow). | 900 | invisible lines produce just one ellipsis.) |
| 902 | 901 | ||
| 903 | Editing commands that operate on lines, such as @kbd{C-n} and | 902 | Editing commands that operate on lines, such as @kbd{C-n} and |
| 904 | @kbd{C-p}, treat the text of the invisible line as part of the previous | 903 | @kbd{C-p}, treat the text of the invisible line as part of the previous |
| @@ -929,7 +928,7 @@ the hook @code{outline-mode-hook} (@pxref{Hooks}). | |||
| 929 | outlines. | 928 | outlines. |
| 930 | * Visibility: Outline Visibility. Commands to control what is visible. | 929 | * Visibility: Outline Visibility. Commands to control what is visible. |
| 931 | * Views: Outline Views. Outlines and multiple views. | 930 | * Views: Outline Views. Outlines and multiple views. |
| 932 | * Foldout:: Folding editing. | 931 | * Foldout:: Folding means zooming in on outlines. |
| 933 | @end menu | 932 | @end menu |
| 934 | 933 | ||
| 935 | @node Outline Format | 934 | @node Outline Format |
| @@ -1900,8 +1899,11 @@ for more information about text properties. | |||
| 1900 | @cindex soft newline | 1899 | @cindex soft newline |
| 1901 | @cindex newlines, hard and soft | 1900 | @cindex newlines, hard and soft |
| 1902 | 1901 | ||
| 1902 | @cindex use-hard-newlines | ||
| 1903 | In formatted text, Emacs distinguishes between two different kinds of | 1903 | In formatted text, Emacs distinguishes between two different kinds of |
| 1904 | newlines, @dfn{hard} newlines and @dfn{soft} newlines. | 1904 | newlines, @dfn{hard} newlines and @dfn{soft} newlines. (You can enable |
| 1905 | or disable this feature separately in any buffer with the command | ||
| 1906 | @code{use-hard-newlines}.) | ||
| 1905 | 1907 | ||
| 1906 | Hard newlines are used to separate paragraphs, or items in a list, or | 1908 | Hard newlines are used to separate paragraphs, or items in a list, or |
| 1907 | anywhere that there should always be a line break regardless of the | 1909 | anywhere that there should always be a line break regardless of the |
diff --git a/man/windows.texi b/man/windows.texi index 8416c4be076..0d90a3b2e0c 100644 --- a/man/windows.texi +++ b/man/windows.texi | |||
| @@ -60,8 +60,8 @@ only one mark position. | |||
| 60 | 60 | ||
| 61 | Each window has its own mode line, which displays the buffer name, | 61 | Each window has its own mode line, which displays the buffer name, |
| 62 | modification status and major and minor modes of the buffer that is | 62 | modification status and major and minor modes of the buffer that is |
| 63 | displayed in the window. @xref{Mode Line}, for full details on the mode | 63 | displayed in the window. The selected window's mode line appears in a |
| 64 | line. | 64 | different color. @xref{Mode Line}, for full details on the mode line. |
| 65 | 65 | ||
| 66 | @iftex | 66 | @iftex |
| 67 | @break | 67 | @break |
| @@ -322,9 +322,14 @@ except for the echo area. | |||
| 322 | @kbd{Mouse-3}, and delete all the windows in a frame except one window | 322 | @kbd{Mouse-3}, and delete all the windows in a frame except one window |
| 323 | by clicking on that window's mode line with @kbd{Mouse-2}. | 323 | by clicking on that window's mode line with @kbd{Mouse-2}. |
| 324 | 324 | ||
| 325 | The easiest way to adjust window heights is with a mouse. If you | 325 | You can also adjust window heights and widths with the mouse. If |
| 326 | press @kbd{Mouse-1} on a mode line, you can drag that mode line up or | 326 | you press @kbd{Mouse-1} on a mode line, you can drag that mode line up |
| 327 | down, changing the heights of the windows above and below it. | 327 | or down, changing the heights of the windows above and below it. If |
| 328 | you press it on the divider between two consecutive mode lines, you | ||
| 329 | can drag that divider right or left, changing the widths of the | ||
| 330 | windows to either side. Note that changing heights and widths with | ||
| 331 | the mouse never deletes windows, it just refuses to make any window | ||
| 332 | smaller than it can be. | ||
| 328 | 333 | ||
| 329 | @kindex C-x ^ | 334 | @kindex C-x ^ |
| 330 | @findex enlarge-window | 335 | @findex enlarge-window |