;; Date: 1994/08/18 19:27:42
;; Keywords: dired extensions
-;; Copyright (C) 1993, 1994 Free Software Foundation
+;; Copyright (C) 1993, 1994, 1997 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
;; dired-omit-files-p
;; dired-omit-files
;; dired-omit-extensions
+;; dired-omit-size-limit
;;
;; To find out more about these variables, load this file, put your cursor at
;; the end of any of the variable names, and hit C-h v [RET]. *Please* see
;;; User-defined variables.
-(defvar dired-bind-vm nil
- "*t says \"V\" in dired-mode will `dired-vm', otherwise \"V\" is `dired-rmail'.
-Also, RMAIL files contain -*- rmail -*- at the top so \"f\",
-`dired-advertised-find-file', will run rmail.")
-
-(defvar dired-bind-jump t
- "*t says bind `dired-jump' to C-x C-j, otherwise do not.")
-
-(defvar dired-bind-man t
- "*t says bind `dired-man' to \"N\" in dired-mode, otherwise do not.")
+(defgroup dired-x nil
+ "Extended directory editing (dired-x)."
+ :group 'dired)
-(defvar dired-bind-info t
- "*t says bind `dired-info' to \"I\" in dired-mode, otherwise do not.")
+(defgroup dired-keys nil
+ "Dired keys customizations."
+ :prefix "dired-"
+ :group 'dired-x)
-(defvar dired-vm-read-only-folders nil
+(defcustom dired-bind-vm nil
+ "*t says \"V\" in dired-mode will `dired-vm', otherwise \"V\" is `dired-rmail'.
+Also, RMAIL files contain -*- rmail -*- at the top so \"f\",
+`dired-advertised-find-file', will run rmail."
+ :type 'boolean
+ :group 'dired-keys)
+
+(defcustom dired-bind-jump t
+ "*t says bind `dired-jump' to C-x C-j, otherwise do not."
+ :type 'boolean
+ :group 'dired-keys)
+
+(defcustom dired-bind-man t
+ "*t says bind `dired-man' to \"N\" in dired-mode, otherwise do not."
+ :type 'boolean
+ :group 'dired-keys)
+
+(defcustom dired-bind-info t
+ "*t says bind `dired-info' to \"I\" in dired-mode, otherwise do not."
+ :type 'boolean
+ :group 'dired-keys)
+
+(defcustom dired-vm-read-only-folders nil
"*If t, \\[dired-vm] will visit all folders read-only.
If neither nil nor t, e.g. the symbol `if-file-read-only', only
files not writable by you are visited read-only.
-Read-only folders only work in VM 5, not in VM 4.")
+Read-only folders only work in VM 5, not in VM 4."
+ :type '(choice (const :tag "off" nil)
+ (const :tag "on" t)
+ (other :tag "non-writable only" if-file-read-only))
+ :group 'dired-x)
-(defvar dired-omit-files-p nil
+(defcustom dired-omit-files-p nil
"*If non-nil, \"uninteresting\" files are not listed (buffer-local).
Use \\[dired-omit-toggle] to toggle its value.
Uninteresting files are those whose filenames match regexp `dired-omit-files',
-plus those ending with extensions in `dired-omit-extensions'.")
+plus those ending with extensions in `dired-omit-extensions'."
+ :type 'boolean
+ :group 'dired-x)
(make-variable-buffer-local 'dired-omit-files-p)
-(defvar dired-omit-files "^#\\|^\\.$\\|^\\.\\.$"
+(defcustom dired-omit-files "^\\.?#\\|^\\.$\\|^\\.\\.$"
"*Filenames matching this regexp will not be displayed.
This only has effect when `dired-omit-files-p' is t. See interactive function
`dired-omit-toggle' \(\\[dired-omit-toggle]\) and variable
-`dired-omit-extensions'. The default is to omit `.', `..', and auto-save
-files.")
+`dired-omit-extensions'. The default is to omit `.', `..', auto-save
+files and lock files."
+ :type 'regexp
+ :group 'dired-x)
-(defvar dired-find-subdir nil ; t is pretty near to DWIM...
+(defcustom dired-find-subdir nil ; t is pretty near to DWIM...
"*If non-nil, Dired always finds a directory in a buffer of its own.
If nil, Dired finds the directory as a subdirectory in some other buffer
if it is present as one.
Dired avoids switching to the current buffer, so that if you have
a normal and a wildcard buffer for the same directory, C-x d RET will
-toggle between those two.")
+toggle between those two."
+ :type 'boolean
+ :group 'dired-x)
-(defvar dired-enable-local-variables t
+(defcustom dired-omit-size-limit 30000
+ "*Maximum size for the \"omitting\" feature.
+If nil, there is no maximum size."
+ :type '(choice (const :tag "no maximum" nil) integer)
+ :group 'dired-x)
+
+(defcustom dired-enable-local-variables t
"*Control use of local-variables lists in dired.
The value can be t, nil or something else.
A value of t means local-variables lists are obeyed;
nil means they are ignored; anything else means query.
This temporarily overrides the value of `enable-local-variables' when listing
-a directory. See also `dired-local-variables-file'.")
+a directory. See also `dired-local-variables-file'."
+ :type 'boolean
+ :group 'dired-x)
-(defvar dired-guess-shell-gnutar nil
+(defcustom dired-guess-shell-gnutar nil
"*If non-nil, name of GNU tar executable (e.g., \"tar\" or \"gtar\") and `z'
switch will be used for compressed or gzip'ed tar files. If no GNU tar, set
-to nil: a pipe using `zcat' or `gunzip -c' will be used.")
+to nil: a pipe using `zcat' or `gunzip -c' will be used."
+ :type 'boolean
+ :group 'dired-x)
-(defvar dired-guess-shell-gzip-quiet t
- "*non-nil says pass -q to gzip overriding verbose GZIP environment.")
+(defcustom dired-guess-shell-gzip-quiet t
+ "*non-nil says pass -q to gzip overriding verbose GZIP environment."
+ :type 'boolean
+ :group 'dired-x)
-(defvar dired-guess-shell-znew-switches nil
- "*If non-nil, then string of switches passed to `znew', example: \"-K\"")
+(defcustom dired-guess-shell-znew-switches nil
+ "*If non-nil, then string of switches passed to `znew', example: \"-K\""
+ :type 'boolean
+ :group 'dired-x)
-(defvar dired-clean-up-buffers-too t
- "*t says offer to kill buffers visiting files and dirs deleted in dired.")
+(defcustom dired-clean-up-buffers-too t
+ "*t says offer to kill buffers visiting files and dirs deleted in dired."
+ :type 'boolean
+ :group 'dired-x)
;;; KEY BINDINGS.
(define-key dired-mode-map "*(" 'dired-mark-sexp)
(define-key dired-mode-map "*." 'dired-mark-extension)
(define-key dired-mode-map "\M-!" 'dired-smart-shell-command)
-(define-key dired-mode-map "T" 'dired-do-toggle)
-(define-key dired-mode-map "*t" 'dired-do-toggle)
(define-key dired-mode-map "w" 'dired-copy-filename-as-kill)
(define-key dired-mode-map "\M-g" 'dired-goto-file)
(define-key dired-mode-map "\M-G" 'dired-goto-subdir)
\\[dired-man]\t-- run man on file
\\[dired-do-find-marked-files]\t-- visit all marked files simultaneously
\\[dired-omit-toggle]\t-- toggle omitting of files
- \\[dired-do-toggle]\t-- toggle marks
\\[dired-mark-sexp]\t-- mark by lisp expression
\\[dired-copy-filename-as-kill]\t-- copy the file or subdir names into the kill ring.
\t You can feed it to other commands using \\[yank].
dired-omit-files-p
dired-omit-files
dired-omit-extensions
+ dired-omit-size-limit
dired-find-subdir
dired-enable-local-variables
dired-local-variables-file
(dired dir))
(if file
(or (dired-goto-file file)
- ;; Toggle omitting, if necessary, and try again.
- (progn
- (dired-omit-toggle t)
- (dired-goto-file file))
;; refresh and try again
(progn
(dired-insert-subdir (file-name-directory file))
- (dired-goto-file file)))))))
+ (dired-goto-file file))
+ ;; Toggle omitting, if it is on, and try again.
+ (if dired-omit-files-p
+ (progn
+ (dired-omit-toggle)
+ (dired-goto-file file))))))))
(defun dired-jump-other-window ()
"Like \\[dired-jump] (dired-jump) but in other window."
(interactive)
(dired-jump t))
\f
-;;; TOGGLE.
-;;; Toggle marked files with unmarked files.
-
-(defun dired-do-toggle ()
- "Toggle marks.
-That is, currently marked files become unmarked and vice versa.
-Files marked with other flags (such as `D') are not affected.
-`.' and `..' are never toggled.
-As always, hidden subdirs are not affected."
- (interactive)
- (save-excursion
- (goto-char (point-min))
- (let (buffer-read-only)
- (while (not (eobp))
- (or (dired-between-files)
- (looking-at dired-re-dot)
- ;; use subst instead of insdel because it does not move
- ;; the gap and thus should be faster and because
- ;; other characters are left alone automatically
- (apply 'subst-char-in-region
- (point) (1+ (point))
- (if (eq ?\040 (following-char)) ; SPC
- (list ?\040 dired-marker-char)
- (list dired-marker-char ?\040))))
- (forward-line 1)))))
-
-\f
;;; COPY NAMES OF MARKED FILES INTO KILL-RING.
(defun dired-copy-filename-as-kill (&optional arg)
(if (not dired-omit-files-p)
(revert-buffer)
;; this will mention how many were omitted:
- (dired-omit-expunge))))
+ (let ((dired-omit-size-limit nil))
+ (dired-omit-expunge)))))
(defvar dired-omit-extensions
(append completion-ignored-extensions
(defun dired-omit-expunge (&optional regexp)
"Erases all unmarked files matching REGEXP.
-Does nothing if global variable `dired-omit-files-p' is nil.
+Does nothing if global variable `dired-omit-files-p' is nil, or if called
+ non-interactively and buffer is bigger than `dired-omit-size-limit'.
If REGEXP is nil or not specified, uses `dired-omit-files', and also omits
filenames ending in `dired-omit-extensions'.
If REGEXP is the empty string, this function is a no-op.
This functions works by temporarily binding `dired-marker-char' to
`dired-omit-marker-char' and calling `dired-do-kill-lines'."
(interactive "sOmit files (regexp): ")
- (if dired-omit-files-p
+ (if (and dired-omit-files-p
+ (or (interactive-p)
+ (not dired-omit-size-limit)
+ (< (buffer-size) dired-omit-size-limit)
+ (progn
+ (message "Not omitting: directory larger than %d characters."
+ dired-omit-size-limit)
+ (setq dired-omit-files-p nil)
+ nil)))
(let ((omit-re (or regexp (dired-omit-regexp)))
(old-modified-p (buffer-modified-p))
count)
msg)))
;;; REDEFINE.
-(defun dired-omit-new-add-entry (filename &optional marker-char)
+(defun dired-omit-new-add-entry (filename &optional marker-char relative)
;; This redefines dired-aux.el's dired-add-entry to avoid calling ls for
;; files that are going to be omitted anyway.
(if dired-omit-files-p
filename
(file-name-directory filename)))))))
;; if it didn't match, go ahead and add the entry
- (dired-omit-old-add-entry filename marker-char)
+ (dired-omit-old-add-entry filename marker-char relative)
;; dired-add-entry returns t for success, perhaps we should
;; return file-exists-p
t))
;; omitting is not turned on at all
- (dired-omit-old-add-entry filename marker-char)))
+ (dired-omit-old-add-entry filename marker-char relative)))
;;; REDEFINE.
;;; Redefine dired-aux.el's version of `dired-add-entry'
(defun dired-smart-shell-command (cmd &optional insert)
"Like function `shell-command', but in the current Tree Dired directory."
- (interactive "sShell command: \nP")
+ (interactive (list (read-from-minibuffer "Shell command: "
+ nil nil nil 'shell-command-history)
+ current-prefix-arg))
(let ((default-directory (default-directory)))
(shell-command cmd insert)))
" " dired-guess-shell-znew-switches))
;; gzip'ed archives
- (list "\\.tar\\.g?z$"
+ (list "\\.t\\(ar\\.\\)?gz$"
'(if dired-guess-shell-gnutar
(concat dired-guess-shell-gnutar " zxvf")
(concat "gunzip -qc * | tar xvf -"))
;; Optional decompression.
'(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q" "")))
+ ;; bzip2'ed archives
+ (list "\\.tar\\.bz2$"
+ "bunzip2 -c * | tar xvf -"
+ ;; Optional decompression.
+ "bunzip2")
'("\\.shar.Z$" "zcat * | unshar")
'("\\.shar.g?z$" "gunzip -qc * | unshar")
- '("\\.ps$" "ghostview" "xv" "lpr")
- (list "\\.ps.g?z$" "gunzip -qc * | ghostview -"
+ '("\\.e?ps$" "ghostview" "xloadimage" "lpr")
+ (list "\\.e?ps.g?z$" "gunzip -qc * | ghostview -"
;; Optional decompression.
'(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
- (list "\\.ps.Z$" "zcat * | ghostview -"
+ (list "\\.e?ps.Z$" "zcat * | ghostview -"
;; Optional conversion to gzip format.
'(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
" " dired-guess-shell-znew-switches))
'("\\.sh$" "sh") ; execute shell scripts
'("\\.xbm$" "bitmap") ; view X11 bitmaps
'("\\.gp$" "gnuplot")
- '("\\.p[bgpn]m$" "xv")
- '("\\.gif$" "xv") ; view gif pictures
- '("\\.tif$" "xv")
- '("\\.jpg$" "xv")
+ '("\\.p[bgpn]m$" "xloadimage")
+ '("\\.gif$" "xloadimage") ; view gif pictures
+ '("\\.tif$" "xloadimage")
+ '("\\.png$" "xloadimage")
+ '("\\.jpg$" "xloadimage")
'("\\.fig$" "xfig") ; edit fig pictures
'("\\.out$" "xgraph") ; for plotting purposes.
'("\\.tex$" "latex" "tex")
'("\\.texi\\(nfo\\)?$" "makeinfo" "texi2dvi")
+ '("\\.pdf$" "acroread") ; edit PDF files
;; Some other popular archivers.
'("\\.zoo$" "zoo x//")
;; Compression.
(list "\\.g?z$" '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
+ (list "\\.bz2$" "bunzip2")
(list "\\.Z$" "uncompress"
;; Optional conversion to gzip format.
'(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
\f
;; Does anyone use this? - lrd 6/29/93.
+;; Apparently people do use it. - lrd 12/22/97.
(defun dired-mark-sexp (predicate &optional unflag-p)
"Mark files for which PREDICATE returns non-nil.
With a prefix arg, unflag those files instead.
(setq mode (buffer-substring (point) (+ mode-len (point))))
(forward-char mode-len)
(setq nlink (read (current-buffer)))
- (setq uid (buffer-substring (point) (progn (forward-word 1) (point))))
+ ;; Karsten Wenger <kw@cis.uni-muenchen.de> fixed uid.
+ (setq uid (buffer-substring (+ (point) 1) (progn (forward-word 1) (point))))
(re-search-forward "\\(Jan\\|Feb\\|Mar\\|Apr\\|May\\|Jun\\|Jul\\|Aug\\|Sep\\|Oct\\|Nov\\|Dec\\)")
(goto-char (match-beginning 1))
(forward-char -1)
;; preference for looking backward when not directly on a symbol. Not
;; perfect - point must be in middle of or end of filename.
- (let ((filename-chars ".a-zA-Z0-9---_/:$+")
+ (let ((filename-chars ".a-zA-Z0-9---_/:$+@")
(bol (save-excursion (beginning-of-line) (point)))
(eol (save-excursion (end-of-line) (point)))
- start end filename)
+ start end filename prefix)
(save-excursion
;; First see if just past a filename.
(progn
(skip-chars-backward filename-chars)
(setq start (point))
+ (setq prefix
+ (and (string-match "^\\w+@"
+ (buffer-substring start eol))
+ "/"))
+ (goto-char start)
(if (string-match "[/~]" (char-to-string (preceding-char)))
(setq start (1- start)))
(skip-chars-forward filename-chars))
(error "No file found around point!"))
;; Return string.
- (expand-file-name (buffer-substring start (point))))))
+ (expand-file-name (concat prefix (buffer-substring start (point)))))))
(defun read-filename-at-point (prompt)
;;; Returns filename prompting with PROMPT with completion. If
HCoop / bpt / emacs.git / blobdiff