diff options
| author | Chong Yidong | 2012-10-24 22:38:49 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-10-24 22:38:49 +0800 |
| commit | cd99601878e97578ecd8e2209feeda275a3a13f5 (patch) | |
| tree | ecf3e3425320d787279640bb764d993753e53082 /doc | |
| parent | e7b987069126f8a59db97eb6639066ae2f645207 (diff) | |
| download | emacs-cd99601878e97578ecd8e2209feeda275a3a13f5.tar.gz emacs-cd99601878e97578ecd8e2209feeda275a3a13f5.zip | |
Document some Emacs 24.3 changes.
* doc/emacs/dired.texi (Dired Deletion, Marks vs Flags): Document Emacs 24.3
changes to the mark and unmark commands.
(Comparison in Dired): Document chages to dired-diff. Remove M-=,
which is no longer bound to dired-backup-diff.
* doc/emacs/mule.texi (Text Coding): set-buffer-file-coding-system can now
be invoked from the mode line.
* lisp/dired.el (dired-mark, dired-unmark, dired-flag-file-deletion):
Doc fix.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/ChangeLog | 10 | ||||
| -rw-r--r-- | doc/emacs/dired.texi | 86 | ||||
| -rw-r--r-- | doc/emacs/mule.texi | 16 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/lispref/minibuf.texi | 21 | ||||
| -rw-r--r-- | doc/lispref/nonascii.texi | 8 |
6 files changed, 89 insertions, 58 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 9a71ed5b272..b911153f080 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2012-10-24 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * mule.texi (Text Coding): set-buffer-file-coding-system can now | ||
| 4 | be invoked from the mode line. | ||
| 5 | |||
| 6 | * dired.texi (Dired Deletion, Marks vs Flags): Document Emacs 24.3 | ||
| 7 | changes to the mark and unmark commands. | ||
| 8 | (Comparison in Dired): Document chages to dired-diff. Remove M-=, | ||
| 9 | which is no longer bound to dired-backup-diff. | ||
| 10 | |||
| 1 | 2012-10-23 Bastien Guerry <bzg@gnu.org> | 11 | 2012-10-23 Bastien Guerry <bzg@gnu.org> |
| 2 | 12 | ||
| 3 | * text.texi (Org Authoring): Use a comma after @ref to avoid the | 13 | * text.texi (Org Authoring): Use a comma after @ref to avoid the |
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi index 0dcded78364..8babbcb89ea 100644 --- a/doc/emacs/dired.texi +++ b/doc/emacs/dired.texi | |||
| @@ -167,13 +167,14 @@ deletion, then delete the files that were flagged. | |||
| 167 | 167 | ||
| 168 | @table @kbd | 168 | @table @kbd |
| 169 | @item d | 169 | @item d |
| 170 | Flag this file for deletion. | 170 | Flag this file for deletion (@code{dired-flag-file-deletion}). |
| 171 | @item u | 171 | @item u |
| 172 | Remove deletion flag on this line. | 172 | Remove the deletion flag (@code{dired-unmark}). |
| 173 | @item @key{DEL} | 173 | @item @key{DEL} |
| 174 | Move point to previous line and remove the deletion flag on that line. | 174 | Move point to previous line and remove the deletion flag on that line |
| 175 | (@code{dired-unmark-backward}). | ||
| 175 | @item x | 176 | @item x |
| 176 | Delete the files that are flagged for deletion. | 177 | Delete files flagged for deletion (@code{dired-do-flagged-delete}). |
| 177 | @end table | 178 | @end table |
| 178 | 179 | ||
| 179 | @kindex d @r{(Dired)} | 180 | @kindex d @r{(Dired)} |
| @@ -182,8 +183,12 @@ Delete the files that are flagged for deletion. | |||
| 182 | the file and typing @kbd{d} (@code{dired-flag-file-deletion}). The | 183 | the file and typing @kbd{d} (@code{dired-flag-file-deletion}). The |
| 183 | deletion flag is visible as a @samp{D} at the beginning of the line. | 184 | deletion flag is visible as a @samp{D} at the beginning of the line. |
| 184 | This command moves point to the next line, so that repeated @kbd{d} | 185 | This command moves point to the next line, so that repeated @kbd{d} |
| 185 | commands flag successive files. A numeric argument serves as a repeat | 186 | commands flag successive files. A numeric prefix argument serves as a |
| 186 | count. | 187 | repeat count; a negative count means to flag preceding files. |
| 188 | |||
| 189 | If the region is active, the @kbd{d} command flags all files in the | ||
| 190 | region for deletion; in this case, the command does not move point, | ||
| 191 | and ignores any prefix argument. | ||
| 187 | 192 | ||
| 188 | @kindex u @r{(Dired deletion)} | 193 | @kindex u @r{(Dired deletion)} |
| 189 | @kindex DEL @r{(Dired)} | 194 | @kindex DEL @r{(Dired)} |
| @@ -194,14 +199,17 @@ can remove deletion flags using the commands @kbd{u} and @key{DEL}. | |||
| 194 | @kbd{u} (@code{dired-unmark}) works just like @kbd{d}, but removes | 199 | @kbd{u} (@code{dired-unmark}) works just like @kbd{d}, but removes |
| 195 | flags rather than making flags. @key{DEL} | 200 | flags rather than making flags. @key{DEL} |
| 196 | (@code{dired-unmark-backward}) moves upward, removing flags; it is | 201 | (@code{dired-unmark-backward}) moves upward, removing flags; it is |
| 197 | like @kbd{u} with argument @minus{}1. | 202 | like @kbd{u} with argument @minus{}1. A numeric prefix argument to |
| 203 | either command serves as a repeat count, with a negative count meaning | ||
| 204 | to unflag in the opposite direction. If the region is active, these | ||
| 205 | commands instead unflag all files in the region, without moving point. | ||
| 198 | 206 | ||
| 199 | @kindex x @r{(Dired)} | 207 | @kindex x @r{(Dired)} |
| 200 | @findex dired-do-flagged-delete | 208 | @findex dired-do-flagged-delete |
| 201 | To delete the flagged files, type @kbd{x} | 209 | To delete flagged files, type @kbd{x} |
| 202 | (@code{dired-do-flagged-delete}). This command first displays a list | 210 | (@code{dired-do-flagged-delete}). This command displays a list of all |
| 203 | of all the file names flagged for deletion, and requests confirmation | 211 | the file names flagged for deletion, and requests confirmation with |
| 204 | with @kbd{yes}. If you confirm, Dired deletes the flagged files, then | 212 | @kbd{yes}. If you confirm, Dired deletes the flagged files, then |
| 205 | deletes their lines from the text of the Dired buffer. The Dired | 213 | deletes their lines from the text of the Dired buffer. The Dired |
| 206 | buffer, with somewhat fewer lines, remains selected. | 214 | buffer, with somewhat fewer lines, remains selected. |
| 207 | 215 | ||
| @@ -387,10 +395,11 @@ and unflag files.) | |||
| 387 | @kindex m @r{(Dired)} | 395 | @kindex m @r{(Dired)} |
| 388 | @kindex * m @r{(Dired)} | 396 | @kindex * m @r{(Dired)} |
| 389 | @findex dired-mark | 397 | @findex dired-mark |
| 390 | Mark the current file with @samp{*} (@code{dired-mark}). With a numeric | 398 | Mark the current file with @samp{*} (@code{dired-mark}). If the |
| 391 | argument @var{n}, mark the next @var{n} files starting with the current | 399 | region is active, mark all files in the region instead; otherwise, if |
| 392 | file. (If @var{n} is negative, mark the previous @minus{}@var{n} | 400 | a numeric argument @var{n} is supplied, mark the next @var{n} files |
| 393 | files.) | 401 | instead, starting with the current file (if @var{n} is negative, mark |
| 402 | the previous @minus{}@var{n} files). | ||
| 394 | 403 | ||
| 395 | @item * * | 404 | @item * * |
| 396 | @kindex * * @r{(Dired)} | 405 | @kindex * * @r{(Dired)} |
| @@ -426,7 +435,11 @@ and @file{..} (@code{dired-mark-subdir-files}). | |||
| 426 | @kindex u @r{(Dired)} | 435 | @kindex u @r{(Dired)} |
| 427 | @kindex * u @r{(Dired)} | 436 | @kindex * u @r{(Dired)} |
| 428 | @findex dired-unmark | 437 | @findex dired-unmark |
| 429 | Remove any mark on this line (@code{dired-unmark}). | 438 | Remove any mark on this line (@code{dired-unmark}). If the region is |
| 439 | active, unmark all files in the region instead; otherwise, if a | ||
| 440 | numeric argument @var{n} is supplied, unmark the next @var{n} files | ||
| 441 | instead, starting with the current file (if @var{n} is negative, | ||
| 442 | unmark the previous @minus{}@var{n} files). | ||
| 430 | 443 | ||
| 431 | @item @key{DEL} | 444 | @item @key{DEL} |
| 432 | @itemx * @key{DEL} | 445 | @itemx * @key{DEL} |
| @@ -434,7 +447,11 @@ Remove any mark on this line (@code{dired-unmark}). | |||
| 434 | @findex dired-unmark-backward | 447 | @findex dired-unmark-backward |
| 435 | @cindex unmarking files (in Dired) | 448 | @cindex unmarking files (in Dired) |
| 436 | Move point to previous line and remove any mark on that line | 449 | Move point to previous line and remove any mark on that line |
| 437 | (@code{dired-unmark-backward}). | 450 | (@code{dired-unmark-backward}). If the region is active, unmark all |
| 451 | files in the region instead; otherwise, if a numeric argument @var{n} | ||
| 452 | is supplied, unmark the @var{n} preceding files instead, starting with | ||
| 453 | the current file (if @var{n} is negative, unmark the next | ||
| 454 | @minus{}@var{n} files). | ||
| 438 | 455 | ||
| 439 | @item * ! | 456 | @item * ! |
| 440 | @itemx U | 457 | @itemx U |
| @@ -936,32 +953,19 @@ default. | |||
| 936 | @cindex file comparison (in Dired) | 953 | @cindex file comparison (in Dired) |
| 937 | @cindex compare files (in Dired) | 954 | @cindex compare files (in Dired) |
| 938 | 955 | ||
| 939 | Here are two Dired commands that compare specified files using | ||
| 940 | @code{diff}. They show the output in a buffer using Diff mode | ||
| 941 | (@pxref{Comparing Files}). | ||
| 942 | |||
| 943 | @table @kbd | ||
| 944 | @item = | ||
| 945 | @findex dired-diff | 956 | @findex dired-diff |
| 946 | @kindex = @r{(Dired)} | 957 | @kindex = @r{(Dired)} |
| 947 | Compare the current file (the file at point) with another file (the | 958 | The @kbd{=} (@code{dired-diff}) command compares the current file |
| 948 | file at the mark) using the @code{diff} program (@code{dired-diff}). | 959 | (the file at point) with another file (read using the minibuffer) |
| 949 | The file at the mark is the first argument of @code{diff}, and the | 960 | using the @command{diff} program. The file specified with the |
| 950 | file at point is the second argument. This refers to the ordinary | 961 | minibuffer is the first argument of @command{diff}, and file at point |
| 951 | Emacs mark, not Dired marks; use @kbd{C-@key{SPC}} | 962 | is the second argument. The output of the @command{diff} program is |
| 952 | (@code{set-mark-command}) to set the mark at the first file's line | 963 | shown in a buffer using Diff mode (@pxref{Comparing Files}). |
| 953 | (@pxref{Setting Mark}). | 964 | |
| 954 | 965 | If the region is active, the default for the file read using the | |
| 955 | @findex dired-backup-diff | 966 | minibuffer is the file at the mark (i.e.@: the ordinary Emacs mark, |
| 956 | @kindex M-= @r{(Dired)} | 967 | not a Dired mark; @pxref{Setting Mark}). Otherwise, if the file at |
| 957 | @item M-= | 968 | point has a backup file (@pxref{Backup}), that is the default. |
| 958 | Compare the current file with its latest backup file | ||
| 959 | (@code{dired-backup-diff}). If the current file is itself a backup, | ||
| 960 | compare it with the file it is a backup of; this way, you can compare | ||
| 961 | a file with any one of its backups. | ||
| 962 | |||
| 963 | The backup file is the first file given to @code{diff}. | ||
| 964 | @end table | ||
| 965 | 969 | ||
| 966 | @node Subdirectories in Dired | 970 | @node Subdirectories in Dired |
| 967 | @section Subdirectories in Dired | 971 | @section Subdirectories in Dired |
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 1dfae79c788..d7ed6cc488f 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi | |||
| @@ -1040,12 +1040,16 @@ decoding it using coding system @var{right} instead. | |||
| 1040 | @findex set-buffer-file-coding-system | 1040 | @findex set-buffer-file-coding-system |
| 1041 | The command @kbd{C-x @key{RET} f} | 1041 | The command @kbd{C-x @key{RET} f} |
| 1042 | (@code{set-buffer-file-coding-system}) sets the file coding system for | 1042 | (@code{set-buffer-file-coding-system}) sets the file coding system for |
| 1043 | the current buffer---in other words, it says which coding system to | 1043 | the current buffer (i.e.@: the coding system to use when saving or |
| 1044 | use when saving or reverting the visited file. You specify which | 1044 | reverting the file). You specify which coding system using the |
| 1045 | coding system using the minibuffer. If you specify a coding system | 1045 | minibuffer. You can also invoke this command by clicking with |
| 1046 | that cannot handle all of the characters in the buffer, Emacs warns | 1046 | @kbd{Mouse-3} on the coding system indicator in the mode line |
| 1047 | you about the troublesome characters when you actually save the | 1047 | (@pxref{Mode Line}). |
| 1048 | buffer. | 1048 | |
| 1049 | If you specify a coding system that cannot handle all the characters | ||
| 1050 | in the buffer, Emacs will warn you about the troublesome characters, | ||
| 1051 | and ask you to choose another coding system, when you try to save the | ||
| 1052 | buffer (@pxref{Output Coding}). | ||
| 1049 | 1053 | ||
| 1050 | @cindex specify end-of-line conversion | 1054 | @cindex specify end-of-line conversion |
| 1051 | You can also use this command to specify the end-of-line conversion | 1055 | You can also use this command to specify the end-of-line conversion |
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index bed74bb688a..25dee5212e5 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -11,6 +11,12 @@ | |||
| 11 | 11 | ||
| 12 | 2012-10-24 Chong Yidong <cyd@gnu.org> | 12 | 2012-10-24 Chong Yidong <cyd@gnu.org> |
| 13 | 13 | ||
| 14 | * minibuf.texi (Text from Minibuffer): Document read-regexp | ||
| 15 | changes. | ||
| 16 | |||
| 17 | * nonascii.texi (Selecting a Representation): Document | ||
| 18 | set-buffer-multibyte changes. | ||
| 19 | |||
| 14 | * keymaps.texi (Toolkit Differences): Node deleted. | 20 | * keymaps.texi (Toolkit Differences): Node deleted. |
| 15 | (Easy Menu): New node. | 21 | (Easy Menu): New node. |
| 16 | 22 | ||
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 39b4fca3b25..79c83144f77 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi | |||
| @@ -211,22 +211,25 @@ This function works by calling the | |||
| 211 | @end smallexample | 211 | @end smallexample |
| 212 | @end defun | 212 | @end defun |
| 213 | 213 | ||
| 214 | @defun read-regexp prompt &optional default | 214 | @defun read-regexp prompt &optional default history |
| 215 | This function reads a regular expression as a string from the | 215 | This function reads a regular expression as a string from the |
| 216 | minibuffer and returns it. The argument @var{prompt} is used as in | 216 | minibuffer and returns it. The argument @var{prompt} is used as in |
| 217 | @code{read-from-minibuffer}. The keymap used is | 217 | @code{read-from-minibuffer}. |
| 218 | @code{minibuffer-local-map}, and @code{regexp-history} is used as the | ||
| 219 | history list (@pxref{Minibuffer History, regexp-history}). | ||
| 220 | 218 | ||
| 221 | The optional argument @var{default} specifies a default value to | 219 | The optional argument @var{default} specifies a default value to |
| 222 | return if the user enters null input; it should be a string, or | 220 | return if the user enters null input; it should be a string, or |
| 223 | @code{nil}, which is equivalent to an empty string. | 221 | @code{nil}, which is equivalent to an empty string. |
| 224 | 222 | ||
| 225 | In addition, @code{read-regexp} collects a few useful candidates for | 223 | The optional argument @var{history}, if non-@code{nil}, is a symbol |
| 226 | input and passes them to @code{read-from-minibuffer}, to make them | 224 | specifying a minibuffer history list to use (@pxref{Minibuffer |
| 227 | available to the user as the ``future minibuffer history list'' | 225 | History}). If it is omitted or @code{nil}, the history list defaults |
| 228 | (@pxref{Minibuffer History, future list,, emacs, The GNU Emacs | 226 | to @code{regexp-history}. |
| 229 | Manual}). These candidates are: | 227 | |
| 228 | @code{read-regexp} also collects a few useful candidates for input and | ||
| 229 | passes them to @code{read-from-minibuffer}, to make them available to | ||
| 230 | the user as the ``future minibuffer history list'' (@pxref{Minibuffer | ||
| 231 | History, future list,, emacs, The GNU Emacs Manual}). These | ||
| 232 | candidates are: | ||
| 230 | 233 | ||
| 231 | @itemize @minus | 234 | @itemize @minus |
| 232 | @item | 235 | @item |
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 2f6f516c587..e384d40176e 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi | |||
| @@ -241,8 +241,12 @@ representation is in use. It also adjusts various data in the buffer | |||
| 241 | (including overlays, text properties and markers) so that they cover the | 241 | (including overlays, text properties and markers) so that they cover the |
| 242 | same text as they did before. | 242 | same text as they did before. |
| 243 | 243 | ||
| 244 | You cannot use @code{set-buffer-multibyte} on an indirect buffer, | 244 | This function signals an error if the buffer is narrowed, since the |
| 245 | because indirect buffers always inherit the representation of the | 245 | narrowing might have occurred in the middle of multibyte character |
| 246 | sequences. | ||
| 247 | |||
| 248 | This function also signals an error if the buffer is an indirect | ||
| 249 | buffer. An indirect buffer always inherits the representation of its | ||
| 246 | base buffer. | 250 | base buffer. |
| 247 | @end defun | 251 | @end defun |
| 248 | 252 | ||