diff options
| author | Lars Magne Ingebrigtsen | 2011-07-03 15:25:18 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-03 15:25:18 +0200 |
| commit | 1ca0da0e83867f2f24820acbfd099007d2f7e3f5 (patch) | |
| tree | 7d8953524f3c427d245c1f1da528110f1f3b8a12 | |
| parent | 9aec558af4588db021f494d80bb0cab2ae1f17c3 (diff) | |
| download | emacs-1ca0da0e83867f2f24820acbfd099007d2f7e3f5.tar.gz emacs-1ca0da0e83867f2f24820acbfd099007d2f7e3f5.zip | |
* dired.el (dired-map-over-marks): Refill the doc string (bug#6814).
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/dired.el | 37 |
2 files changed, 24 insertions, 15 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 169793ebc40..12404f496ce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * dired.el (dired-map-over-marks): Refill the doc string (bug#6814). | ||
| 4 | |||
| 3 | * fringe.el (fringe-query-style): Remove redundant text " (type ? | 5 | * fringe.el (fringe-query-style): Remove redundant text " (type ? |
| 4 | for list)" (bug#6475). | 6 | for list)" (bug#6475). |
| 5 | 7 | ||
diff --git a/lisp/dired.el b/lisp/dired.el index 92f3a46306b..929d44440d5 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -515,24 +515,31 @@ Return value is the number of files marked, or nil if none were marked." | |||
| 515 | (defmacro dired-map-over-marks (body arg &optional show-progress | 515 | (defmacro dired-map-over-marks (body arg &optional show-progress |
| 516 | distinguish-one-marked) | 516 | distinguish-one-marked) |
| 517 | "Eval BODY with point on each marked line. Return a list of BODY's results. | 517 | "Eval BODY with point on each marked line. Return a list of BODY's results. |
| 518 | If no marked file could be found, execute BODY on the current line. | 518 | If no marked file could be found, execute BODY on the current |
| 519 | ARG, if non-nil, specifies the files to use instead of the marked files. | 519 | line. ARG, if non-nil, specifies the files to use instead of the |
| 520 | If ARG is an integer, use the next ARG (or previous -ARG, if | 520 | marked files. |
| 521 | ARG<0) files. In that case, point is dragged along. This is | 521 | |
| 522 | so that commands on the next ARG (instead of the marked) files | 522 | If ARG is an integer, use the next ARG (or previous -ARG, if |
| 523 | can be chained easily. | 523 | ARG<0) files. In that case, point is dragged along. This is so |
| 524 | For any other non-nil value of ARG, use the current file. | 524 | that commands on the next ARG (instead of the marked) files can |
| 525 | be chained easily. | ||
| 526 | For any other non-nil value of ARG, use the current file. | ||
| 527 | |||
| 525 | If optional third arg SHOW-PROGRESS evaluates to non-nil, | 528 | If optional third arg SHOW-PROGRESS evaluates to non-nil, |
| 526 | redisplay the dired buffer after each file is processed. | 529 | redisplay the dired buffer after each file is processed. |
| 527 | No guarantee is made about the position on the marked line. | 530 | |
| 528 | BODY must ensure this itself if it depends on this. | 531 | No guarantee is made about the position on the marked line. BODY |
| 529 | Search starts at the beginning of the buffer, thus the car of the list | 532 | must ensure this itself if it depends on this. |
| 530 | corresponds to the line nearest to the buffer's bottom. This | 533 | |
| 531 | is also true for (positive and negative) integer values of ARG. | 534 | Search starts at the beginning of the buffer, thus the car of the |
| 535 | list corresponds to the line nearest to the buffer's bottom. | ||
| 536 | This is also true for (positive and negative) integer values of | ||
| 537 | ARG. | ||
| 538 | |||
| 532 | BODY should not be too long as it is expanded four times. | 539 | BODY should not be too long as it is expanded four times. |
| 533 | 540 | ||
| 534 | If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file, | 541 | If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one |
| 535 | return (t FILENAME) instead of (FILENAME)." | 542 | marked file, return (t FILENAME) instead of (FILENAME)." |
| 536 | ;; | 543 | ;; |
| 537 | ;;Warning: BODY must not add new lines before point - this may cause an | 544 | ;;Warning: BODY must not add new lines before point - this may cause an |
| 538 | ;;endless loop. | 545 | ;;endless loop. |