Mercurial > emacs
comparison lisp/dired.el @ 90286:5b7d410e31f9
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 4-14)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (base, patch 1-7)
- tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
- Update from CVS
- Merge from emacs--devo--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 187)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 25 Jan 2006 07:10:04 +0000 |
parents | 7beb78bc1f8e 9bccb5180c1b |
children | c5406394f567 |
comparison
equal
deleted
inserted
replaced
90285:5251b70632c4 | 90286:5b7d410e31f9 |
---|---|
283 | 283 |
284 (defvar dired-switches-alist nil | 284 (defvar dired-switches-alist nil |
285 "Keeps track of which switches to use for inserted subdirectories. | 285 "Keeps track of which switches to use for inserted subdirectories. |
286 This is an alist of the form (SUBDIR . SWITCHES).") | 286 This is an alist of the form (SUBDIR . SWITCHES).") |
287 (make-variable-buffer-local 'dired-switches-alist) | 287 (make-variable-buffer-local 'dired-switches-alist) |
288 | |
289 (defvaralias 'dired-move-to-filename-regexp | |
290 'directory-listing-before-filename-regexp) | |
288 | 291 |
289 (defvar dired-subdir-regexp "^. \\([^\n\r]+\\)\\(:\\)[\n\r]" | 292 (defvar dired-subdir-regexp "^. \\([^\n\r]+\\)\\(:\\)[\n\r]" |
290 "Regexp matching a maybe hidden subdirectory line in `ls -lR' output. | 293 "Regexp matching a maybe hidden subdirectory line in `ls -lR' output. |
291 Subexpression 1 is the subdirectory proper, no trailing colon. | 294 Subexpression 1 is the subdirectory proper, no trailing colon. |
292 The match starts at the beginning of the line and ends after the end | 295 The match starts at the beginning of the line and ends after the end |
2512 (select-window w2) | 2515 (select-window w2) |
2513 (enlarge-window (- target-lines (1- (window-height w2)))))) | 2516 (enlarge-window (- target-lines (1- (window-height w2)))))) |
2514 (set-window-start w2 1) | 2517 (set-window-start w2 1) |
2515 ))) | 2518 ))) |
2516 | 2519 |
2517 (defvar dired-no-confirm nil | 2520 (defcustom dired-no-confirm nil |
2518 "A list of symbols for commands Dired should not confirm. | 2521 "A list of symbols for commands Dired should not confirm. |
2519 Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress', | 2522 Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress', |
2520 `copy', `delete', `hardlink', `load', `move', `print', `shell', `symlink', | 2523 `copy', `delete', `hardlink', `load', `move', `print', `shell', `symlink', |
2521 `touch' and `uncompress'.") | 2524 `touch' and `uncompress'." |
2525 :group 'dired | |
2526 :type '(set (const byte-compile) (const chgrp) | |
2527 (const chmod) (const chown) (const compress) | |
2528 (const copy) (const delete) (const hardlink) | |
2529 (const load) (const move) (const print) | |
2530 (const shell) (const symlink) (const touch) | |
2531 (const uncompress))) | |
2522 | 2532 |
2523 (defun dired-mark-pop-up (bufname op-symbol files function &rest args) | 2533 (defun dired-mark-pop-up (bufname op-symbol files function &rest args) |
2524 "Return FUNCTION's result on ARGS after showing which files are marked. | 2534 "Return FUNCTION's result on ARGS after showing which files are marked. |
2525 Displays the file names in a buffer named BUFNAME; | 2535 Displays the file names in a buffer named BUFNAME; |
2526 nil gives \" *Marked Files*\". | 2536 nil gives \" *Marked Files*\". |
3089 (dired-sort-R-check switches) | 3099 (dired-sort-R-check switches) |
3090 (setq dired-actual-switches switches) | 3100 (setq dired-actual-switches switches) |
3091 (if (eq major-mode 'dired-mode) (dired-sort-set-modeline)) | 3101 (if (eq major-mode 'dired-mode) (dired-sort-set-modeline)) |
3092 (or no-revert (revert-buffer))) | 3102 (or no-revert (revert-buffer))) |
3093 | 3103 |
3094 (make-variable-buffer-local | 3104 (defvar dired-subdir-alist-pre-R nil |
3095 (defvar dired-subdir-alist-pre-R nil | 3105 "Value of `dired-subdir-alist' before -R switch added.") |
3096 "Value of `dired-subdir-alist' before -R switch added.")) | 3106 (make-variable-buffer-local 'dired-subdir-alist-pre-R) |
3097 | 3107 |
3098 (defun dired-sort-R-check (switches) | 3108 (defun dired-sort-R-check (switches) |
3099 "Additional processing of -R in ls option string SWITCHES. | 3109 "Additional processing of -R in ls option string SWITCHES. |
3100 Saves `dired-subdir-alist' when R is set and restores saved value | 3110 Saves `dired-subdir-alist' when R is set and restores saved value |
3101 minus any directories explicitly deleted when R is cleared. | 3111 minus any directories explicitly deleted when R is cleared. |