diff options
| author | Chong Yidong | 2011-10-15 12:37:45 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-10-15 12:37:45 -0400 |
| commit | 21100e7d3fe488d90e747caebbe4f7ccb90d2515 (patch) | |
| tree | e3b6f2deb86b198a2e8dd577d17229599a66ef02 | |
| parent | 6bbfa6e17d61b9725bf7240f86cbb802eee669f5 (diff) | |
| download | emacs-21100e7d3fe488d90e747caebbe4f7ccb90d2515.tar.gz emacs-21100e7d3fe488d90e747caebbe4f7ccb90d2515.zip | |
Two minor manual updates.
* doc/emacs/killing.texi (Deletion): Document negative prefix arg to M-SPC.
* doc/emacs/regs.texi (Text Registers): C-x r i does not activate the mark.
(Bookmarks): Document new default bookmark location.
| -rw-r--r-- | admin/FOR-RELEASE | 12 | ||||
| -rw-r--r-- | doc/emacs/ChangeLog | 10 | ||||
| -rw-r--r-- | doc/emacs/killing.texi | 6 | ||||
| -rw-r--r-- | doc/emacs/regs.texi | 35 | ||||
| -rw-r--r-- | etc/NEWS | 2 |
5 files changed, 39 insertions, 26 deletions
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 4481d8cd93b..26e3de63808 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE | |||
| @@ -152,7 +152,7 @@ abbrevs.texi | |||
| 152 | ack.texi | 152 | ack.texi |
| 153 | anti.texi | 153 | anti.texi |
| 154 | arevert-xtra.texi | 154 | arevert-xtra.texi |
| 155 | basic.texi | 155 | basic.texi cyd |
| 156 | buffers.texi | 156 | buffers.texi |
| 157 | building.texi | 157 | building.texi |
| 158 | calendar.texi | 158 | calendar.texi |
| @@ -172,23 +172,23 @@ fixit.texi | |||
| 172 | fortran-xtra.texi | 172 | fortran-xtra.texi |
| 173 | frames.texi | 173 | frames.texi |
| 174 | glossary.texi | 174 | glossary.texi |
| 175 | help.texi | 175 | help.texi cyd |
| 176 | indent.texi | 176 | indent.texi |
| 177 | killing.texi | 177 | killing.texi cyd |
| 178 | kmacro.texi | 178 | kmacro.texi |
| 179 | macos.texi | 179 | macos.texi |
| 180 | maintaining.texi | 180 | maintaining.texi |
| 181 | major.texi | 181 | major.texi |
| 182 | mark.texi | 182 | mark.texi cyd |
| 183 | mini.texi | 183 | mini.texi |
| 184 | misc.texi | 184 | misc.texi |
| 185 | msdog.texi | 185 | msdog.texi |
| 186 | msdog-xtra.texi | 186 | msdog-xtra.texi |
| 187 | mule.texi | 187 | mule.texi |
| 188 | m-x.texi | 188 | m-x.texi cyd |
| 189 | picture-xtra.texi | 189 | picture-xtra.texi |
| 190 | programs.texi | 190 | programs.texi |
| 191 | regs.texi | 191 | regs.texi cyd |
| 192 | rmail.texi | 192 | rmail.texi |
| 193 | screen.texi cyd | 193 | screen.texi cyd |
| 194 | search.texi | 194 | search.texi |
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 3fa8eece141..a39b703b4dd 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2011-10-15 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * display.texi (Scrolling): Tweak explanation of scroll direction. | ||
| 4 | (View Mode): Add index entries. | ||
| 5 | |||
| 6 | * killing.texi (Deletion): Document negative prefix arg to M-SPC. | ||
| 7 | |||
| 8 | * regs.texi (Text Registers): C-x r i does not activate the mark. | ||
| 9 | (Bookmarks): Document new default bookmark location. | ||
| 10 | |||
| 1 | 2011-10-13 Chong Yidong <cyd@stupidchicken.com> | 11 | 2011-10-13 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 12 | ||
| 3 | * killing.texi (Deletion): Add xref to Using Region. Document | 13 | * killing.texi (Deletion): Add xref to Using Region. Document |
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 493316daa52..8689e9c8324 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi | |||
| @@ -118,10 +118,12 @@ characters: spaces, tabs and newlines. @kbd{M-\} | |||
| 118 | (@code{delete-horizontal-space}) deletes all the spaces and tab | 118 | (@code{delete-horizontal-space}) deletes all the spaces and tab |
| 119 | characters before and after point. With a prefix argument, this only | 119 | characters before and after point. With a prefix argument, this only |
| 120 | deletes spaces and tab characters before point. @kbd{M-@key{SPC}} | 120 | deletes spaces and tab characters before point. @kbd{M-@key{SPC}} |
| 121 | (@code{just-one-space}) does likewise but leaves a single space after | 121 | (@code{just-one-space}) does likewise but leaves a single space before |
| 122 | point, regardless of the number of spaces that existed previously | 122 | point, regardless of the number of spaces that existed previously |
| 123 | (even if there were none before). With a numeric argument @var{n}, it | 123 | (even if there were none before). With a numeric argument @var{n}, it |
| 124 | leaves @var{n} spaces after point. | 124 | leaves @var{n} spaces before point if @var{n} is positive; if @var{n} |
| 125 | is negative, it deletes newlines in addition to spaces and tabs, | ||
| 126 | leaving a single space before point. | ||
| 125 | 127 | ||
| 126 | @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines | 128 | @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines |
| 127 | after the current line. If the current line is blank, it deletes all | 129 | after the current line. If the current line is blank, it deletes all |
diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index b4b9fd252e1..41a807375a9 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi | |||
| @@ -30,9 +30,9 @@ Display a description of what register @var{r} contains. | |||
| 30 | @end table | 30 | @end table |
| 31 | 31 | ||
| 32 | @dfn{Bookmarks} record files and positions in them, so you can | 32 | @dfn{Bookmarks} record files and positions in them, so you can |
| 33 | return to those positions when you look at the file again. | 33 | return to those positions when you look at the file again. Bookmarks |
| 34 | Bookmarks are similar enough in spirit to registers that they | 34 | are similar in spirit to registers, so they are also documented in |
| 35 | seem to belong in this chapter. | 35 | this chapter. |
| 36 | 36 | ||
| 37 | @menu | 37 | @menu |
| 38 | * Position Registers:: Saving positions in registers. | 38 | * Position Registers:: Saving positions in registers. |
| @@ -119,9 +119,9 @@ the region text to the text in the register instead of | |||
| 119 | @kindex C-x r i | 119 | @kindex C-x r i |
| 120 | @findex insert-register | 120 | @findex insert-register |
| 121 | @kbd{C-x r i @var{r}} inserts in the buffer the text from register | 121 | @kbd{C-x r i @var{r}} inserts in the buffer the text from register |
| 122 | @var{r}. Normally it leaves point before the text and places the mark | 122 | @var{r}. Normally it leaves point before the text and sets the mark |
| 123 | after, but with a numeric argument (@kbd{C-u}) it puts point after the | 123 | after, without activating it. With a numeric argument, it instead |
| 124 | text and the mark before. | 124 | puts point after the text and the mark before. |
| 125 | 125 | ||
| 126 | @node Rectangle Registers | 126 | @node Rectangle Registers |
| 127 | @section Saving Rectangles in Registers | 127 | @section Saving Rectangles in Registers |
| @@ -143,12 +143,9 @@ Insert the rectangle stored in register @var{r} (if it contains a | |||
| 143 | rectangle) (@code{insert-register}). | 143 | rectangle) (@code{insert-register}). |
| 144 | @end table | 144 | @end table |
| 145 | 145 | ||
| 146 | The @kbd{C-x r i @var{r}} command inserts a text string if the | 146 | The @kbd{C-x r i @var{r}} (@code{insert-register}) command, |
| 147 | register contains one, and inserts a rectangle if the register contains | 147 | previously documented in @ref{Text Registers}, inserts a rectangle |
| 148 | one. | 148 | rather than a a text string, if the register contains a rectangle. |
| 149 | |||
| 150 | See also the command @code{sort-columns}, which you can think of | ||
| 151 | as sorting a rectangle. @xref{Sorting}. | ||
| 152 | 149 | ||
| 153 | @node Configuration Registers | 150 | @node Configuration Registers |
| 154 | @section Saving Window Configurations in Registers | 151 | @section Saving Window Configurations in Registers |
| @@ -281,12 +278,14 @@ you can use it to edit your bookmark definitions or annotate the | |||
| 281 | bookmarks. Type @kbd{C-h m} in the bookmark buffer for more | 278 | bookmarks. Type @kbd{C-h m} in the bookmark buffer for more |
| 282 | information about its special editing commands. | 279 | information about its special editing commands. |
| 283 | 280 | ||
| 284 | When you kill Emacs, Emacs offers to save your bookmark values in your | 281 | When you kill Emacs, Emacs offers to save your bookmark values, if |
| 285 | default bookmark file, @file{~/.emacs.bmk}, if you have changed any | 282 | you have changed any bookmark values. You can also save the bookmarks |
| 286 | bookmark values. You can also save the bookmarks at any time with the | 283 | at any time with the @kbd{M-x bookmark-save} command. Bookmarks are |
| 287 | @kbd{M-x bookmark-save} command. The bookmark commands load your | 284 | saved to the file @file{~/.emacs.d/bookmarks} (for compatibility with |
| 288 | default bookmark file automatically. This saving and loading is how | 285 | older versions of Emacs, if you have a file named @file{~/.emacs.bmk}, |
| 289 | bookmarks persist from one Emacs session to the next. | 286 | that is used instead). The bookmark commands load your default |
| 287 | bookmark file automatically. This saving and loading is how bookmarks | ||
| 288 | persist from one Emacs session to the next. | ||
| 290 | 289 | ||
| 291 | @vindex bookmark-save-flag | 290 | @vindex bookmark-save-flag |
| 292 | If you set the variable @code{bookmark-save-flag} to 1, each command | 291 | If you set the variable @code{bookmark-save-flag} to 1, each command |
| @@ -251,6 +251,7 @@ highlight strings that indicate failure, caution or successful operation. | |||
| 251 | with Xft. To change font, use the X resource font, for example: | 251 | with Xft. To change font, use the X resource font, for example: |
| 252 | Emacs.pane.menubar.font: Courier-12 | 252 | Emacs.pane.menubar.font: Courier-12 |
| 253 | 253 | ||
| 254 | +++ | ||
| 254 | ** On graphical displays, the mode-line no longer ends in dashes. | 255 | ** On graphical displays, the mode-line no longer ends in dashes. |
| 255 | Also, the first dash (which does not indicate anything) is just | 256 | Also, the first dash (which does not indicate anything) is just |
| 256 | displayed as a space. | 257 | displayed as a space. |
| @@ -455,6 +456,7 @@ bound to M-=, which shows the number of lines, words, and characters. | |||
| 455 | 456 | ||
| 456 | ** The default value of `backup-by-copying-when-mismatch' is now t. | 457 | ** The default value of `backup-by-copying-when-mismatch' is now t. |
| 457 | 458 | ||
| 459 | +++ | ||
| 458 | ** The command `just-one-space' (M-SPC), if given a negative argument, | 460 | ** The command `just-one-space' (M-SPC), if given a negative argument, |
| 459 | also deletes newlines around point. | 461 | also deletes newlines around point. |
| 460 | 462 | ||