diff options
| author | Juanma Barranquero | 2005-07-20 14:08:39 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2005-07-20 14:08:39 +0000 |
| commit | ee680b2bc580b62dd94d9c39855bf3dd6af11667 (patch) | |
| tree | 7f4b4d4109ffeeec28b26b00b53f943999064cd3 | |
| parent | 2624e2ac351133efe7246b5061e4b1eeaf64a901 (diff) | |
| download | emacs-ee680b2bc580b62dd94d9c39855bf3dd6af11667.tar.gz emacs-ee680b2bc580b62dd94d9c39855bf3dd6af11667.zip | |
(dired-align-file, dired-flag-backup-files, dired-change-marks,
dired-unmark-all-files): "?\ " -> "?\s".
(dired-listing-switches, dired-ls-F-marks-symlinks, dired-dwim-target,
dired-load-hook, dired-mode-hook, dired-directory, dired-faces, dired,
dired-revert, dired-mode, dired-summary, dired-view-file,
dired-copy-filename-as-kill, dired-delete-file, dired-no-confirm,
dired-unmark-all-marks, dired-sort-by-date-regexp, dired-sort-by-name-regexp,
dired-sort-inhibit, dired-sort-other): Fix typos in docstrings.
(dired-undo, dired-get-file-for-visit, dired-sort-toggle-or-edit):
Fix typos in message strings.
| -rw-r--r-- | lisp/dired.el | 63 |
1 files changed, 31 insertions, 32 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 8a558b1a2d8..0ba369e4640 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -50,13 +50,13 @@ | |||
| 50 | 50 | ||
| 51 | ;;;###autoload | 51 | ;;;###autoload |
| 52 | (defcustom dired-listing-switches "-al" | 52 | (defcustom dired-listing-switches "-al" |
| 53 | "*Switches passed to `ls' for dired. MUST contain the `l' option. | 53 | "*Switches passed to `ls' for Dired. MUST contain the `l' option. |
| 54 | May contain all other options that don't contradict `-l'; | 54 | May contain all other options that don't contradict `-l'; |
| 55 | may contain even `F', `b', `i' and `s'. See also the variable | 55 | may contain even `F', `b', `i' and `s'. See also the variable |
| 56 | `dired-ls-F-marks-symlinks' concerning the `F' switch. | 56 | `dired-ls-F-marks-symlinks' concerning the `F' switch. |
| 57 | On systems such as MS-DOS and MS-Windows, which use `ls' emulation in Lisp, | 57 | On systems such as MS-DOS and MS-Windows, which use `ls' emulation in Lisp, |
| 58 | some of the `ls' switches are not supported; see the doc string of | 58 | some of the `ls' switches are not supported; see the doc string of |
| 59 | `insert-directory' on ls-lisp.el for more details." | 59 | `insert-directory' on `ls-lisp.el' for more details." |
| 60 | :type 'string | 60 | :type 'string |
| 61 | :group 'dired) | 61 | :group 'dired) |
| 62 | 62 | ||
| @@ -88,7 +88,7 @@ If nil, `dired-listing-switches' is used.") | |||
| 88 | 88 | ||
| 89 | ;;;###autoload | 89 | ;;;###autoload |
| 90 | (defcustom dired-ls-F-marks-symlinks nil | 90 | (defcustom dired-ls-F-marks-symlinks nil |
| 91 | "*Informs dired about how `ls -lF' marks symbolic links. | 91 | "*Informs Dired about how `ls -lF' marks symbolic links. |
| 92 | Set this to t if `ls' (or whatever program is specified by | 92 | Set this to t if `ls' (or whatever program is specified by |
| 93 | `insert-directory-program') with `-lF' marks the symbolic link | 93 | `insert-directory-program') with `-lF' marks the symbolic link |
| 94 | itself with a trailing @ (usually the case under Ultrix). | 94 | itself with a trailing @ (usually the case under Ultrix). |
| @@ -153,7 +153,7 @@ If a character, new links are unconditionally marked with that character." | |||
| 153 | 153 | ||
| 154 | ;;;###autoload | 154 | ;;;###autoload |
| 155 | (defcustom dired-dwim-target nil | 155 | (defcustom dired-dwim-target nil |
| 156 | "*If non-nil, dired tries to guess a default target directory. | 156 | "*If non-nil, Dired tries to guess a default target directory. |
| 157 | This means: if there is a dired buffer displayed in the next window, | 157 | This means: if there is a dired buffer displayed in the next window, |
| 158 | use its current subdir, instead of the current subdir of this dired buffer. | 158 | use its current subdir, instead of the current subdir of this dired buffer. |
| 159 | 159 | ||
| @@ -176,13 +176,13 @@ The target is used in the prompt for file copy, rename etc." | |||
| 176 | ;;; Hook variables | 176 | ;;; Hook variables |
| 177 | 177 | ||
| 178 | (defcustom dired-load-hook nil | 178 | (defcustom dired-load-hook nil |
| 179 | "Run after loading dired. | 179 | "Run after loading Dired. |
| 180 | You can customize key bindings or load extensions with this." | 180 | You can customize key bindings or load extensions with this." |
| 181 | :group 'dired | 181 | :group 'dired |
| 182 | :type 'hook) | 182 | :type 'hook) |
| 183 | 183 | ||
| 184 | (defcustom dired-mode-hook nil | 184 | (defcustom dired-mode-hook nil |
| 185 | "Run at the very end of dired-mode." | 185 | "Run at the very end of `dired-mode'." |
| 186 | :group 'dired | 186 | :group 'dired |
| 187 | :type 'hook) | 187 | :type 'hook) |
| 188 | 188 | ||
| @@ -229,8 +229,7 @@ This is what the do-commands look for, and what the mark-commands store.") | |||
| 229 | (defvar dired-del-marker ?D | 229 | (defvar dired-del-marker ?D |
| 230 | "Character used to flag files for deletion.") | 230 | "Character used to flag files for deletion.") |
| 231 | 231 | ||
| 232 | (defvar dired-shrink-to-fit | 232 | (defvar dired-shrink-to-fit t |
| 233 | t | ||
| 234 | ;; I see no reason ever to make this nil -- rms. | 233 | ;; I see no reason ever to make this nil -- rms. |
| 235 | ;; (> baud-rate search-slow-speed) | 234 | ;; (> baud-rate search-slow-speed) |
| 236 | "Non-nil means Dired shrinks the display buffer to fit the marked files.") | 235 | "Non-nil means Dired shrinks the display buffer to fit the marked files.") |
| @@ -241,7 +240,7 @@ This is what the do-commands look for, and what the mark-commands store.") | |||
| 241 | 240 | ||
| 242 | ;;;###autoload | 241 | ;;;###autoload |
| 243 | (defvar dired-directory nil | 242 | (defvar dired-directory nil |
| 244 | "The directory name or wildcard spec that this Dired directory lists. | 243 | "The directory name or wildcard spec that this dired directory lists. |
| 245 | Local to each dired buffer. May be a list, in which case the car is the | 244 | Local to each dired buffer. May be a list, in which case the car is the |
| 246 | directory name and the cdr is the list of files to mention. | 245 | directory name and the cdr is the list of files to mention. |
| 247 | The directory name must be absolute, but need not be fully expanded.") | 246 | The directory name must be absolute, but need not be fully expanded.") |
| @@ -295,7 +294,7 @@ of the line (\\n or \\r). | |||
| 295 | Subexpression 2 must end right before the \\n or \\r.") | 294 | Subexpression 2 must end right before the \\n or \\r.") |
| 296 | 295 | ||
| 297 | (defgroup dired-faces nil | 296 | (defgroup dired-faces nil |
| 298 | "Faces used by dired." | 297 | "Faces used by Dired." |
| 299 | :group 'dired | 298 | :group 'dired |
| 300 | :group 'faces) | 299 | :group 'faces) |
| 301 | 300 | ||
| @@ -598,7 +597,7 @@ list of files to make directory entries for. | |||
| 598 | You can move around in it with the usual commands. | 597 | You can move around in it with the usual commands. |
| 599 | You can flag files for deletion with \\[dired-flag-file-deletion] and then | 598 | You can flag files for deletion with \\[dired-flag-file-deletion] and then |
| 600 | delete them by typing \\[dired-do-flagged-delete]. | 599 | delete them by typing \\[dired-do-flagged-delete]. |
| 601 | Type \\[describe-mode] after entering dired for more info. | 600 | Type \\[describe-mode] after entering Dired for more info. |
| 602 | 601 | ||
| 603 | If DIRNAME is already in a dired buffer, that buffer is used without refresh." | 602 | If DIRNAME is already in a dired buffer, that buffer is used without refresh." |
| 604 | ;; Cannot use (interactive "D") because of wildcards. | 603 | ;; Cannot use (interactive "D") because of wildcards. |
| @@ -911,7 +910,7 @@ BEG..END is the line where the file info is located." | |||
| 911 | (move-to-column curcol) | 910 | (move-to-column curcol) |
| 912 | (when (looking-at | 911 | (when (looking-at |
| 913 | (concat | 912 | (concat |
| 914 | (if (eq (char-before) ?\ ) " *" "[^ ]* *") | 913 | (if (eq (char-before) ?\s) " *" "[^ ]* *") |
| 915 | (if num-align "[0-9][^ ]*"))) | 914 | (if num-align "[0-9][^ ]*"))) |
| 916 | (- (match-end 0) (match-beginning 0))))) | 915 | (- (match-end 0) (match-beginning 0))))) |
| 917 | ;; Now, the number of spaces to insert is align-pt-offset | 916 | ;; Now, the number of spaces to insert is align-pt-offset |
| @@ -1020,7 +1019,7 @@ If HDR is non-nil, insert a header line with the directory name." | |||
| 1020 | 1019 | ||
| 1021 | (defun dired-revert (&optional arg noconfirm) | 1020 | (defun dired-revert (&optional arg noconfirm) |
| 1022 | "Reread the dired buffer. | 1021 | "Reread the dired buffer. |
| 1023 | Must also be called after dired-actual-switches have changed. | 1022 | Must also be called after `dired-actual-switches' have changed. |
| 1024 | Should not fail even on completely garbaged buffers. | 1023 | Should not fail even on completely garbaged buffers. |
| 1025 | Preserves old cursor, marks/flags, hidden-p." | 1024 | Preserves old cursor, marks/flags, hidden-p." |
| 1026 | (widen) ; just in case user narrowed | 1025 | (widen) ; just in case user narrowed |
| @@ -1500,12 +1499,12 @@ Type \\[dired-find-file-other-window] to find file or dired directory in Other w | |||
| 1500 | Type \\[dired-maybe-insert-subdir] to Insert a subdirectory in this buffer. | 1499 | Type \\[dired-maybe-insert-subdir] to Insert a subdirectory in this buffer. |
| 1501 | Type \\[dired-do-rename] to Rename a file or move the marked files to another directory. | 1500 | Type \\[dired-do-rename] to Rename a file or move the marked files to another directory. |
| 1502 | Type \\[dired-do-copy] to Copy files. | 1501 | Type \\[dired-do-copy] to Copy files. |
| 1503 | Type \\[dired-sort-toggle-or-edit] to toggle sorting by name/date or change the `ls' switches. | 1502 | Type \\[dired-sort-toggle-or-edit] to toggle Sorting by name/date or change the `ls' switches. |
| 1504 | Type \\[revert-buffer] to read all currently expanded directories again. | 1503 | Type \\[revert-buffer] to read all currently expanded directories aGain. |
| 1505 | This retains all marks and hides subdirs again that were hidden before. | 1504 | This retains all marks and hides subdirs again that were hidden before. |
| 1506 | SPC and DEL can be used to move down and up by lines. | 1505 | SPC and DEL can be used to move down and up by lines. |
| 1507 | 1506 | ||
| 1508 | If dired ever gets confused, you can either type \\[revert-buffer] \ | 1507 | If Dired ever gets confused, you can either type \\[revert-buffer] \ |
| 1509 | to read the | 1508 | to read the |
| 1510 | directories again, type \\[dired-do-redisplay] \ | 1509 | directories again, type \\[dired-do-redisplay] \ |
| 1511 | to relist a single or the marked files or a | 1510 | to relist a single or the marked files or a |
| @@ -1575,7 +1574,7 @@ Keybindings: | |||
| 1575 | ;; Idiosyncratic dired commands that don't deal with marks. | 1574 | ;; Idiosyncratic dired commands that don't deal with marks. |
| 1576 | 1575 | ||
| 1577 | (defun dired-summary () | 1576 | (defun dired-summary () |
| 1578 | "Summarize basic Dired commands and show recent Dired errors." | 1577 | "Summarize basic Dired commands and show recent dired errors." |
| 1579 | (interactive) | 1578 | (interactive) |
| 1580 | (dired-why) | 1579 | (dired-why) |
| 1581 | ;>> this should check the key-bindings and use substitute-command-keys if non-standard | 1580 | ;>> this should check the key-bindings and use substitute-command-keys if non-standard |
| @@ -1590,7 +1589,7 @@ You can use it to recover marks, killed lines or subdirs." | |||
| 1590 | (let (buffer-read-only) | 1589 | (let (buffer-read-only) |
| 1591 | (undo)) | 1590 | (undo)) |
| 1592 | (dired-build-subdir-alist) | 1591 | (dired-build-subdir-alist) |
| 1593 | (message "Change in Dired buffer undone. | 1592 | (message "Change in dired buffer undone. |
| 1594 | Actual changes in files cannot be undone by Emacs.")) | 1593 | Actual changes in files cannot be undone by Emacs.")) |
| 1595 | 1594 | ||
| 1596 | (defun dired-next-line (arg) | 1595 | (defun dired-next-line (arg) |
| @@ -1654,7 +1653,7 @@ Creates a buffer if necessary." | |||
| 1654 | file-name | 1653 | file-name |
| 1655 | (if (file-symlink-p file-name) | 1654 | (if (file-symlink-p file-name) |
| 1656 | (error "File is a symlink to a nonexistent target") | 1655 | (error "File is a symlink to a nonexistent target") |
| 1657 | (error "File no longer exists; type `g' to update Dired buffer"))))) | 1656 | (error "File no longer exists; type `g' to update dired buffer"))))) |
| 1658 | 1657 | ||
| 1659 | ;; Force `f' rather than `e' in the mode doc: | 1658 | ;; Force `f' rather than `e' in the mode doc: |
| 1660 | (defalias 'dired-advertised-find-file 'dired-find-file) | 1659 | (defalias 'dired-advertised-find-file 'dired-find-file) |
| @@ -1696,7 +1695,7 @@ Creates a buffer if necessary." | |||
| 1696 | (find-file-other-window (file-name-sans-versions file t))))) | 1695 | (find-file-other-window (file-name-sans-versions file t))))) |
| 1697 | 1696 | ||
| 1698 | (defun dired-view-file () | 1697 | (defun dired-view-file () |
| 1699 | "In Dired, examine a file in view mode, returning to dired when done. | 1698 | "In Dired, examine a file in view mode, returning to Dired when done. |
| 1700 | When file is a directory, show it in this buffer if it is inserted. | 1699 | When file is a directory, show it in this buffer if it is inserted. |
| 1701 | Otherwise, display it in another buffer." | 1700 | Otherwise, display it in another buffer." |
| 1702 | (interactive) | 1701 | (interactive) |
| @@ -1976,7 +1975,7 @@ Return the position of the beginning of the filename, or nil if none found." | |||
| 1976 | "Copy names of marked (or next ARG) files into the kill ring. | 1975 | "Copy names of marked (or next ARG) files into the kill ring. |
| 1977 | The names are separated by a space. | 1976 | The names are separated by a space. |
| 1978 | With a zero prefix arg, use the absolute file name of each marked file. | 1977 | With a zero prefix arg, use the absolute file name of each marked file. |
| 1979 | With \\[universal-argument], use the file name relative to the Dired buffer's | 1978 | With \\[universal-argument], use the file name relative to the dired buffer's |
| 1980 | `default-directory'. (This still may contain slashes if in a subdirectory.) | 1979 | `default-directory'. (This still may contain slashes if in a subdirectory.) |
| 1981 | 1980 | ||
| 1982 | If on a subdir headerline, use absolute subdirname instead; | 1981 | If on a subdir headerline, use absolute subdirname instead; |
| @@ -2361,7 +2360,7 @@ Anything else means ask for each directory." | |||
| 2361 | (defun dired-delete-file (file &optional recursive) "\ | 2360 | (defun dired-delete-file (file &optional recursive) "\ |
| 2362 | Delete FILE or directory (possibly recursively if optional RECURSIVE is true.) | 2361 | Delete FILE or directory (possibly recursively if optional RECURSIVE is true.) |
| 2363 | RECURSIVE determines what to do with a non-empty directory. If RECURSIVE is: | 2362 | RECURSIVE determines what to do with a non-empty directory. If RECURSIVE is: |
| 2364 | Nil, do not delete. | 2363 | nil, do not delete. |
| 2365 | `always', delete recursively without asking. | 2364 | `always', delete recursively without asking. |
| 2366 | `top', ask for each directory at top level. | 2365 | `top', ask for each directory at top level. |
| 2367 | Anything else, ask for each sub-directory." | 2366 | Anything else, ask for each sub-directory." |
| @@ -2554,7 +2553,7 @@ if there are no flagged files." | |||
| 2554 | ))) | 2553 | ))) |
| 2555 | 2554 | ||
| 2556 | (defvar dired-no-confirm nil | 2555 | (defvar dired-no-confirm nil |
| 2557 | "A list of symbols for commands dired should not confirm. | 2556 | "A list of symbols for commands Dired should not confirm. |
| 2558 | Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress', | 2557 | Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress', |
| 2559 | `copy', `delete', `hardlink', `load', `move', `print', `shell', `symlink', | 2558 | `copy', `delete', `hardlink', `load', `move', `print', `shell', `symlink', |
| 2560 | `touch' and `uncompress'.") | 2559 | `touch' and `uncompress'.") |
| @@ -2891,7 +2890,7 @@ A prefix argument says to unflag those files instead." | |||
| 2891 | "Flag all backup files (names ending with `~') for deletion. | 2890 | "Flag all backup files (names ending with `~') for deletion. |
| 2892 | With prefix argument, unflag these files." | 2891 | With prefix argument, unflag these files." |
| 2893 | (interactive "P") | 2892 | (interactive "P") |
| 2894 | (let ((dired-marker-char (if unflag-p ?\ dired-del-marker))) | 2893 | (let ((dired-marker-char (if unflag-p ?\s dired-del-marker))) |
| 2895 | (dired-mark-if | 2894 | (dired-mark-if |
| 2896 | ;; Don't call backup-file-name-p unless the last character looks like | 2895 | ;; Don't call backup-file-name-p unless the last character looks like |
| 2897 | ;; it might be the end of a backup file name. This isn't very general, | 2896 | ;; it might be the end of a backup file name. This isn't very general, |
| @@ -2925,7 +2924,7 @@ OLD and NEW are both characters used to mark files." | |||
| 2925 | (save-excursion | 2924 | (save-excursion |
| 2926 | (goto-char (point-min)) | 2925 | (goto-char (point-min)) |
| 2927 | (while (search-forward string nil t) | 2926 | (while (search-forward string nil t) |
| 2928 | (if (if (= old ?\ ) | 2927 | (if (if (= old ?\s) |
| 2929 | (save-match-data | 2928 | (save-match-data |
| 2930 | (dired-get-filename 'no-dir t)) | 2929 | (dired-get-filename 'no-dir t)) |
| 2931 | t) | 2930 | t) |
| @@ -2933,7 +2932,7 @@ OLD and NEW are both characters used to mark files." | |||
| 2933 | (match-end 0) old new))))))) | 2932 | (match-end 0) old new))))))) |
| 2934 | 2933 | ||
| 2935 | (defun dired-unmark-all-marks () | 2934 | (defun dired-unmark-all-marks () |
| 2936 | "Remove all marks from all files in the Dired buffer." | 2935 | "Remove all marks from all files in the dired buffer." |
| 2937 | (interactive) | 2936 | (interactive) |
| 2938 | (dired-unmark-all-files ?\r)) | 2937 | (dired-unmark-all-files ?\r)) |
| 2939 | 2938 | ||
| @@ -2961,7 +2960,7 @@ Type SPC or `y' to unmark one file, DEL or `n' to skip to next, | |||
| 2961 | (dired-query 'query "Unmark file `%s'? " | 2960 | (dired-query 'query "Unmark file `%s'? " |
| 2962 | file)))) | 2961 | file)))) |
| 2963 | (progn (subst-char-in-region (1- (point)) (point) | 2962 | (progn (subst-char-in-region (1- (point)) (point) |
| 2964 | (preceding-char) ?\ ) | 2963 | (preceding-char) ?\s) |
| 2965 | (setq count (1+ count))))) | 2964 | (setq count (1+ count))))) |
| 2966 | (message (if (= count 1) "1 mark removed" | 2965 | (message (if (= count 1) "1 mark removed" |
| 2967 | "%d marks removed") | 2966 | "%d marks removed") |
| @@ -3048,15 +3047,15 @@ format, use `\\[universal-argument] \\[dired]'.") | |||
| 3048 | (defvar dired-sort-by-date-regexp | 3047 | (defvar dired-sort-by-date-regexp |
| 3049 | (concat "^-[^" dired-ls-sorting-switches | 3048 | (concat "^-[^" dired-ls-sorting-switches |
| 3050 | "]*t[^" dired-ls-sorting-switches "]*$") | 3049 | "]*t[^" dired-ls-sorting-switches "]*$") |
| 3051 | "Regexp recognized by dired to set `by date' mode.") | 3050 | "Regexp recognized by Dired to set `by date' mode.") |
| 3052 | 3051 | ||
| 3053 | (defvar dired-sort-by-name-regexp | 3052 | (defvar dired-sort-by-name-regexp |
| 3054 | (concat "^-[^t" dired-ls-sorting-switches "]+$") | 3053 | (concat "^-[^t" dired-ls-sorting-switches "]+$") |
| 3055 | "Regexp recognized by dired to set `by name' mode.") | 3054 | "Regexp recognized by Dired to set `by name' mode.") |
| 3056 | 3055 | ||
| 3057 | (defvar dired-sort-inhibit nil | 3056 | (defvar dired-sort-inhibit nil |
| 3058 | "Non-nil means the Dired sort command is disabled. | 3057 | "Non-nil means the Dired sort command is disabled. |
| 3059 | The idea is to set this buffer-locally in special Dired buffers.") | 3058 | The idea is to set this buffer-locally in special dired buffers.") |
| 3060 | 3059 | ||
| 3061 | (defun dired-sort-set-modeline () | 3060 | (defun dired-sort-set-modeline () |
| 3062 | ;; Set modeline display according to dired-actual-switches. | 3061 | ;; Set modeline display according to dired-actual-switches. |
| @@ -3078,7 +3077,7 @@ The idea is to set this buffer-locally in special Dired buffers.") | |||
| 3078 | With a prefix argument you can edit the current listing switches instead." | 3077 | With a prefix argument you can edit the current listing switches instead." |
| 3079 | (interactive "P") | 3078 | (interactive "P") |
| 3080 | (when dired-sort-inhibit | 3079 | (when dired-sort-inhibit |
| 3081 | (error "Cannot sort this Dired buffer")) | 3080 | (error "Cannot sort this dired buffer")) |
| 3082 | (if arg | 3081 | (if arg |
| 3083 | (dired-sort-other | 3082 | (dired-sort-other |
| 3084 | (read-string "ls switches (must contain -l): " dired-actual-switches)) | 3083 | (read-string "ls switches (must contain -l): " dired-actual-switches)) |
| @@ -3121,7 +3120,7 @@ With a prefix argument you can edit the current listing switches instead." | |||
| 3121 | (concat result (substring string start)))) | 3120 | (concat result (substring string start)))) |
| 3122 | 3121 | ||
| 3123 | (defun dired-sort-other (switches &optional no-revert) | 3122 | (defun dired-sort-other (switches &optional no-revert) |
| 3124 | "Specify new ls SWITCHES for current dired buffer. | 3123 | "Specify new `ls' SWITCHES for current dired buffer. |
| 3125 | Values matching `dired-sort-by-date-regexp' or `dired-sort-by-name-regexp' | 3124 | Values matching `dired-sort-by-date-regexp' or `dired-sort-by-name-regexp' |
| 3126 | set the minor mode accordingly, others appear literally in the mode line. | 3125 | set the minor mode accordingly, others appear literally in the mode line. |
| 3127 | With optional second arg NO-REVERT, don't refresh the listing afterwards." | 3126 | With optional second arg NO-REVERT, don't refresh the listing afterwards." |