Commit cd996018 authored by Chong Yidong's avatar Chong Yidong
Browse files

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.
parent e7b98706
2012-10-24 Chong Yidong <cyd@gnu.org>
* mule.texi (Text Coding): set-buffer-file-coding-system can now
be invoked from the mode line.
* 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.
2012-10-23 Bastien Guerry <bzg@gnu.org>
* text.texi (Org Authoring): Use a comma after @ref to avoid the
......
......@@ -167,13 +167,14 @@ deletion, then delete the files that were flagged.
@table @kbd
@item d
Flag this file for deletion.
Flag this file for deletion (@code{dired-flag-file-deletion}).
@item u
Remove deletion flag on this line.
Remove the deletion flag (@code{dired-unmark}).
@item @key{DEL}
Move point to previous line and remove the deletion flag on that line.
Move point to previous line and remove the deletion flag on that line
(@code{dired-unmark-backward}).
@item x
Delete the files that are flagged for deletion.
Delete files flagged for deletion (@code{dired-do-flagged-delete}).
@end table
@kindex d @r{(Dired)}
......@@ -182,8 +183,12 @@ Delete the files that are flagged for deletion.
the file and typing @kbd{d} (@code{dired-flag-file-deletion}). The
deletion flag is visible as a @samp{D} at the beginning of the line.
This command moves point to the next line, so that repeated @kbd{d}
commands flag successive files. A numeric argument serves as a repeat
count.
commands flag successive files. A numeric prefix argument serves as a
repeat count; a negative count means to flag preceding files.
If the region is active, the @kbd{d} command flags all files in the
region for deletion; in this case, the command does not move point,
and ignores any prefix argument.
@kindex u @r{(Dired deletion)}
@kindex DEL @r{(Dired)}
......@@ -194,14 +199,17 @@ can remove deletion flags using the commands @kbd{u} and @key{DEL}.
@kbd{u} (@code{dired-unmark}) works just like @kbd{d}, but removes
flags rather than making flags. @key{DEL}
(@code{dired-unmark-backward}) moves upward, removing flags; it is
like @kbd{u} with argument @minus{}1.
like @kbd{u} with argument @minus{}1. A numeric prefix argument to
either command serves as a repeat count, with a negative count meaning
to unflag in the opposite direction. If the region is active, these
commands instead unflag all files in the region, without moving point.
@kindex x @r{(Dired)}
@findex dired-do-flagged-delete
To delete the flagged files, type @kbd{x}
(@code{dired-do-flagged-delete}). This command first displays a list
of all the file names flagged for deletion, and requests confirmation
with @kbd{yes}. If you confirm, Dired deletes the flagged files, then
To delete flagged files, type @kbd{x}
(@code{dired-do-flagged-delete}). This command displays a list of all
the file names flagged for deletion, and requests confirmation with
@kbd{yes}. If you confirm, Dired deletes the flagged files, then
deletes their lines from the text of the Dired buffer. The Dired
buffer, with somewhat fewer lines, remains selected.
......@@ -387,10 +395,11 @@ and unflag files.)
@kindex m @r{(Dired)}
@kindex * m @r{(Dired)}
@findex dired-mark
Mark the current file with @samp{*} (@code{dired-mark}). With a numeric
argument @var{n}, mark the next @var{n} files starting with the current
file. (If @var{n} is negative, mark the previous @minus{}@var{n}
files.)
Mark the current file with @samp{*} (@code{dired-mark}). If the
region is active, mark all files in the region instead; otherwise, if
a numeric argument @var{n} is supplied, mark the next @var{n} files
instead, starting with the current file (if @var{n} is negative, mark
the previous @minus{}@var{n} files).
@item * *
@kindex * * @r{(Dired)}
......@@ -426,7 +435,11 @@ and @file{..} (@code{dired-mark-subdir-files}).
@kindex u @r{(Dired)}
@kindex * u @r{(Dired)}
@findex dired-unmark
Remove any mark on this line (@code{dired-unmark}).
Remove any mark on this line (@code{dired-unmark}). If the region is
active, unmark all files in the region instead; otherwise, if a
numeric argument @var{n} is supplied, unmark the next @var{n} files
instead, starting with the current file (if @var{n} is negative,
unmark the previous @minus{}@var{n} files).
@item @key{DEL}
@itemx * @key{DEL}
......@@ -434,7 +447,11 @@ Remove any mark on this line (@code{dired-unmark}).
@findex dired-unmark-backward
@cindex unmarking files (in Dired)
Move point to previous line and remove any mark on that line
(@code{dired-unmark-backward}).
(@code{dired-unmark-backward}). If the region is active, unmark all
files in the region instead; otherwise, if a numeric argument @var{n}
is supplied, unmark the @var{n} preceding files instead, starting with
the current file (if @var{n} is negative, unmark the next
@minus{}@var{n} files).
@item * !
@itemx U
......@@ -936,32 +953,19 @@ default.
@cindex file comparison (in Dired)
@cindex compare files (in Dired)
Here are two Dired commands that compare specified files using
@code{diff}. They show the output in a buffer using Diff mode
(@pxref{Comparing Files}).
@table @kbd
@item =
@findex dired-diff
@kindex = @r{(Dired)}
Compare the current file (the file at point) with another file (the
file at the mark) using the @code{diff} program (@code{dired-diff}).
The file at the mark is the first argument of @code{diff}, and the
file at point is the second argument. This refers to the ordinary
Emacs mark, not Dired marks; use @kbd{C-@key{SPC}}
(@code{set-mark-command}) to set the mark at the first file's line
(@pxref{Setting Mark}).
@findex dired-backup-diff
@kindex M-= @r{(Dired)}
@item M-=
Compare the current file with its latest backup file
(@code{dired-backup-diff}). If the current file is itself a backup,
compare it with the file it is a backup of; this way, you can compare
a file with any one of its backups.
The backup file is the first file given to @code{diff}.
@end table
The @kbd{=} (@code{dired-diff}) command compares the current file
(the file at point) with another file (read using the minibuffer)
using the @command{diff} program. The file specified with the
minibuffer is the first argument of @command{diff}, and file at point
is the second argument. The output of the @command{diff} program is
shown in a buffer using Diff mode (@pxref{Comparing Files}).
If the region is active, the default for the file read using the
minibuffer is the file at the mark (i.e.@: the ordinary Emacs mark,
not a Dired mark; @pxref{Setting Mark}). Otherwise, if the file at
point has a backup file (@pxref{Backup}), that is the default.
@node Subdirectories in Dired
@section Subdirectories in Dired
......
......@@ -1040,12 +1040,16 @@ decoding it using coding system @var{right} instead.
@findex set-buffer-file-coding-system
The command @kbd{C-x @key{RET} f}
(@code{set-buffer-file-coding-system}) sets the file coding system for
the current buffer---in other words, it says which coding system to
use when saving or reverting the visited file. You specify which
coding system using the minibuffer. If you specify a coding system
that cannot handle all of the characters in the buffer, Emacs warns
you about the troublesome characters when you actually save the
buffer.
the current buffer (i.e.@: the coding system to use when saving or
reverting the file). You specify which coding system using the
minibuffer. You can also invoke this command by clicking with
@kbd{Mouse-3} on the coding system indicator in the mode line
(@pxref{Mode Line}).
If you specify a coding system that cannot handle all the characters
in the buffer, Emacs will warn you about the troublesome characters,
and ask you to choose another coding system, when you try to save the
buffer (@pxref{Output Coding}).
@cindex specify end-of-line conversion
You can also use this command to specify the end-of-line conversion
......
......@@ -11,6 +11,12 @@
2012-10-24 Chong Yidong <cyd@gnu.org>
* minibuf.texi (Text from Minibuffer): Document read-regexp
changes.
* nonascii.texi (Selecting a Representation): Document
set-buffer-multibyte changes.
* keymaps.texi (Toolkit Differences): Node deleted.
(Easy Menu): New node.
......
......@@ -211,22 +211,25 @@ This function works by calling the
@end smallexample
@end defun
@defun read-regexp prompt &optional default
@defun read-regexp prompt &optional default history
This function reads a regular expression as a string from the
minibuffer and returns it. The argument @var{prompt} is used as in
@code{read-from-minibuffer}. The keymap used is
@code{minibuffer-local-map}, and @code{regexp-history} is used as the
history list (@pxref{Minibuffer History, regexp-history}).
@code{read-from-minibuffer}.
The optional argument @var{default} specifies a default value to
return if the user enters null input; it should be a string, or
@code{nil}, which is equivalent to an empty string.
In addition, @code{read-regexp} collects a few useful candidates for
input and passes them to @code{read-from-minibuffer}, to make them
available to the user as the ``future minibuffer history list''
(@pxref{Minibuffer History, future list,, emacs, The GNU Emacs
Manual}). These candidates are:
The optional argument @var{history}, if non-@code{nil}, is a symbol
specifying a minibuffer history list to use (@pxref{Minibuffer
History}). If it is omitted or @code{nil}, the history list defaults
to @code{regexp-history}.
@code{read-regexp} also collects a few useful candidates for input and
passes them to @code{read-from-minibuffer}, to make them available to
the user as the ``future minibuffer history list'' (@pxref{Minibuffer
History, future list,, emacs, The GNU Emacs Manual}). These
candidates are:
@itemize @minus
@item
......
......@@ -241,8 +241,12 @@ representation is in use. It also adjusts various data in the buffer
(including overlays, text properties and markers) so that they cover the
same text as they did before.
You cannot use @code{set-buffer-multibyte} on an indirect buffer,
because indirect buffers always inherit the representation of the
This function signals an error if the buffer is narrowed, since the
narrowing might have occurred in the middle of multibyte character
sequences.
This function also signals an error if the buffer is an indirect
buffer. An indirect buffer always inherits the representation of its
base buffer.
@end defun
......
......@@ -104,26 +104,19 @@ been adding them there, put them somewhere else, eg site-lisp.
* Changes in Emacs 24.3
** minibuffer-electric-default-mode can rewrite (default ...) to [...].
Just set minibuffer-eldef-shorten-default to t before enabling the mode.
+++
** Most y-or-n prompts now allow you to scroll the selected window.
Typing C-v or M-v at a y-or-n prompt scrolls forward or backward
respectively, without exiting from the prompt.
---
** In minibuffer filename prompts, `C-M-f' and `C-M-b' now move to the
next and previous path separator, respectively.
** Mode line changes
---
*** New option `mode-line-default-help-echo' specifies the help text
(shown in a tooltip or in the echo area) for any part of the mode line
that does not have its own specialized help text.
*** You can now click mouse-3 in the coding system indicator to
invokes `set-buffer-file-coding-system'.
+++
*** You can now click mouse-3 in the coding system indicator to invoke
`set-buffer-file-coding-system'.
** Help changes
......@@ -139,6 +132,14 @@ correctly. To disable this, set `help-enable-auto-load' to nil.
even after their associated libraries have been loaded (and the
autoloads have been redefined as functions).
** Minibuffer changes
---
*** In minibuffer filename prompts, `C-M-f' and `C-M-b' now move to the
next and previous path separator, respectively.
*** minibuffer-electric-default-mode can rewrite (default ...) to [...].
Just set minibuffer-eldef-shorten-default to t before enabling the mode.
** ImageMagick support, if available, is automatically enabled.
It is no longer necessary to call `imagemagick-register-types'
explicitly to install ImageMagick image types; that function is called
......@@ -340,15 +341,15 @@ rather than making them unbound.
*** New option `compilation-always-kill'.
** Customize
---
*** `custom-reset-button-menu' now defaults to t.
---
*** Non-option variables are never matched in `customize-apropos' and
`customize-apropos-options' (i.e. the prefix argument does nothing for
these commands now).
** Desktop
---
*** `desktop-path' no longer includes the "." directory. Desktop
files are now located in ~/.emacs.d by default.
......@@ -402,22 +403,23 @@ whitespace problems introduced by the diff.
*** `dired-do-async-shell-command' executes each file sequentially
if the command ends in `;' (when operating on multiple files).
Otherwise, it executes the command on each file in parallel.
---
*** Typing M-n in the minibuffer of `dired-do-chmod', `dired-do-chgrp',
`dired-do-chown', `dired-do-touch' pulls the file attributes of the
file at point.
+++
*** When the region is active, `m' (`dired-mark'), `u' (`dired-unmark'),
`DEL' (`dired-unmark-backward'), `d' (`dired-flag-file-deletion')
mark/unmark/flag all files in the active region.
+++
*** The minibuffer default for `=' (`dired-diff) has changed.
It is now the backup file for the file at point, if one exists.
In Transient Mark mode the default is the file at the active mark.
+++
*** `M-=' is no longer bound to `dired-backup-diff' in Dired buffers.
The global binding for `M-=', `count-words-region' is in effect.
---
** Ediff now uses the same color scheme as Diff mode.
** erc will look up server/channel names via auth-source and use the
......@@ -428,9 +430,9 @@ See `flymake-fringe-indicator-position', `flymake-error-bitmap' and
`flymake-warning-bitmap'.
** Follow mode
---
*** The obsolete variable `follow-mode-off-hook' has been removed.
---
*** Follow mode no longer works by using advice.
The option `follow-intercept-processes' has been removed.
......@@ -673,6 +675,7 @@ gnus-notifications.el, mm-archive.el
* Incompatible Lisp Changes in Emacs 24.3
+++
** set-buffer-multibyte now signals an error in narrowed buffers.
+++
......@@ -772,9 +775,18 @@ systems), or based on memory allocations.
** CL-style generalized variables are now in core Elisp.
`setf' is autoloaded; `push' and `pop' accept generalized variables.
+++
** `defun' also accepts a (declare DECLS) form, like `defmacro'.
The interpretation of the DECLS is determined by `defun-declarations-alist'.
** Minibuffer
+++
*** `read-regexp' has a new argument HISTORY; the first argument PROMPT
of `read-regexp' accepts a string ending with a colon and space, and its
second argument DEFAULTS can be a list of strings accessible via M-n
in the minibuffer ahead of other hard-coded useful regexp-related values.
More commands use `read-regexp' now to read their regexp arguments.
** Completion
*** New function `completion-table-with-quoting' to handle completion
......@@ -797,14 +809,6 @@ to work out which code is doing something.
*** New var `inhibit-debugger', automatically set to prevent accidental
recursive invocations.
** Minibuffer
*** `read-regexp' has a new argument HISTORY; the first argument PROMPT
of `read-regexp' accepts a string ending with a colon and space, and its
second argument DEFAULTS can be a list of strings accessible via M-n
in the minibuffer ahead of other hard-coded useful regexp-related values.
More commands use `read-regexp' now to read their regexp arguments.
** Window changes
*** The functions get-lru-window, get-mru-window and get-largest-window
......
2012-10-24 Chong Yidong <cyd@gnu.org>
* dired.el (dired-mark, dired-unmark, dired-flag-file-deletion):
Doc fix.
* emacs-lisp/easymenu.el (easy-menu-define): Doc fix (Bug#12628).
2012-10-24 Stefan Monnier <monnier@iro.umontreal.ca>
......
......@@ -3107,10 +3107,11 @@ argument or confirmation)."
(forward-line 1))))
(defun dired-mark (arg)
"Mark the current (or next ARG) files.
"Mark the file at point in the Dired buffer.
If the region is active, mark all files in the region.
Otherwise, with a prefix arg, mark files on the next ARG lines.
If on a subdir headerline, mark all its files except `.' and `..'.
If the region is active in Transient Mark mode, mark all files
in the active region.
Use \\[dired-unmark-all-files] to remove all marks
and \\[dired-unmark] on a subdir to remove the marks in
......@@ -3136,7 +3137,10 @@ this subdir."
(function (lambda () (delete-char 1) (insert dired-marker-char))))))))
(defun dired-unmark (arg)
"Unmark the current (or next ARG) files.
"Unmark the file at point in the Dired buffer.
If the region is active, unmark all files in the region.
Otherwise, with a prefix arg, unmark files on the next ARG lines.
If looking at a subdir, unmark all its files except `.' and `..'.
If the region is active in Transient Mark mode, unmark all files
in the active region."
......@@ -3146,7 +3150,9 @@ in the active region."
(defun dired-flag-file-deletion (arg)
"In Dired, flag the current line's file for deletion.
With prefix arg, repeat over several lines.
If the region is active, flag all files in the region.
Otherwise, with a prefix arg, flag files on the next ARG lines.
If on a subdir headerline, flag all its files except `.' and `..'.
If the region is active in Transient Mark mode, flag all files
in the active region."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment