aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2012-10-24 22:38:49 +0800
committerChong Yidong2012-10-24 22:38:49 +0800
commitcd99601878e97578ecd8e2209feeda275a3a13f5 (patch)
treeecf3e3425320d787279640bb764d993753e53082 /lisp
parente7b987069126f8a59db97eb6639066ae2f645207 (diff)
downloademacs-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 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/dired.el16
2 files changed, 14 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b709c76c74..9b40dbf6458 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-10-24 Chong Yidong <cyd@gnu.org> 12012-10-24 Chong Yidong <cyd@gnu.org>
2 2
3 * dired.el (dired-mark, dired-unmark, dired-flag-file-deletion):
4 Doc fix.
5
3 * emacs-lisp/easymenu.el (easy-menu-define): Doc fix (Bug#12628). 6 * emacs-lisp/easymenu.el (easy-menu-define): Doc fix (Bug#12628).
4 7
52012-10-24 Stefan Monnier <monnier@iro.umontreal.ca> 82012-10-24 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/dired.el b/lisp/dired.el
index a4bc16caebf..9094ce08f0a 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3107,10 +3107,11 @@ argument or confirmation)."
3107 (forward-line 1)))) 3107 (forward-line 1))))
3108 3108
3109(defun dired-mark (arg) 3109(defun dired-mark (arg)
3110 "Mark the current (or next ARG) files. 3110 "Mark the file at point in the Dired buffer.
3111If the region is active, mark all files in the region.
3112Otherwise, with a prefix arg, mark files on the next ARG lines.
3113
3111If on a subdir headerline, mark all its files except `.' and `..'. 3114If on a subdir headerline, mark all its files except `.' and `..'.
3112If the region is active in Transient Mark mode, mark all files
3113in the active region.
3114 3115
3115Use \\[dired-unmark-all-files] to remove all marks 3116Use \\[dired-unmark-all-files] to remove all marks
3116and \\[dired-unmark] on a subdir to remove the marks in 3117and \\[dired-unmark] on a subdir to remove the marks in
@@ -3136,7 +3137,10 @@ this subdir."
3136 (function (lambda () (delete-char 1) (insert dired-marker-char)))))))) 3137 (function (lambda () (delete-char 1) (insert dired-marker-char))))))))
3137 3138
3138(defun dired-unmark (arg) 3139(defun dired-unmark (arg)
3139 "Unmark the current (or next ARG) files. 3140 "Unmark the file at point in the Dired buffer.
3141If the region is active, unmark all files in the region.
3142Otherwise, with a prefix arg, unmark files on the next ARG lines.
3143
3140If looking at a subdir, unmark all its files except `.' and `..'. 3144If looking at a subdir, unmark all its files except `.' and `..'.
3141If the region is active in Transient Mark mode, unmark all files 3145If the region is active in Transient Mark mode, unmark all files
3142in the active region." 3146in the active region."
@@ -3146,7 +3150,9 @@ in the active region."
3146 3150
3147(defun dired-flag-file-deletion (arg) 3151(defun dired-flag-file-deletion (arg)
3148 "In Dired, flag the current line's file for deletion. 3152 "In Dired, flag the current line's file for deletion.
3149With prefix arg, repeat over several lines. 3153If the region is active, flag all files in the region.
3154Otherwise, with a prefix arg, flag files on the next ARG lines.
3155
3150If on a subdir headerline, flag all its files except `.' and `..'. 3156If on a subdir headerline, flag all its files except `.' and `..'.
3151If the region is active in Transient Mark mode, flag all files 3157If the region is active in Transient Mark mode, flag all files
3152in the active region." 3158in the active region."