mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-16 17:19:41 +00:00
Code Issues Releases Activity

(dired-align-file, dired-flag-backup-files, dired-change-marks,

Browse Source 
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.
This commit is contained in:
Juanma Barranquero 2005-07-20 14:08:39 +00:00
parent 2624e2ac35
commit ee680b2bc5
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lisp/dired.el
View File

@ -50,13 +50,13 @@
;;;###autoload
(defcustom dired-listing-switches "-al"
"*Switches passed to `ls' for dired. MUST contain the `l' option.
"*Switches passed to `ls' for Dired. MUST contain the `l' option.
May contain all other options that don't contradict `-l';
may contain even `F', `b', `i' and `s'. See also the variable
`dired-ls-F-marks-symlinks' concerning the `F' switch.
On systems such as MS-DOS and MS-Windows, which use `ls' emulation in Lisp,
some of the `ls' switches are not supported; see the doc string of
`insert-directory' on ls-lisp.el for more details."
`insert-directory' on `ls-lisp.el' for more details."
:type 'string
:group 'dired)
@ -88,7 +88,7 @@ If nil, `dired-listing-switches' is used.")
;;;###autoload
(defcustom dired-ls-F-marks-symlinks nil
"*Informs dired about how `ls -lF' marks symbolic links.
"*Informs Dired about how `ls -lF' marks symbolic links.
Set this to t if `ls' (or whatever program is specified by
`insert-directory-program') with `-lF' marks the symbolic link
itself with a trailing @ (usually the case under Ultrix).
@ -153,7 +153,7 @@ If a character, new links are unconditionally marked with that character."
;;;###autoload
(defcustom dired-dwim-target nil
"*If non-nil, dired tries to guess a default target directory.
"*If non-nil, Dired tries to guess a default target directory.
This means: if there is a dired buffer displayed in the next window,
use its current subdir, instead of the current subdir of this dired buffer.
@ -176,13 +176,13 @@ The target is used in the prompt for file copy, rename etc."
;;; Hook variables
(defcustom dired-load-hook nil
"Run after loading dired.
"Run after loading Dired.
You can customize key bindings or load extensions with this."
:group 'dired
:type 'hook)
(defcustom dired-mode-hook nil
"Run at the very end of dired-mode."
"Run at the very end of `dired-mode'."
:group 'dired
:type 'hook)
@ -229,8 +229,7 @@ This is what the do-commands look for, and what the mark-commands store.")
(defvar dired-del-marker ?D
"Character used to flag files for deletion.")
(defvar dired-shrink-to-fit
t
(defvar dired-shrink-to-fit t
;; I see no reason ever to make this nil -- rms.
;; (> baud-rate search-slow-speed)
"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.")
;;;###autoload
(defvar dired-directory nil
"The directory name or wildcard spec that this Dired directory lists.
"The directory name or wildcard spec that this dired directory lists.
Local to each dired buffer. May be a list, in which case the car is the
directory name and the cdr is the list of files to mention.
The directory name must be absolute, but need not be fully expanded.")
@ -295,7 +294,7 @@ of the line (\\n or \\r).
Subexpression 2 must end right before the \\n or \\r.")
(defgroup dired-faces nil
"Faces used by dired."
"Faces used by Dired."
:group 'dired
:group 'faces)
@ -598,7 +597,7 @@ list of files to make directory entries for.
You can move around in it with the usual commands.
You can flag files for deletion with \\[dired-flag-file-deletion] and then
delete them by typing \\[dired-do-flagged-delete].
Type \\[describe-mode] after entering dired for more info.
Type \\[describe-mode] after entering Dired for more info.
If DIRNAME is already in a dired buffer, that buffer is used without refresh."
;; Cannot use (interactive "D") because of wildcards.
@ -911,7 +910,7 @@ BEG..END is the line where the file info is located."
(move-to-column curcol)
(when (looking-at
(concat
(if (eq (char-before) ?\ ) " *" "[^ ]* *")
(if (eq (char-before) ?\s) " *" "[^ ]* *")
(if num-align "[0-9][^ ]*")))
(- (match-end 0) (match-beginning 0)))))
;; 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."
(defun dired-revert (&optional arg noconfirm)
"Reread the dired buffer.
Must also be called after dired-actual-switches have changed.
Must also be called after `dired-actual-switches' have changed.
Should not fail even on completely garbaged buffers.
Preserves old cursor, marks/flags, hidden-p."
(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
Type \\[dired-maybe-insert-subdir] to Insert a subdirectory in this buffer.
Type \\[dired-do-rename] to Rename a file or move the marked files to another directory.
Type \\[dired-do-copy] to Copy files.
Type \\[dired-sort-toggle-or-edit] to toggle sorting by name/date or change the `ls' switches.
Type \\[revert-buffer] to read all currently expanded directories again.
Type \\[dired-sort-toggle-or-edit] to toggle Sorting by name/date or change the `ls' switches.
Type \\[revert-buffer] to read all currently expanded directories aGain.
This retains all marks and hides subdirs again that were hidden before.
SPC and DEL can be used to move down and up by lines.
If dired ever gets confused, you can either type \\[revert-buffer] \
If Dired ever gets confused, you can either type \\[revert-buffer] \
to read the
directories again, type \\[dired-do-redisplay] \
to relist a single or the marked files or a
@ -1575,7 +1574,7 @@ Keybindings:
;; Idiosyncratic dired commands that don't deal with marks.
(defun dired-summary ()
"Summarize basic Dired commands and show recent Dired errors."
"Summarize basic Dired commands and show recent dired errors."
(interactive)
(dired-why)
;>> 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."
(let (buffer-read-only)
(undo))
(dired-build-subdir-alist)
(message "Change in Dired buffer undone.
(message "Change in dired buffer undone.
Actual changes in files cannot be undone by Emacs."))
(defun dired-next-line (arg)
@ -1654,7 +1653,7 @@ Creates a buffer if necessary."
file-name
(if (file-symlink-p file-name)
(error "File is a symlink to a nonexistent target")
(error "File no longer exists; type `g' to update Dired buffer")))))
(error "File no longer exists; type `g' to update dired buffer")))))
;; Force `f' rather than `e' in the mode doc:
(defalias 'dired-advertised-find-file 'dired-find-file)
@ -1696,7 +1695,7 @@ Creates a buffer if necessary."
(find-file-other-window (file-name-sans-versions file t)))))
(defun dired-view-file ()
"In Dired, examine a file in view mode, returning to dired when done.
"In Dired, examine a file in view mode, returning to Dired when done.
When file is a directory, show it in this buffer if it is inserted.
Otherwise, display it in another buffer."
(interactive)
@ -1976,7 +1975,7 @@ Return the position of the beginning of the filename, or nil if none found."
"Copy names of marked (or next ARG) files into the kill ring.
The names are separated by a space.
With a zero prefix arg, use the absolute file name of each marked file.
With \\[universal-argument], use the file name relative to the Dired buffer's
With \\[universal-argument], use the file name relative to the dired buffer's
`default-directory'. (This still may contain slashes if in a subdirectory.)
If on a subdir headerline, use absolute subdirname instead;
@ -2361,7 +2360,7 @@ Anything else means ask for each directory."
(defun dired-delete-file (file &optional recursive) "\
Delete FILE or directory (possibly recursively if optional RECURSIVE is true.)
RECURSIVE determines what to do with a non-empty directory. If RECURSIVE is:
Nil, do not delete.
nil, do not delete.
`always', delete recursively without asking.
`top', ask for each directory at top level.
Anything else, ask for each sub-directory."
@ -2554,7 +2553,7 @@ if there are no flagged files."
)))
(defvar dired-no-confirm nil
"A list of symbols for commands dired should not confirm.
"A list of symbols for commands Dired should not confirm.
Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress',
`copy', `delete', `hardlink', `load', `move', `print', `shell', `symlink',
`touch' and `uncompress'.")
@ -2891,7 +2890,7 @@ A prefix argument says to unflag those files instead."
"Flag all backup files (names ending with `~') for deletion.
With prefix argument, unflag these files."
(interactive "P")
(let ((dired-marker-char (if unflag-p ?\ dired-del-marker)))
(let ((dired-marker-char (if unflag-p ?\s dired-del-marker)))
(dired-mark-if
;; Don't call backup-file-name-p unless the last character looks like
;; 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."
(save-excursion
(goto-char (point-min))
(while (search-forward string nil t)
(if (if (= old ?\ )
(if (if (= old ?\s)
(save-match-data
(dired-get-filename 'no-dir t))
t)
@ -2933,7 +2932,7 @@ OLD and NEW are both characters used to mark files."
(match-end 0) old new)))))))
(defun dired-unmark-all-marks ()
"Remove all marks from all files in the Dired buffer."
"Remove all marks from all files in the dired buffer."
(interactive)
(dired-unmark-all-files ?\r))
@ -2961,7 +2960,7 @@ Type SPC or `y' to unmark one file, DEL or `n' to skip to next,
(dired-query 'query "Unmark file `%s'? "
file))))
(progn (subst-char-in-region (1- (point)) (point)
(preceding-char) ?\ )
(preceding-char) ?\s)
(setq count (1+ count)))))
(message (if (= count 1) "1 mark removed"
"%d marks removed")
@ -3048,15 +3047,15 @@ format, use `\\[universal-argument] \\[dired]'.")
(defvar dired-sort-by-date-regexp
(concat "^-[^" dired-ls-sorting-switches
"]*t[^" dired-ls-sorting-switches "]*$")
"Regexp recognized by dired to set `by date' mode.")
"Regexp recognized by Dired to set `by date' mode.")
(defvar dired-sort-by-name-regexp
(concat "^-[^t" dired-ls-sorting-switches "]+$")
"Regexp recognized by dired to set `by name' mode.")
"Regexp recognized by Dired to set `by name' mode.")
(defvar dired-sort-inhibit nil
"Non-nil means the Dired sort command is disabled.
The idea is to set this buffer-locally in special Dired buffers.")
The idea is to set this buffer-locally in special dired buffers.")
(defun dired-sort-set-modeline ()
;; Set modeline display according to dired-actual-switches.
@ -3078,7 +3077,7 @@ The idea is to set this buffer-locally in special Dired buffers.")
With a prefix argument you can edit the current listing switches instead."
(interactive "P")
(when dired-sort-inhibit
(error "Cannot sort this Dired buffer"))
(error "Cannot sort this dired buffer"))
(if arg
(dired-sort-other
(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."
(concat result (substring string start))))
(defun dired-sort-other (switches &optional no-revert)
"Specify new ls SWITCHES for current dired buffer.
"Specify new `ls' SWITCHES for current dired buffer.
Values matching `dired-sort-by-date-regexp' or `dired-sort-by-name-regexp'
set the minor mode accordingly, others appear literally in the mode line.
With optional second arg NO-REVERT, don't refresh the listing afterwards."