mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00
Code Issues Releases Activity
eb57ed8dd2
emacs/lisp/dired.el

4250 lines
170 KiB
EmacsLisp
Raw Normal View History

Let cconv use :fun-body in special forms that need it. * lisp/emacs-lisp/cconv.el (cconv-closure-convert): Drop `toplevel' arg. (cconv-closure-convert-toplevel): Remove. (cconv-lookup-let): New fun. (cconv-closure-convert-rec): Don't bother with defs-are-legal. Use :fun-body to handle special forms that require closing their forms. * lisp/emacs-lisp/bytecomp.el (byte-compile-file-form, byte-compile): Use cconv-closure-convert instead of cconv-closure-convert-toplevel. (byte-compile-lambda, byte-compile-make-closure): * lisp/emacs-lisp/byte-lexbind.el (byte-compile-maybe-push-heap-environment): Make sure cconv did its job. * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Check stack-depth before using it. * lisp/dired.el (dired-desktop-buffer-misc-data): Don't use a dynamic var as function argument.
2011-02-11 22:30:02 +00:00
;;; dired.el --- directory-browsing commands -*- lexical-binding: t -*-
*** empty log message ***
1992-07-21 22:40:10 +00:00
Update copyright year to 2019 Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
2019-01-01 00:59:58 +00:00
;; Copyright (C) 1985-1986, 1992-1997, 2000-2019 Free Software
Update copyright year to 2015 Run admin/update-copyright.
2015-01-01 22:26:41 +00:00
;; Foundation, Inc.
*** empty log message ***
1992-07-27 02:56:28 +00:00
(dired-listing-switches): Doc fix.
1994-02-06 18:11:59 +00:00
;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
Go back to "Maintainer: emacs-devel@gnu.org" Restore lines saying "Maintainer: emacs-devel@gnu.org" when there is no special maintainer for a file. Although this wasn't documented it was common practice and removing the lines didn't have consensus.
2019-05-25 20:43:06 +00:00
;; Maintainer: emacs-devel@gnu.org
Add Keywords header.
2001-08-29 15:02:01 +00:00
;; Keywords: files
Add "Package:" file headers to denote built-in packages.
2010-08-29 16:17:13 +00:00
;; Package: emacs
Initial revision
1992-05-30 23:52:26 +00:00
;; This file is part of GNU Emacs.
Switch to recommended form of GPLv3 permissions notice.
2008-05-06 08:06:51 +00:00
;; GNU Emacs is free software: you can redistribute it and/or modify
Initial revision
1992-05-30 23:52:26 +00:00
;; it under the terms of the GNU General Public License as published by
Switch to recommended form of GPLv3 permissions notice.
2008-05-06 08:06:51 +00:00
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
Initial revision
1992-05-30 23:52:26 +00:00
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
Prefer HTTPS to FTP and HTTP in documentation Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
2017-09-13 22:52:52 +00:00
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
Initial revision
1992-05-30 23:52:26 +00:00
*** empty log message ***
1992-07-21 22:40:10 +00:00
;;; Commentary:
Make some dired defvars into defcustoms. * lisp/dired.el (dired-subdir-switches, dired-chown-program) (dired-use-ls-dired, dired-chmod-program, dired-touch-program): Make into defcustoms. (dired-chown-program): Simplify initialization.
2010-12-14 04:32:14 +00:00
;; This is a major mode for directory browsing and editing.
;; It is documented in the Emacs manual.
Added or corrected Commentary sections
1993-03-22 03:27:18 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Rewritten in 1990/1991 to add tree features, file marking and
;; sorting by Sebastian Kremer <sk@thp.uni-koeln.de>.
;; Finished up by rms in 1992.
*** empty log message ***
1992-07-21 22:40:10 +00:00
;;; Code:
Fix bootstrap issue with dired-loaddefs * lisp/dired.el: Autoloads for secondary files loaded optionally.
2015-12-18 21:19:35 +00:00
Fix misalignment in Dired when dired-directory is a cons * lisp/dired.el (dired--need-align-p, dired--align-all-files): New defuns. (dired-internal-noselect): Call dired--align-all-files when dired-directory is a cons (Bug#27762). * test/lisp/dired-tests.el (dired-test-bug27762): Test should pass.
2017-08-01 15:01:45 +00:00
(eval-when-compile (require 'subr-x))
Fix bootstrap issue with dired-loaddefs * lisp/dired.el: Autoloads for secondary files loaded optionally.
2015-12-18 21:19:35 +00:00
;; When bootstrapping dired-loaddefs has not been generated.
(require 'dired-loaddefs nil t)
*** empty log message ***
1992-06-24 02:13:56 +00:00
lisp/*.el: Remove lexical-binding warnings; additional small cleanups. * calculator.el (calculator): Mark unused argument. (calculator-paste, calculator-quit, calculator-integer-p): Use ignore-errors. (calculator-string-to-number, calculator-decimal, calculator-exp) (calculator-op-or-exp): Use string-match-p. * dired-aux.el (dired-compress): Use ignore-errors. (dired-do-chxxx, dired-do-chmod, dired-trample-file-versions) (dired-do-async-shell-command, dired-do-shell-command) (dired-shell-stuff-it, dired-compress-file, dired-insert-subdir) (dired-insert-subdir-validate): Use string-match-p. (dired-map-dired-file-lines, dired-subdir-hidden-p): Use looking-at-p. (dired-add-entry): Use string-match-p, looking-at-p. (dired-insert-subdir-newpos): Remove unused local variable. * dired.el (dired-buffer-more-recently-used-p): Declare. (dired-insert-set-properties, dired-insert-old-subdirs): Use ignore-errors. * filenotify.el (file-notify-callback): Remove unused local variable. * filesets.el (filesets-error): Mark unused argument. (filesets-which-command-p, filesets-filter-dir-names) (filesets-directory-files, filesets-get-external-viewer) (filesets-ingroup-get-data): Use string-match-p. * find-file.el (ff-other-file-name, ff-other-file-name) (ff-find-the-other-file, ff-cc-hh-converter): Remove unused local variables. (ff-get-file-name): Use string-match-p. (ff-all-dirs-under): Use ignore-errors. * follow.el (follow-comint-scroll-to-bottom): Mark unused argument. (follow-select-if-visible): Remove unused local variable. * forms.el (read-file-filter): Move declaration. (forms--make-format, forms--make-parser, forms-insert-record): Quote function with #'. (forms--update): Use string-match-p. Quote function with #'. * help-mode.el (help-dir-local-var-def): Mark unused argument. (help-make-xrefs): Use looking-at-p. (help-xref-on-pp): Use looking-at-p, ignore-errors. * ibuffer.el (ibuffer-ext-visible-p): Declare. (ibuffer-confirm-operation-on): Use string-match-p. * msb.el (msb-item-handler, msb-dired-item-handler): Mark unused arguments. * ses.el (ses-decode-cell-symbol) (ses-kill-override): Remove unused local variable. (ses-create-cell-variable, ses-relocate-formula): Use string-match-p. (ses-load): Use ignore-errors, looking-at-p. (ses-jump-safe): Use ignore-errors. (ses-export-tsv, ses-export-tsf, ses-unsafe): Mark unused arguments. * tabify.el (untabify, tabify): Mark unused arguments. * thingatpt.el (thing-at-point--bounds-of-well-formed-url): Mark unused argument. (bounds-of-thing-at-point, thing-at-point-bounds-of-list-at-point) (thing-at-point-newsgroup-p, form-at-point): Use ignore-errors.
2013-08-10 15:17:29 +00:00
(declare-function dired-buffer-more-recently-used-p
"dired-x" (buffer1 buffer2))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;;; Customizable variables
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
(defgroup dired nil
"Directory editing."
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
:link '(custom-manual "(emacs)Dired")
(defgroup dired): Use `files' as parent. (dired-get-filename): Ignore handler if it has safe-magic prop.
2002-09-01 13:27:47 +00:00
:group 'files)
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
(defgroup dired-mark nil
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
"Handling marks in Dired."
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
:prefix "dired-"
:group 'dired)
Initial revision
1992-05-30 23:52:26 +00:00
;;;###autoload
* term/x-win.el (x-gtk-stock-map): * progmodes/vera-mode.el (auto-mode-alist): * progmodes/inf-lisp.el (inferior-lisp-filter-regexp) (inferior-lisp-program, inferior-lisp-load-command): * progmodes/hideshow.el (hs-special-modes-alist): * progmodes/gud.el (same-window-regexps): * progmodes/grep.el (grep-program, find-program, xargs-program): * net/telnet.el (same-window-regexps): * net/rlogin.el (same-window-regexps): * language/ethiopic.el (font-ccl-encoder-alist): * vc-sccs.el (vc-sccs-master-templates): * vc-rcs.el (vc-rcs-master-templates): * subr.el (cl-assertion-failed): * simple.el (next-error-overlay-arrow-position): * lpr.el (lpr-command): * locate.el (locate-ls-subdir-switches): * info.el (same-window-regexps, info) (Info-goto-emacs-command-node, Info-goto-emacs-key-command-node): * image-mode.el (image-mode, auto-mode-alist): * hippie-exp.el (hippie-expand-ignore-buffers): * format.el (format-alist): * find-dired.el (find-ls-subdir-switches, find-grep-options) (find-name-arg): * facemenu.el (facemenu-keybindings): * dired.el (dired-listing-switches, dired-chown-program): * diff.el (diff-switches, diff-command): * cus-edit.el (same-window-regexps): * bindings.el (mode-line-mule-info) (mode-line-buffer-identification): Purecopy strings.
2009-11-11 05:49:09 +00:00
(defcustom dired-listing-switches (purecopy "-al")
* align.el: * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-12-03 05:48:14 +00:00
"Switches passed to `ls' for Dired. MUST contain the `l' option.
*** empty log message ***
1992-06-24 02:13:56 +00:00
May contain all other options that don't contradict `-l';
(dired-listing-switches): Doc fix.
1994-02-06 18:11:59 +00:00
may contain even `F', `b', `i' and `s'. See also the variable
(dired-listing-switches): Mention in the doc string that some switches are not supported by ls-lisp.el
2001-11-20 09:38:55 +00:00
`dired-ls-F-marks-symlinks' concerning the `F' switch.
Support options with embedded whitespace in 'dired-listing-switches' * lisp/dired.el (dired-listing-switches): Document how to quote options with embedded whitespace. * lisp/files.el (insert-directory): Use split-string-and-unquote to support dired-listing-switches that specify command-line options with embedded spaces. (Bug#25485)
2017-02-04 10:02:55 +00:00
Options that include embedded whitespace must be quoted
Fix doc string of 'dired-listing-switches' * lisp/dired.el (dired-listing-switches): Fix the quoting example. (Bug#28569)
2017-09-23 14:23:35 +00:00
like this: \"--option=value with spaces\"; you can use
Support options with embedded whitespace in 'dired-listing-switches' * lisp/dired.el (dired-listing-switches): Document how to quote options with embedded whitespace. * lisp/files.el (insert-directory): Use split-string-and-unquote to support dired-listing-switches that specify command-line options with embedded spaces. (Bug#25485)
2017-02-04 10:02:55 +00:00
`combine-and-quote-strings' to produce the correct quoting of
each option.
(dired-listing-switches): Mention in the doc string that some switches are not supported by ls-lisp.el
2001-11-20 09:38:55 +00:00
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
(dired-listing-switches): Fix doc typo.
2007-01-27 23:17:19 +00:00
`insert-directory' in `ls-lisp.el' for more details."
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
:type 'string
:group 'dired)
Initial revision
1992-05-30 23:52:26 +00:00
Make some dired defvars into defcustoms. * lisp/dired.el (dired-subdir-switches, dired-chown-program) (dired-use-ls-dired, dired-chmod-program, dired-touch-program): Make into defcustoms. (dired-chown-program): Simplify initialization.
2010-12-14 04:32:14 +00:00
(defcustom dired-subdir-switches nil
(dired-subdir-switches, dired-switches-alist): New vars. (dired-insert-old-subdirs): Do not repeatedly delete and reinsert subdirs if -R switch is used for a subdir. (dired-mode): Set `dired-switches-alist'. (dired-build-subdir-alist): Only print number of directories in echo area when invoked interactively.
2004-06-06 02:22:41 +00:00
"If non-nil, switches passed to `ls' for inserting subdirectories.
Make some dired defvars into defcustoms. * lisp/dired.el (dired-subdir-switches, dired-chown-program) (dired-use-ls-dired, dired-chmod-program, dired-touch-program): Make into defcustoms. (dired-chown-program): Simplify initialization.
2010-12-14 04:32:14 +00:00
If nil, `dired-listing-switches' is used."
:group 'dired
:type '(choice (const :tag "Use dired-listing-switches" nil)
(string :tag "Switches")))
*** empty log message ***
1992-06-24 02:13:56 +00:00
Make some dired defvars into defcustoms. * lisp/dired.el (dired-subdir-switches, dired-chown-program) (dired-use-ls-dired, dired-chmod-program, dired-touch-program): Make into defcustoms. (dired-chown-program): Simplify initialization.
2010-12-14 04:32:14 +00:00
(defcustom dired-chown-program
(purecopy (cond ((executable-find "chown") "chown")
((file-executable-p "/usr/sbin/chown") "/usr/sbin/chown")
((file-executable-p "/etc/chown") "/etc/chown")
(t "chown")))
"Name of chown command (usually `chown')."
:group 'dired
:type 'file)
(defcustom dired-use-ls-dired 'unspecified
Small dired fixes related to bug#9039. * lisp/dired.el (dired-use-ls-dired): Doc fix. (dired-insert-directory): Give a message the first time if ls is found not to support --dired.
2011-07-13 17:34:31 +00:00
"Non-nil means Dired should pass the \"--dired\" option to \"ls\".
Improve Custom menu labels for 2 options * lisp/dired.el (dired-use-ls-dired): * lisp/progmodes/xref.el (xref-prompt-for-identifier): Improve the doc string and the defcustom menu/tags text. (Bug#32756)
2018-09-19 07:54:41 +00:00
If nil, don't pass \"--dired\" to \"ls\".
The special value of `unspecified' means to check whether \"ls\"
supports the \"--dired\" option, and save the result in this
variable. This is performed the first time `dired-insert-directory'
is invoked.
Small dired fixes related to bug#9039. * lisp/dired.el (dired-use-ls-dired): Doc fix. (dired-insert-directory): Give a message the first time if ls is found not to support --dired.
2011-07-13 17:34:31 +00:00
Note that if you set this option to nil, either through choice or
because your \"ls\" program does not support \"--dired\", Dired
will fail to parse some \"unusual\" file names, e.g. those with leading
spaces. You might want to install ls from GNU Coreutils, which does
support this option. Alternatively, you might want to use Emacs's
own emulation of \"ls\", by using:
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(setq ls-lisp-use-insert-directory-program nil)
Fix some more docstring etc. quoting problems Mostly these fixes prevent the transliteration of apostrophes that should stay apostrophes. Also, prefer curved quotes in Bahá’í proper names, as that’s the preferred Bahá’í style and these names are chock-full of non-ASCII characters anyway. * lisp/emacs-lisp/eieio-core.el (eieio-defclass-autoload) (eieio-defclass-internal): * lisp/emacs-lisp/eieio.el (defclass): * lisp/hi-lock.el (hi-lock-mode): Don’t transliterate Lisp apostrophes when generating a doc string or diagnostic. * lisp/international/mule-diag.el (list-coding-systems-1): * lisp/international/ogonek.el (ogonek-jak, ogonek-how): * lisp/mail/sendmail.el (sendmail-query-user-about-smtp): * lisp/vc/ediff-mult.el (ediff-redraw-registry-buffer): * lisp/vc/ediff-ptch.el (ediff-fixup-patch-map): Substitute quotes before putting them in the help buffer.
2015-09-03 22:31:12 +00:00
(require \\='ls-lisp)
Small dired fixes related to bug#9039. * lisp/dired.el (dired-use-ls-dired): Doc fix. (dired-insert-directory): Give a message the first time if ls is found not to support --dired.
2011-07-13 17:34:31 +00:00
This is used by default on MS Windows, which does not have an \"ls\" program.
Note that `ls-lisp' does not support as many options as GNU ls, though.
For more details, see Info node `(emacs)ls in Lisp'."
Make some dired defvars into defcustoms. * lisp/dired.el (dired-subdir-switches, dired-chown-program) (dired-use-ls-dired, dired-chmod-program, dired-touch-program): Make into defcustoms. (dired-chown-program): Simplify initialization.
2010-12-14 04:32:14 +00:00
:group 'dired
Improve Custom menu labels for 2 options * lisp/dired.el (dired-use-ls-dired): * lisp/progmodes/xref.el (xref-prompt-for-identifier): Improve the doc string and the defcustom menu/tags text. (Bug#32756)
2018-09-19 07:54:41 +00:00
:type '(choice (const :tag
"Use --dired only if 'ls' supports it" unspecified)
Make some dired defvars into defcustoms. * lisp/dired.el (dired-subdir-switches, dired-chown-program) (dired-use-ls-dired, dired-chmod-program, dired-touch-program): Make into defcustoms. (dired-chown-program): Simplify initialization.
2010-12-14 04:32:14 +00:00
(const :tag "Do not use --dired" nil)
Improve Custom menu labels for 2 options * lisp/dired.el (dired-use-ls-dired): * lisp/progmodes/xref.el (xref-prompt-for-identifier): Improve the doc string and the defcustom menu/tags text. (Bug#32756)
2018-09-19 07:54:41 +00:00
(other :tag "Always use --dired" t)))
Make some dired defvars into defcustoms. * lisp/dired.el (dired-subdir-switches, dired-chown-program) (dired-use-ls-dired, dired-chmod-program, dired-touch-program): Make into defcustoms. (dired-chown-program): Simplify initialization.
2010-12-14 04:32:14 +00:00
(defcustom dired-chmod-program "chmod"
"Name of chmod command (usually `chmod')."
:group 'dired
:type 'file)
(defcustom dired-touch-program "touch"
"Name of touch command (usually `touch')."
:group 'dired
:type 'file)
Add autoload for `dired-do-touch'. (dired-touch-program): New var. (dired-mode-map): Bind `dired-do-touch' to T and add menu-item. (dired-no-confirm): Add `touch' to docstring.
2004-03-31 16:29:46 +00:00
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
(defcustom dired-ls-F-marks-symlinks nil
* align.el: * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-12-03 05:48:14 +00:00
"Informs Dired about how `ls -lF' marks symbolic links.
(dired-ls-F-marks-symlinks): Doc fix.
1996-01-11 16:37:29 +00:00
Set this to t if `ls' (or whatever program is specified by
`insert-directory-program') with `-lF' marks the symbolic link
*** empty log message ***
1992-06-24 02:13:56 +00:00
itself with a trailing @ (usually the case under Ultrix).
Initial revision
1992-05-30 23:52:26 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
Example: if `ln -s foo bar; ls -F bar' gives `bar -> foo', set it to
nil (the default), if it gives `bar@ -> foo', set it to t.
Dired checks if there is really a @ appended. Thus, if you have a
marking `ls' program on one host and a non-marking on another host, and
don't care about symbolic links which really end in a @, you can
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
always set this variable to t."
:type 'boolean
:group 'dired-mark)
*** empty log message ***
1992-06-24 02:13:56 +00:00
* lisp/dired (dired-trivial-filenames): Use \` and \' to match string bounds
2017-07-31 05:55:47 +00:00
(defcustom dired-trivial-filenames (purecopy "\\`\\.\\.?\\'\\|\\`#")
* align.el: * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-12-03 05:48:14 +00:00
"Regexp of files to skip when finding first file of a directory.
*** empty log message ***
1992-06-24 02:13:56 +00:00
A value of nil means move to the subdir line.
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
A value of t means move to first file."
:type '(choice (const :tag "Move to subdir" nil)
(const :tag "Move to first" t)
regexp)
:group 'dired)
*** empty log message ***
1992-06-24 02:13:56 +00:00
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
(defcustom dired-keep-marker-rename t
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Use t as default so that moved files "take their markers with them".
* align.el: * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-12-03 05:48:14 +00:00
"Controls marking of renamed files.
*** empty log message ***
1992-06-24 02:13:56 +00:00
If t, files keep their previous marks when they are renamed.
If a character, renamed files (whether previously marked or not)
* lisp/wdired.el (wdired-keep-marker-rename): New defcustom. (wdired-do-renames): Use it instead of `dired-keep-marker-rename'. * lisp/dired.el (dired-keep-marker-rename): Add reference to `wdired-keep-marker-rename' in the docstring. Add default character value ?R to display initially in Customization UI instead of ?@. Fixes: debbugs:11795
2012-10-27 09:17:14 +00:00
are afterward marked with that character.
This option affects only files renamed by `dired-do-rename' and
`dired-do-rename-regexp'. See `wdired-keep-marker-rename'
if you want to do the same for files renamed in WDired mode."
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
:type '(choice (const :tag "Keep" t)
* lisp/wdired.el (wdired-keep-marker-rename): New defcustom. (wdired-do-renames): Use it instead of `dired-keep-marker-rename'. * lisp/dired.el (dired-keep-marker-rename): Add reference to `wdired-keep-marker-rename' in the docstring. Add default character value ?R to display initially in Customization UI instead of ?@. Fixes: debbugs:11795
2012-10-27 09:17:14 +00:00
(character :tag "Mark" :value ?R))
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
:group 'dired-mark)
*** empty log message ***
1992-06-24 02:13:56 +00:00
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
(defcustom dired-keep-marker-copy ?C
* align.el: * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-12-03 05:48:14 +00:00
"Controls marking of copied files.
*** empty log message ***
1992-06-24 02:13:56 +00:00
If t, copied files are marked if and as the corresponding original files were.
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
If a character, copied files are unconditionally marked with that character."
:type '(choice (const :tag "Keep" t)
(character :tag "Mark"))
:group 'dired-mark)
*** empty log message ***
1992-06-24 02:13:56 +00:00
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
(defcustom dired-keep-marker-hardlink ?H
* align.el: * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-12-03 05:48:14 +00:00
"Controls marking of newly made hard links.
*** empty log message ***
1992-06-24 02:13:56 +00:00
If t, they are marked if and as the files linked to were marked.
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
If a character, new links are unconditionally marked with that character."
:type '(choice (const :tag "Keep" t)
(character :tag "Mark"))
:group 'dired-mark)
*** empty log message ***
1992-06-24 02:13:56 +00:00
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
(defcustom dired-keep-marker-symlink ?Y
* align.el: * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-12-03 05:48:14 +00:00
"Controls marking of newly made symbolic links.
*** empty log message ***
1992-06-24 02:13:56 +00:00
If t, they are marked if and as the files linked to were marked.
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
If a character, new links are unconditionally marked with that character."
:type '(choice (const :tag "Keep" t)
(character :tag "Mark"))
:group 'dired-mark)
*** empty log message ***
1992-06-24 02:13:56 +00:00
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
(defcustom dired-dwim-target nil
* align.el: * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-12-03 05:48:14 +00:00
"If non-nil, Dired tries to guess a default target directory.
Misc doc fixes for Dired. * dired-aux.el (dired-do-create-files): Doc fix (Bug#11327). (dired-create-files): Doc fix (Bug#11329). (dired-do-copy): Doc fix (Bug#11334). (dired-mark-read-string): Doc fix (Bug#11553). * dired.el (dired-recursive-copies, dired-recursive-deletes): Doc fix (Bug#11326). (dired-make-relative): Doc fix (Bug#11332). Remove unused arg. (dired-dwim-target): Doc fix. * wdired.el (wdired-mode): Doc fix.
2012-06-22 07:30:33 +00:00
This means: if there is a Dired buffer displayed in the next
window, use its current directory, instead of this Dired buffer's
current directory.
*** empty log message ***
1992-06-24 02:13:56 +00:00
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
The target is used in the prompt for file copy, rename etc."
:type 'boolean
:group 'dired)
*** empty log message ***
1992-06-24 02:13:56 +00:00
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
(defcustom dired-copy-preserve-time t
* align.el: * allout.el: * apropos.el: * arc-mode.el: * autoinsert.el: * avoid.el: * battery.el: * bookmark.el: * buff-menu.el: * calculator.el: * chistory.el: * cmuscheme.el: * comint.el: * compare-w.el: * dabbrev.el: * delim-col.el: * desktop.el: * diff-mode.el: * diff.el: * dired-aux.el: * dired-x.el: * dired.el: * dos-vars.el: * ediff-diff.el: * ediff-help.el: * ediff-init.el: * ediff-merg.el: * ediff-mult.el: * ediff-ptch.el: * ediff-vers.el: * ediff-wind.el: * ediff.el: * emerge.el: * facemenu.el: * faces.el: * ffap.el: * filecache.el: * find-dired.el: * font-core.el: * font-lock.el: * forms.el: * fringe.el: * help-at-pt.el: * hippie-exp.el: * ido.el: * image-file.el: * imenu.el: * indent.el: * info.el: * isearchb.el: * iswitchb.el: * jit-lock.el: * jka-compr.el: * log-edit.el: * lpr.el: * ls-lisp.el: * man.el: * menu-bar.el: * midnight.el: * mouse-sel.el: * mouse.el: * msb.el: * outline.el: * paren.el: * pcmpl-cvs.el: * pcmpl-gnu.el: * pcomplete.el: * pcvs-info.el: * pcvs-parse.el: * printing.el: * ps-mule.el: * ps-print.el: * replace.el: * ruler-mode.el: * saveplace.el: * sb-image.el: * scroll-bar.el: * sha1.el: * shadowfile.el: * shell.el: * sort.el: * speedbar.el: * strokes.el: * tempo.el: * term.el: * terminal.el: * time-stamp.el: * time.el: * tree-widget.el: * type-break.el: * vc-cvs.el: * vc-hg.el: * vc-mcvs.el: * vc-rcs.el: * vc-sccs.el: * vc.el: * view.el: * w32-vars.el: * whitespace.el: * wid-edit.el: Remove leading * from docstrings of defcustoms, deffaces, defconsts and defuns.
2008-12-03 05:48:14 +00:00
"If non-nil, Dired preserves the last-modified time in a file copy.
Use defgroup and defcustom.
1997-05-25 18:08:23 +00:00
\(This works on only some systems.)"
:type 'boolean
:group 'dired)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-free-space-program, dired-free-space-args): Aliases for back-compatibility.
2001-12-21 19:38:25 +00:00
; These variables were deleted and the replacements are on files.el.
; We leave aliases behind for back-compatibility.
Port file-system-info to non-Microsoft * admin/merge-gnulib (GNULIB_MODULES): Add fsusage. * doc/emacs/files.texi (Directories): Remove documentation of now-obsolete directory-free-space-program and directory-free-space-args. * etc/NEWS: Mention change. * etc/PROBLEMS: Slow df is no longer a problem. * lib/fsusage.c, lib/fsusage.h, m4/fsusage.m4: New files, copied from Gnulib. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lisp/dired.el (dired-free-space-program) (dired-free-space-args): These aliases are now obsolete. * lisp/files.el (directory-free-space-program) (directory-free-space-args): Now obsolete. (get-free-disk-space): Just call file-system-info instead of the now-obsolete directory-free-space-program. * nt/gnulib-cfg.mk (OMIT_GNULIB_MODULE_fsusage): New macro. * src/fileio.c: Include fsusage.h. (blocks_to_bytes, Ffile_system_info) [!DOS_NT]: New functions. (syms_of_fileio) [!DOS_NT]: Defsubr file-system-info.
2017-10-02 05:31:39 +00:00
(define-obsolete-variable-alias 'dired-free-space-program
'directory-free-space-program "27.1")
(define-obsolete-variable-alias 'dired-free-space-args
'directory-free-space-args "27.1")
(dired-free-space-program, dired-free-space-args): Aliases for back-compatibility.
2001-12-21 19:38:25 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;;; Hook variables
(dired-load-hook, dired-mode-hook) (dired-before-readin-hook, dired-after-readin-hook): Defcustom.
2002-02-04 19:40:08 +00:00
(defcustom dired-load-hook nil
(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.
2005-07-20 14:08:39 +00:00
"Run after loading Dired.
(dired-load-hook, dired-mode-hook) (dired-before-readin-hook, dired-after-readin-hook): Defcustom.
2002-02-04 19:40:08 +00:00
You can customize key bindings or load extensions with this."
:group 'dired
:type 'hook)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-load-hook, dired-mode-hook) (dired-before-readin-hook, dired-after-readin-hook): Defcustom.
2002-02-04 19:40:08 +00:00
(defcustom dired-mode-hook nil
(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.
2005-07-20 14:08:39 +00:00
"Run at the very end of `dired-mode'."
(dired-load-hook, dired-mode-hook) (dired-before-readin-hook, dired-after-readin-hook): Defcustom.
2002-02-04 19:40:08 +00:00
:group 'dired
:type 'hook)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-load-hook, dired-mode-hook) (dired-before-readin-hook, dired-after-readin-hook): Defcustom.
2002-02-04 19:40:08 +00:00
(defcustom dired-before-readin-hook nil
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"This hook is run before a Dired buffer is read in (created or reverted)."
(dired-load-hook, dired-mode-hook) (dired-before-readin-hook, dired-after-readin-hook): Defcustom.
2002-02-04 19:40:08 +00:00
:group 'dired
:type 'hook)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-load-hook, dired-mode-hook) (dired-before-readin-hook, dired-after-readin-hook): Defcustom.
2002-02-04 19:40:08 +00:00
(defcustom dired-after-readin-hook nil
*** empty log message ***
1992-06-24 02:13:56 +00:00
"Hook run after each time a file or directory is read by Dired.
After each listing of a file or directory, this hook is run
(dired-load-hook, dired-mode-hook) (dired-before-readin-hook, dired-after-readin-hook): Defcustom.
2002-02-04 19:40:08 +00:00
with the buffer narrowed to the listing."
:group 'dired
:type 'hook)
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Note this can't simply be run inside function `dired-ls' as the hook
;; functions probably depend on the dired-subdir-alist to be OK.
* lisp/saveplace.el (save-place-to-alist): Add `dired-filename' as a position when `dired-directory' is non-nil. Check integer positions with `integerp'. (toggle-save-place, save-places-to-alist): Add check for `dired-directory'. (save-place-find-file-hook): Check integer positions with `integerp'. (save-place-dired-hook): Use `dired-goto-file' when `dired-filename' is found in the assoc list. Check integer positions with `integerp'. (dired-initial-position-hook): Rename from `dired-initial-point-hook'. * lisp/dired.el (dired-initial-position-hook): Rename back from `dired-initial-point-hook'. (dired-initial-position): Rename `dired-initial-point-hook' to `dired-initial-position-hook'. (dired-file-name-at-point): Doc fix. Fixes: debbugs:15329
2013-12-20 20:20:39 +00:00
(defcustom dired-initial-position-hook nil
Add support for dired in saveplace.
2013-06-14 09:32:01 +00:00
"This hook is used to position the point.
Minor fixes for dired.el doc strings. lisp/dired.el (dired-initial-position-hook, dired-initial-position): Doc string fixes.
2014-04-30 16:59:03 +00:00
It is run by the function `dired-initial-position'."
Add support for dired in saveplace.
2013-06-14 09:32:01 +00:00
:group 'dired
:type 'hook
:version "24.4")
* dnd.el (dnd-protocol-alist): Improve custom type. * dired.el (dired-dnd-protocol-alist): New variable. (dired-mode): Use `dired-dnd-protocol-alist'. Move call of `dired-mode-hook' to the end.
2005-05-11 19:32:51 +00:00
(defcustom dired-dnd-protocol-alist
'(("^file:///" . dired-dnd-handle-local-file)
("^file://" . dired-dnd-handle-file)
("^file:" . dired-dnd-handle-local-file))
"The functions to call when a drop in `dired-mode' is made.
See `dnd-protocol-alist' for more information. When nil, behave
(dired-dnd-protocol-alist): Fix typo.
2006-04-03 17:53:24 +00:00
as in other buffers. Changing this option is effective only for
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
new Dired buffers."
* dnd.el (dnd-protocol-alist): Improve custom type. * dired.el (dired-dnd-protocol-alist): New variable. (dired-mode): Use `dired-dnd-protocol-alist'. Move call of `dired-mode-hook' to the end.
2005-05-11 19:32:51 +00:00
:type '(choice (repeat (cons (regexp) (function)))
(const :tag "Behave as in other buffers" nil))
:version "22.1"
:group 'dired)
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
(defcustom dired-hide-details-hide-symlink-targets t
Small doc updates for CUA and dired * doc/emacs/dired.texi (Misc Dired Features): Copyedits for hide-details. * lisp/dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines) (dired-hide-details-mode): Doc fixes. * lisp/emulation/cua-base.el (cua-mode): Doc fix. * etc/NEWS: Related edits. * lisp/ChangeLog: Comment changes do not need ChangeLog entries.
2014-01-27 21:26:48 +00:00
"Non-nil means `dired-hide-details-mode' hides symbolic link targets."
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
:type 'boolean
:version "24.4"
:group 'dired)
(defcustom dired-hide-details-hide-information-lines t
Small doc updates for CUA and dired * doc/emacs/dired.texi (Misc Dired Features): Copyedits for hide-details. * lisp/dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines) (dired-hide-details-mode): Doc fixes. * lisp/emulation/cua-base.el (cua-mode): Doc fix. * etc/NEWS: Related edits. * lisp/ChangeLog: Comment changes do not need ChangeLog entries.
2014-01-27 21:26:48 +00:00
"Non-nil means `dired-hide-details-mode' hides all but header and file lines."
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
:type 'boolean
:version "24.4"
:group 'dired)
Dired always read file system * dired.el (dired-always-read-filesystem): Add new option. (dired-mark-files-containing-regexp): Use it (Bug#22694). * doc/emacs/dired.texi: Mention it in the manual. * test/lisp/dired-tests.el (dired-test-bug22694): Add test. ;* etc/NEWS: Add entry for this change.
2016-07-11 05:34:49 +00:00
(defcustom dired-always-read-filesystem nil
"Non-nil means revert buffers visiting files before searching them.
By default, commands like `dired-mark-files-containing-regexp' will
search any buffers visiting the marked files without reverting them,
even if they were changed on disk. When this option is non-nil, such
buffers are always reverted in a temporary buffer before searching
them: the search is performed on the temporary buffer, the original
buffer visiting the file is not modified."
:type 'boolean
Update parameter :version to 26.1 in several defcustom Following defcustom where added or modified for 25.2 release. In fact all these changes belong to 26.1 release. * lisp/battery.el (battery-linux-sysfs-regexp) * lisp/comint.el (comint-password-prompt-regexp) * lisp/dired.el (dired-always-read-filesystem) * lisp/image.el (image-scaling-factor) * lisp/ibuf-ext.el (ibuffer-never-search-content-name) (ibuffer-never-search-content-mode) * lisp/mouse.el (mouse-select-region-move-to-beginning) * lisp/net/net-utils.el (iwconfig-program, iwconfig-program-options) (netstat-program, route-program, route-program-options) * lisp/net/sieve-manage.el (sieve-manage-default-stream) * lisp/progmodes/grep.el (grep-save-buffers) * lisp/vc/add-log.el (change-log-directory-files) * lisp/url/url-vars.el (url-user-agent) * lisp/vc/vc-hg.el (vc-hg-symbolic-revision-styles) (vc-hg-use-file-version-for-mode-line-version) (vc-hg-parse-hg-data-structures) * lisp/wdired.el (wdired-create-parent-directories) * lisp/faces.el (homoglyph, nobreak-hyphen, read-multiple-choice-face) * lisp/gnus/gnus-art.el (gnus-article-encrypt-protocol) (gnus-button-url-regexp) * lisp/window.el (switch-to-buffer-preserve-window-point) * lisp/ibuffer.el (ibuffer-formats, ibuffer-locked-char) (ibuffer-locked-buffer) * lisp/textmodes/flyspell.el (flyspell-sort-corrections-function) * lisp/emacs-lisp/edebug.el (edebug-sit-on-break) * lisp/gnus/message.el (message-user-fqdn) * lisp/simple.el (shell-command-dont-erase-buffer) (extended-command-suggest-shorter) * lisp/net/shr.el (shr-use-fonts) * lisp/files.el (mounted-file-systems, kill-emacs-query-functions)
2016-11-16 15:39:43 +00:00
:version "26.1"
Dired always read file system * dired.el (dired-always-read-filesystem): Add new option. (dired-mark-files-containing-regexp): Use it (Bug#22694). * doc/emacs/dired.texi: Mention it in the manual. * test/lisp/dired-tests.el (dired-test-bug22694): Add test. ;* etc/NEWS: Add entry for this change.
2016-07-11 05:34:49 +00:00
:group 'dired)
(dired-font-lock-keywords): Use regexp-opt. (dired-move-to-filename): Better message when we fail to find the file. (dired-sort-toggle): Minor optimization.
2002-09-16 17:13:16 +00:00
;; Internal variables
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defvar dired-marker-char ?* ; the answer is 42
;; so that you can write things like
;; (let ((dired-marker-char ?X))
;; ;; great code using X markers ...
;; )
;; For example, commands operating on two sets of files, A and B.
;; Or marking files with digits 0-9. This could implicate
;; concentric sets or an order for the marked files.
;; The code depends on dynamic scoping on the marker char.
"In Dired, the current mark character.
(dired-marker-char): Avoid quotations for `do' and `mark' to not create links to unrelated functions in the Help buffer.
2005-07-09 20:44:05 +00:00
This is what the do-commands look for, and what the mark-commands store.")
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defvar dired-del-marker ?D
"Character used to flag files for deletion.")
(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.
2005-07-20 14:08:39 +00:00
(defvar dired-shrink-to-fit t
*** empty log message ***
1992-07-27 02:56:28 +00:00
;; I see no reason ever to make this nil -- rms.
;; (> baud-rate search-slow-speed)
*** empty log message ***
1992-06-24 02:13:56 +00:00
"Non-nil means Dired shrinks the display buffer to fit the marked files.")
* lisp/dired.el (dired-shrink-to-fit): Declare obsolete. (dired-pop-to-buffer): Declare obsolete. (dired-mark-pop-up): Doc fix. Fixes: debbugs:1806
2012-10-04 18:30:08 +00:00
(make-obsolete-variable 'dired-shrink-to-fit
"use the Customization interface to add a new rule
to `display-buffer-alist' where condition regexp is \"^ \\*Marked Files\\*$\",
action argument symbol is `window-height' and its value is nil." "24.3")
*** empty log message ***
1992-06-24 02:13:56 +00:00
*** empty log message ***
1992-07-27 02:56:28 +00:00
(defvar dired-file-version-alist)
(dired-directory): Add autoload cookie.
2003-02-13 19:34:17 +00:00
;;;###autoload
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defvar dired-directory nil
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"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
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
directory name and the cdr is the list of files to mention.
The directory name must be absolute, but need not be fully expanded.")
*** empty log message ***
1992-06-24 02:13:56 +00:00
Give dired-actual-switches a safe-local-variable property. (Bug#3230) * lisp/dired.el (dired-safe-switches-p): Beef it up. (dired-actual-switches): Use it for the safe-local-variable property.
2011-03-01 03:25:24 +00:00
;; Beware of "-l;reboot" etc. See bug#3230.
* lisp/dired.el (dired-safe-switches-p): New function. (Bug#3230)
2011-03-01 03:10:11 +00:00
(defun dired-safe-switches-p (switches)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Return non-nil if string SWITCHES does not look risky for Dired."
Give dired-actual-switches a safe-local-variable property. (Bug#3230) * lisp/dired.el (dired-safe-switches-p): Beef it up. (dired-actual-switches): Use it for the safe-local-variable property.
2011-03-01 03:25:24 +00:00
(or (not switches)
(and (stringp switches)
(< (length switches) 100) ; arbitrary
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(string-match-p "\\` *-[- [:alnum:]]+\\'" switches))))
* lisp/dired.el (dired-safe-switches-p): New function. (Bug#3230)
2011-03-01 03:10:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defvar dired-actual-switches nil
"The value of `dired-listing-switches' used to make this buffer's text.")
Give dired-actual-switches a safe-local-variable property. (Bug#3230) * lisp/dired.el (dired-safe-switches-p): Beef it up. (dired-actual-switches): Use it for the safe-local-variable property.
2011-03-01 03:25:24 +00:00
(put 'dired-actual-switches 'safe-local-variable 'dired-safe-switches-p)
Fix regular-expression glitches and typos Problems reported by Mattias Engdegård in: https://lists.gnu.org/r/emacs-devel/2019-03/msg00085.html * admin/admin.el (set-version): * lisp/allout.el (allout-latexify-one-item): * lisp/arc-mode.el (archive-arc-rename-entry) (archive-rar-summarize): * lisp/calc/calc-graph.el (calc-graph-set-styles) (calc-graph-hide): * lisp/calc/calc-help.el (calc-describe-key): * lisp/calc/calc-lang.el (math-compose-tex-func, eqn): * lisp/calc/calc.el (calcDigit-key): * lisp/cedet/ede/makefile-edit.el (makefile-macro-file-list): * lisp/cedet/ede/speedbar.el (ede-tag-expand): * lisp/cedet/semantic/sb.el (semantic-sb-show-extra) (semantic-sb-expand-group): * lisp/comint.el (comint-substitute-in-file-name): * lisp/dired.el (dired-actual-switches): * lisp/emacs-lisp/chart.el (chart-rmail-from): * lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand): * lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand): * lisp/emacs-lisp/rx.el (rx-not, rx-atomic-p): * lisp/emulation/viper-ex.el (viper-get-ex-token) (viper-get-ex-pat, ex-set-read-variable): * lisp/epg.el (epg--status-SIG_CREATED): * lisp/erc/erc-speedbar.el (erc-speedbar-expand-user): (erc-speedbar-expand-channel, erc-speedbar-expand-server) * lisp/erc/erc.el (erc-is-message-ctcp-and-not-action-p) (erc-banlist-update): * lisp/eshell/em-dirs.el (eshell-parse-drive-letter, eshell/pwd): * lisp/find-dired.el (find-dired): * lisp/frame.el (frame-set-background-mode): * lisp/generic-x.el (apache-log-generic-mode): * lisp/gnus/gnus-art.el (gnus-button-valid-localpart-regexp): * lisp/gnus/gnus.el (gnus-short-group-name): * lisp/gnus/message.el (message-mailer-swallows-blank-line): * lisp/ibuffer.el (ibuffer-fontification-alist): * lisp/ido.el (ido-set-matches-1): * lisp/info-xref.el (info-xref-lock-file-p): * lisp/info.el (Info-dir-remove-duplicates) (Info-unescape-quotes, Info-split-parameter-string) (Info-speedbar-expand-node): * lisp/international/mule.el (sgml-html-meta-auto-coding-function): * lisp/isearch.el (isearch-pre-command-hook): * lisp/language/ethio-util.el (ethio-fidel-to-tex-buffer): * lisp/mail/rmail.el (rmail-collect-deleted): * lisp/mh-e/mh-alias.el (mh-alias-suggest-alias): * lisp/mh-e/mh-comp.el (mh-forward): * lisp/mh-e/mh-search.el (mh-index-next-folder) (mh-index-create-imenu-index): * lisp/mh-e/mh-xface.el (mh-picon-get-image): * lisp/minibuffer.el (completion--embedded-envvar-re): * lisp/net/ange-ftp.el (ange-ftp-ls-parser): * lisp/net/goto-addr.el (goto-address-mail-regexp) (goto-address-find-address-at-point): * lisp/net/pop3.el (pop3-read-response, pop3-user) (pop3-pass, pop3-apop): * lisp/net/tramp.el (tramp-ipv6-regexp) (tramp-replace-environment-variables): * lisp/nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set): * lisp/nxml/rng-uri.el (rng-uri-escape-multibyte): * lisp/nxml/rng-xsd.el (rng-xsd-convert-any-uri): * lisp/obsolete/pgg.el (pgg-fetch-key): * lisp/obsolete/vip.el (vip-get-ex-token): * lisp/org/ob-core.el (org-babel-string-read): * lisp/org/org-agenda.el: (org-agenda-add-entry-to-org-agenda-diary-file): * lisp/org/org-element.el (org-element-keyword-parser): * lisp/org/org-list.el (org-list-indent-item-generic): * lisp/org/org-mhe.el (org-mhe-get-message-folder-from-index): * lisp/org/org-mobile.el (org-mobile-apply): * lisp/org/org-mouse.el (org-mouse-context-menu): * lisp/org/org-plot.el (org-plot/gnuplot): * lisp/org/org-protocol.el (org-protocol-flatten-greedy): * lisp/org/org-table.el (org-table-copy-down) (org-table-formula-make-cmp-string) (org-table-get-stored-formulas, org-table-recalculate) (org-table-edit-formulas): * lisp/org/org.el (org-translate-link-from-planner) (org-fill-line-break-nobreak-p): * lisp/org/ox-ascii.el (org-ascii-item): * lisp/org/ox-latex.el (org-latex-clean-invalid-line-breaks): * lisp/org/ox.el (org-export-expand-include-keyword): * lisp/progmodes/ada-xref.el (ada-treat-cmd-string): * lisp/progmodes/cfengine.el (cfengine2-font-lock-keywords): * lisp/progmodes/cperl-mode.el (cperl-to-comment-or-eol) (cperl-find-pods-heres, cperl-fix-line-spacing) (cperl-have-help-regexp, cperl-word-at-point-hard) (cperl-make-regexp-x): * lisp/progmodes/dcl-mode.el (dcl-option-value-offset): * lisp/progmodes/etags.el (tag-implicit-name-match-p): * lisp/progmodes/fortran.el (fortran-fill): * lisp/progmodes/gdb-mi.el (gdb-speedbar-expand-node) (gdb-locals-handler-custom): * lisp/progmodes/grep.el (grep-mode-font-lock-keywords): * lisp/progmodes/gud.el (gud-jdb-find-source-using-classpath): * lisp/progmodes/js.el (js--continued-expression-p): * lisp/progmodes/m4-mode.el (m4-font-lock-keywords): * lisp/progmodes/meta-mode.el (meta-indent-level-count): * lisp/progmodes/mixal-mode.el (mixal-font-lock-keywords): * lisp/progmodes/opascal.el (opascal-find-unit-in-directory): * lisp/progmodes/pascal.el (pascal-progbeg-re): * lisp/progmodes/ruby-mode.el (ruby-expression-expansion-re) (ruby-expr-beg, ruby-parse-partial) (ruby-toggle-string-quotes, ruby-font-lock-keywords): * lisp/progmodes/sql.el (sql--make-help-docstring): * lisp/progmodes/verilog-mode.el (verilog-coverpoint-re) (verilog-skip-forward-comment-p) (verilog-read-sub-decls-gate) (verilog-read-auto-template-middle): * lisp/progmodes/vhdl-mode.el (vhdl-resolve-env-variable) (vhdl-speedbar-expand-project, vhdl-speedbar-expand-entity) (vhdl-speedbar-expand-architecture) (vhdl-speedbar-expand-config, vhdl-speedbar-expand-package) (vhdl-speedbar-dired): * lisp/speedbar.el (speedbar-dired, speedbar-tag-file) (speedbar-tag-expand): * lisp/textmodes/dns-mode.el (dns-mode-font-lock-keywords): * lisp/textmodes/flyspell.el (flyspell-debug-signal-word-checked): * lisp/textmodes/ispell.el (ispell-process-line): * lisp/textmodes/reftex-cite.el (reftex-end-of-bib-entry): * lisp/textmodes/reftex-ref.el (reftex-replace-prefix-escapes): * lisp/url/url-parse.el (url-generic-parse-url): * lisp/url/url-util.el (url-truncate-url-for-viewing): * lisp/vc/diff-mode.el (diff-unified->context): * lisp/vc/vc-bzr.el (vc-bzr-error-regexp-alist): * lisp/vc/vc-cvs.el (vc-cvs-parse-status): * lisp/woman.el (woman0-el, woman-if-ignore) (woman-change-fonts): * lisp/xdg.el (xdg--substitute-home-env): Fix regular-expression infelicities and typos. Fix regular expression typos Fix typos reported by Mattias Engdegård in: that occurred in preloaded modules. * lisp/frame.el (frame-set-background-mode): * lisp/international/mule.el (sgml-html-meta-auto-coding-function): * lisp/isearch.el (isearch-pre-command-hook): * lisp/minibuffer.el (completion--embedded-envvar-re):
2019-03-05 02:00:00 +00:00
(defvar dired-re-inode-size "[0-9 \t]*[.,0-9]*[BkKMGTPEZY]?[ \t]*"
*** empty log message ***
1992-06-24 02:13:56 +00:00
"Regexp for optional initial inode and file size as made by `ls -i -s'.")
;; These regexps must be tested at beginning-of-line, but are also
;; used to search for next matches, so neither omitting "^" nor
;; replacing "^" by "\n" (to make it slightly faster) will work.
(defvar dired-re-mark "^[^ \n]")
;; "Regexp matching a marked line.
;; Important: the match ends just after the marker."
(defvar dired-re-maybe-mark "^. ")
(dired-re-dir, dired-re-sym): Don't match DOS drive letters with a colon after d or l.
1999-09-06 11:22:43 +00:00
;; The [^:] part after "d" and "l" is to avoid confusion with the
;; DOS/Windows-style drive letters in directory names, like in "d:/foo".
(defvar dired-re-dir (concat dired-re-maybe-mark dired-re-inode-size "d[^:]"))
(defvar dired-re-sym (concat dired-re-maybe-mark dired-re-inode-size "l[^:]"))
* lisp/dired.el (dired-special): Rename face from dired-socket (bug#24547). (dired-re-special): Rename from dired-re-socket.
2019-08-05 20:56:36 +00:00
(defvar dired-re-special (concat dired-re-maybe-mark dired-re-inode-size
"[bcsp][^:]"))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defvar dired-re-exe;; match ls permission string of an executable file
Don't quote lambda forms * lisp/dired.el (dired-re-maybe-mark, dired-map-over-marks) (dired-mark, dired-desktop-buffer-misc-data) * lisp/dired-aux.el (dired-do-create-files, dired-do-create-files-regexp) (dired-create-files-non-directory, dired-insert-subdir-validate) (dired-alist-sort, dired-do-shell-command): Don't quote lambda forms.
2017-06-26 05:22:27 +00:00
(mapconcat (lambda (x)
(concat dired-re-maybe-mark dired-re-inode-size x))
*** empty log message ***
1992-06-24 02:13:56 +00:00
'("-[-r][-w][xs][-r][-w].[-r][-w]."
"-[-r][-w].[-r][-w][xs][-r][-w]."
"-[-r][-w].[-r][-w].[-r][-w][xst]")
"\\|"))
(dired-re-perms): Accept various file type letters.
1994-09-26 23:18:19 +00:00
(defvar dired-re-perms "[-bcdlps][-r][-w].[-r][-w].[-r][-w].")
(dired-re-dot): Make it handle trailing /. (dired-get-filename): Update documentation string. Revert previous change and fix typo in earlier version.
2003-06-10 04:03:03 +00:00
(defvar dired-re-dot "^.* \\.\\.?/?$")
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-subdir-switches, dired-switches-alist): New vars. (dired-insert-old-subdirs): Do not repeatedly delete and reinsert subdirs if -R switch is used for a subdir. (dired-mode): Set `dired-switches-alist'. (dired-build-subdir-alist): Only print number of directories in echo area when invoked interactively.
2004-06-06 02:22:41 +00:00
;; The subdirectory names in the next two lists are expanded.
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defvar dired-subdir-alist nil
"Association list of subdirectories and their buffer positions.
Each subdirectory has an element: (DIRNAME . STARTMARKER).
entered into RCS
1992-09-19 19:40:38 +00:00
The order of elements is the reverse of the order in the buffer.
In simple cases, this list contains one element.")
*** empty log message ***
1992-06-24 02:13:56 +00:00
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(defvar-local dired-switches-alist nil
(dired-subdir-switches, dired-switches-alist): New vars. (dired-insert-old-subdirs): Do not repeatedly delete and reinsert subdirs if -R switch is used for a subdir. (dired-mode): Set `dired-switches-alist'. (dired-build-subdir-alist): Only print number of directories in echo area when invoked interactively.
2004-06-06 02:22:41 +00:00
"Keeps track of which switches to use for inserted subdirectories.
This is an alist of the form (SUBDIR . SWITCHES).")
(dired-move-to-filename-regexp): Define as alias. (dired-no-confirm): Use defcustom. (dired-subdir-alist-pre-R): Put defvar at top level.
2006-01-19 17:50:15 +00:00
(defvaralias 'dired-move-to-filename-regexp
'directory-listing-before-filename-regexp)
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(defvar dired-subdir-regexp "^. \\(.+\\)\\(:\\)\n"
*** empty log message ***
1992-06-24 02:13:56 +00:00
"Regexp matching a maybe hidden subdirectory line in `ls -lR' output.
Subexpression 1 is the subdirectory proper, no trailing colon.
The match starts at the beginning of the line and ends after the end
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
of the line.
Subexpression 2 must end right before the \\n.")
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defgroup dired-faces nil
(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.
2005-07-20 14:08:39 +00:00
"Faces used by Dired."
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
:group 'dired
:group 'faces)
(defface dired-header
'((t (:inherit font-lock-type-face)))
"Face used for directory headers."
:group 'dired-faces
Change release version from 21.4 to 22.1 throughout. Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
:version "22.1")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defvar dired-header-face 'dired-header
"Face name used for directory headers.")
(defface dired-mark
'((t (:inherit font-lock-constant-face)))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Face used for Dired marks."
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
:group 'dired-faces
Change release version from 21.4 to 22.1 throughout. Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
:version "22.1")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defvar dired-mark-face 'dired-mark
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Face name used for Dired marks.")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defface dired-marked
* lisp/faces.el (error, warning, success): New faces with definitions copied from old default values of `font-lock-warning-face', `compilation-warning', `compilation-info'. * lisp/font-lock.el (font-lock-warning-face): Inherit from `error'. * lisp/progmodes/compile.el (compilation-error): Inherit from `error'. (compilation-warning): Inherit from `warning'. (compilation-info): Inherit from `success'. * lisp/dired.el (dired-marked): Inherit from `warning'. (dired-flagged): Inherit from `error'. Fixes: debbugs:6117
2011-08-18 11:36:19 +00:00
'((t (:inherit warning)))
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
"Face used for marked files."
:group 'dired-faces
Change release version from 21.4 to 22.1 throughout. Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
:version "22.1")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defvar dired-marked-face 'dired-marked
"Face name used for marked files.")
(defface dired-flagged
* lisp/faces.el (error, warning, success): New faces with definitions copied from old default values of `font-lock-warning-face', `compilation-warning', `compilation-info'. * lisp/font-lock.el (font-lock-warning-face): Inherit from `error'. * lisp/progmodes/compile.el (compilation-error): Inherit from `error'. (compilation-warning): Inherit from `warning'. (compilation-info): Inherit from `success'. * lisp/dired.el (dired-marked): Inherit from `warning'. (dired-flagged): Inherit from `error'. Fixes: debbugs:6117
2011-08-18 11:36:19 +00:00
'((t (:inherit error)))
* dired.el (dired-flagged): Clarify doc string. Fixes: debbugs:6117
2011-07-13 21:27:13 +00:00
"Face used for files flagged for deletion."
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
:group 'dired-faces
Change release version from 21.4 to 22.1 throughout. Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
:version "22.1")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defvar dired-flagged-face 'dired-flagged
* dired.el (dired-flagged): Clarify doc string. Fixes: debbugs:6117
2011-07-13 21:27:13 +00:00
"Face name used for files flagged for deletion.")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defface dired-warning
(dired-warning): Inherit from font-lock-warning-face to make it show up with eight colors.
2007-09-12 08:25:24 +00:00
;; Inherit from font-lock-warning-face since with min-colors 8
;; font-lock-comment-face is not colored any more.
'((t (:inherit font-lock-warning-face)))
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
"Face used to highlight a part of a buffer that needs user attention."
:group 'dired-faces
Change release version from 21.4 to 22.1 throughout. Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
:version "22.1")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defvar dired-warning-face 'dired-warning
"Face name used for a part of a buffer that needs user attention.")
(dired-warn-writable): Rename to `dired-perm-write'. (dired-perm-write): Renamed from `dired-warn-writable'. Change parent face from `font-lock-warning-face' to `font-lock-comment-delimiter-face'. (dired-warn-writable-face): Rename to `dired-perm-write-face'. (dired-perm-write-face): Renamed from `dired-warn-writable-face'. (dired-font-lock-keywords): Replace `dired-warn-writable-face' with `dired-perm-write-face'.
2008-03-14 01:01:36 +00:00
(defface dired-perm-write
(dired-warn-writable): New face. (dired-warn-writable-face): New variable. (dired-font-lock-keywords): Use dired-warn-writable-face, instead of dired-warning-face, for group- and world-writable files.
2007-10-13 20:14:23 +00:00
'((((type w32 pc)) :inherit default) ;; These default to rw-rw-rw.
(dired-warn-writable): Rename to `dired-perm-write'. (dired-perm-write): Renamed from `dired-warn-writable'. Change parent face from `font-lock-warning-face' to `font-lock-comment-delimiter-face'. (dired-warn-writable-face): Rename to `dired-perm-write-face'. (dired-perm-write-face): Renamed from `dired-warn-writable-face'. (dired-font-lock-keywords): Replace `dired-warn-writable-face' with `dired-perm-write-face'.
2008-03-16 16:10:01 +00:00
;; Inherit from font-lock-comment-delimiter-face since with min-colors 8
;; font-lock-comment-face is not colored any more.
(dired-warn-writable): Rename to `dired-perm-write'. (dired-perm-write): Renamed from `dired-warn-writable'. Change parent face from `font-lock-warning-face' to `font-lock-comment-delimiter-face'. (dired-warn-writable-face): Rename to `dired-perm-write-face'. (dired-perm-write-face): Renamed from `dired-warn-writable-face'. (dired-font-lock-keywords): Replace `dired-warn-writable-face' with `dired-perm-write-face'.
2008-03-14 01:01:36 +00:00
(t (:inherit font-lock-comment-delimiter-face)))
(dired-warn-writable): New face. (dired-warn-writable-face): New variable. (dired-font-lock-keywords): Use dired-warn-writable-face, instead of dired-warning-face, for group- and world-writable files.
2007-10-13 20:14:23 +00:00
"Face used to highlight permissions of group- and world-writable files."
:group 'dired-faces
:version "22.2")
(dired-warn-writable): Rename to `dired-perm-write'. (dired-perm-write): Renamed from `dired-warn-writable'. Change parent face from `font-lock-warning-face' to `font-lock-comment-delimiter-face'. (dired-warn-writable-face): Rename to `dired-perm-write-face'. (dired-perm-write-face): Renamed from `dired-warn-writable-face'. (dired-font-lock-keywords): Replace `dired-warn-writable-face' with `dired-perm-write-face'.
2008-03-14 01:01:36 +00:00
(defvar dired-perm-write-face 'dired-perm-write
(dired-warn-writable): New face. (dired-warn-writable-face): New variable. (dired-font-lock-keywords): Use dired-warn-writable-face, instead of dired-warning-face, for group- and world-writable files.
2007-10-13 20:14:23 +00:00
"Face name used for permissions of group- and world-writable files.")
Fix typo in previous dired change * lisp/dired.el (dired-set-idguid): Remove superfluous ' introduced by previous change (bug#37742).
2019-10-14 06:43:36 +00:00
(defface dired-set-idguid
Font-lock suid/guid files in Dired * lisp/dired.el (dired-font-lock-keywords): Font-lock suid/guid permissions (bug#8186). (dired-sguid): New face.
2019-10-14 01:31:33 +00:00
'((((type w32 pc)) :inherit default) ;; These default to rw-rw-rw.
(t (:inherit font-lock-warning-face)))
"Face used to highlight permissions of suid and guid files."
:group 'dired-faces
:version "27.1")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defface dired-directory
'((t (:inherit font-lock-function-name-face)))
"Face used for subdirectories."
:group 'dired-faces
Change release version from 21.4 to 22.1 throughout. Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
:version "22.1")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defvar dired-directory-face 'dired-directory
"Face name used for subdirectories.")
(defface dired-symlink
'((t (:inherit font-lock-keyword-face)))
"Face used for symbolic links."
:group 'dired-faces
Change release version from 21.4 to 22.1 throughout. Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
:version "22.1")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defvar dired-symlink-face 'dired-symlink
"Face name used for symbolic links.")
* lisp/dired.el (dired-special): Rename face from dired-socket (bug#24547). (dired-re-special): Rename from dired-re-socket.
2019-08-05 20:56:36 +00:00
(defface dired-special
Make dired fontify pipes and sockets * lisp/dired.el (dired-socket): New face for pipes and sockets (bug#24547). (dired-re-socket): New regexp to match them. (dired-font-lock-keywords): Use them.
2019-07-27 14:25:39 +00:00
'((t (:inherit font-lock-variable-name-face)))
Mark block/char devices the same as sockets in dired * lisp/dired.el (dired-re-socket): Also mark block and char devices with the socket face (bug#24547).
2019-07-28 10:00:24 +00:00
"Face used for sockets, pipes, block devices and char devices."
Make dired fontify pipes and sockets * lisp/dired.el (dired-socket): New face for pipes and sockets (bug#24547). (dired-re-socket): New regexp to match them. (dired-font-lock-keywords): Use them.
2019-07-27 14:25:39 +00:00
:group 'dired-faces
:version "27.1")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defface dired-ignored
* dired.el (dired-ignored): Inherit from `shadow' face.
2005-06-06 12:23:03 +00:00
'((t (:inherit shadow)))
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
"Face used for files suffixed with `completion-ignored-extensions'."
:group 'dired-faces
Change release version from 21.4 to 22.1 throughout. Change development version from 21.3.50 to 22.0.50.
2005-02-09 15:50:47 +00:00
:version "22.1")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
(defvar dired-ignored-face 'dired-ignored
"Face name used for files suffixed with `completion-ignored-extensions'.")
Tweak dired-font-lock-keywords.
1996-10-23 09:26:39 +00:00
(defvar dired-font-lock-keywords
(list
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
;;
;; Dired marks.
(list dired-re-mark '(0 dired-mark-face))
Tweak dired-font-lock-keywords.
1996-10-23 09:26:39 +00:00
;;
;; We make heavy use of MATCH-ANCHORED, since the regexps don't identify the
;; file name itself. We search for Dired defined regexps, and then use the
;; Dired defined function `dired-move-to-filename' before searching for the
;; simple regexp ".+". It is that regexp which matches the file name.
;;
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
;; Marked files.
(list (concat "^[" (char-to-string dired-marker-char) "]")
'(".+" (dired-move-to-filename) nil (0 dired-marked-face)))
;;
;; Flagged files.
(list (concat "^[" (char-to-string dired-del-marker) "]")
'(".+" (dired-move-to-filename) nil (0 dired-flagged-face)))
(dired-font-lock-keywords): Don't specially highlight files that are writable by others.
1997-08-12 17:21:24 +00:00
;; People who are paranoid about security would consider this more
;; important than other things such as whether it is a directory.
;; But we don't want to encourage paranoia, so our default
;; should be what's most useful for non-paranoids. -- rms.
;;; ;;
;;; ;; Files that are group or world writable.
;;; (list (concat dired-re-maybe-mark dired-re-inode-size
;;; "\\([-d]\\(....w....\\|.......w.\\)\\)")
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
;;; '(1 dired-warning-face)
;;; '(".+" (dired-move-to-filename) nil (0 dired-warning-face)))
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
;; However, we don't need to highlight the file name, only the
;; permissions, to win generally. -- fx.
;; Fixme: we could also put text properties on the permission
;; fields with keymaps to frob the permissions, somewhat a la XEmacs.
(list (concat dired-re-maybe-mark dired-re-inode-size
(dired-font-lock-keywords): Fix permission regexps.
2004-04-03 04:19:13 +00:00
"[-d]....\\(w\\)....") ; group writable
(dired-warn-writable): Rename to `dired-perm-write'. (dired-perm-write): Renamed from `dired-warn-writable'. Change parent face from `font-lock-warning-face' to `font-lock-comment-delimiter-face'. (dired-warn-writable-face): Rename to `dired-perm-write-face'. (dired-perm-write-face): Renamed from `dired-warn-writable-face'. (dired-font-lock-keywords): Replace `dired-warn-writable-face' with `dired-perm-write-face'.
2008-03-14 01:01:36 +00:00
'(1 dired-perm-write-face))
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
(list (concat dired-re-maybe-mark dired-re-inode-size
(dired-font-lock-keywords): Fix permission regexps.
2004-04-03 04:19:13 +00:00
"[-d].......\\(w\\).") ; world writable
(dired-warn-writable): Rename to `dired-perm-write'. (dired-perm-write): Renamed from `dired-warn-writable'. Change parent face from `font-lock-warning-face' to `font-lock-comment-delimiter-face'. (dired-warn-writable-face): Rename to `dired-perm-write-face'. (dired-perm-write-face): Renamed from `dired-warn-writable-face'. (dired-font-lock-keywords): Replace `dired-warn-writable-face' with `dired-perm-write-face'.
2008-03-14 01:01:36 +00:00
'(1 dired-perm-write-face))
Font-lock suid/guid files in Dired * lisp/dired.el (dired-font-lock-keywords): Font-lock suid/guid permissions (bug#8186). (dired-sguid): New face.
2019-10-14 01:31:33 +00:00
(list (concat dired-re-maybe-mark dired-re-inode-size
"[-d]..\\(s\\)......") ; suid
'(1 'dired-set-id))
(list (concat dired-re-maybe-mark dired-re-inode-size
"[-d].....\\(S\\)...") ; guid
'(1 'dired-set-id))
Tweak dired-font-lock-keywords.
1996-10-23 09:26:39 +00:00
;;
;; Subdirectories.
(list dired-re-dir
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
'(".+" (dired-move-to-filename) nil (0 dired-directory-face)))
Tweak dired-font-lock-keywords.
1996-10-23 09:26:39 +00:00
;;
;; Symbolic links.
Cygwin support patch.
2003-01-31 15:24:20 +00:00
(list dired-re-sym
(dired-faces): New defgroup. (dired-header, dired-mark, dired-marked, dired-flagged) (dired-warning, dired-directory, dired-symlink, dired-ignored): New faces. (dired-header-face, dired-mark-face, dired-marked-face) (dired-flagged-face, dired-warning-face, dired-directory-face) (dired-symlink-face, dired-ignored-face): New face variables. (dired-font-lock-keywords): Use them instead of font-lock faces. Split the rule for dired marks into 3 separate rules: for marks, marked file names and flagged file names.
2004-04-11 09:51:52 +00:00
'(".+" (dired-move-to-filename) nil (0 dired-symlink-face)))
Tweak dired-font-lock-keywords.
1996-10-23 09:26:39 +00:00
;;
Mark block/char devices the same as sockets in dired * lisp/dired.el (dired-re-socket): Also mark block and char devices with the socket face (bug#24547).
2019-07-28 10:00:24 +00:00
;; Sockets, pipes, block devices, char devices.
* lisp/dired.el (dired-special): Rename face from dired-socket (bug#24547). (dired-re-special): Rename from dired-re-socket.
2019-08-05 20:56:36 +00:00
(list dired-re-special
'(".+" (dired-move-to-filename) nil (0 'dired-special)))
Make dired fontify pipes and sockets * lisp/dired.el (dired-socket): New face for pipes and sockets (bug#24547). (dired-re-socket): New regexp to match them. (dired-font-lock-keywords): Use them.
2019-07-27 14:25:39 +00:00
;;
Tweak dired-font-lock-keywords.
1996-10-23 09:26:39 +00:00
;; Files suffixed with `completion-ignored-extensions'.
'(eval .
(dired-font-lock-keywords): Use regexp-opt. (dired-move-to-filename): Better message when we fail to find the file. (dired-sort-toggle): Minor optimization.
2002-09-16 17:13:16 +00:00
;; It is quicker to first find just an extension, then go back to the
;; start of that file name. So we do this complex MATCH-ANCHORED form.
(list (concat "\\(" (regexp-opt completion-ignored-extensions) "\\|#\\)$")
(dired-font-lock-keywords): Fontify files with junk extensions even if marked by -F.
2005-05-22 13:35:21 +00:00
'(".+" (dired-move-to-filename) nil (0 dired-ignored-face))))
;;
;; Files suffixed with `completion-ignored-extensions'
;; plus a character put in by -F.
'(eval .
(list (concat "\\(" (regexp-opt completion-ignored-extensions)
"\\|#\\)[*=|]$")
'(".+" (progn
(end-of-line)
;; If the last character is not part of the filename,
;; move back to the start of the filename
;; so it can be fontified.
;; Otherwise, leave point at the end of the line;
;; that way, nothing is fontified.
(unless (get-text-property (1- (point)) 'mouse-face)
(dired-move-to-filename)))
nil (0 dired-ignored-face))))
(dired-font-lock-keywords): Avoid fontifying file names ending in a colon as directory header.
2008-12-01 16:07:19 +00:00
;;
;; Explicitly put the default face on file names ending in a colon to
;; avoid fontifying them as directory header.
(list (concat dired-re-maybe-mark dired-re-inode-size dired-re-perms ".*:$")
(dired-font-lock-keywords): Fix last change.
2008-12-05 13:36:46 +00:00
'(".+" (dired-move-to-filename) nil (0 'default)))
(dired-font-lock-keywords): Avoid fontifying file names ending in a colon as directory header.
2008-12-01 16:07:19 +00:00
;;
;; Directory headers.
(list dired-subdir-regexp '(1 dired-header-face))
(dired-font-lock-keywords): Fontify files with junk extensions even if marked by -F.
2005-05-22 13:35:21 +00:00
)
Tweak dired-font-lock-keywords.
1996-10-23 09:26:39 +00:00
"Additional expressions to highlight in Dired mode.")
(dnd-protocol-alist): Add defvar.
2005-07-03 16:11:04 +00:00
(defvar dnd-protocol-alist)
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;;; Macros must be defined before they are used, for the byte compiler.
(defmacro dired-mark-if (predicate msg)
Make dired commands report how many files they mark * lisp/dired.el (dired-mark-if): Report the number of files marked when called, not the total number of marked files (bug#22457).
2019-06-25 15:42:25 +00:00
"Mark files for PREDICATE, according to `dired-marker-char'.
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
PREDICATE is evaluated on each line, with point at beginning of line.
MSG is a noun phrase for the type of files being marked.
It should end with a noun that can be pluralized by adding `s'.
Return value is the number of files marked, or nil if none were marked."
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
`(let ((inhibit-read-only t) count)
Converted backquote to the new style.
2001-11-27 15:52:52 +00:00
(save-excursion
(setq count 0)
(dired-mark-if): Make the message about whether it's marking or unmarking clearer (bug#8523)
2011-07-02 13:28:19 +00:00
(when ,msg
(message "%s %ss%s..."
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(cond ((eq dired-marker-char ?\s) "Unmarking")
(dired-mark-if): Make the message about whether it's marking or unmarking clearer (bug#8523)
2011-07-02 13:28:19 +00:00
((eq dired-del-marker dired-marker-char)
"Flagging")
(t "Marking"))
,msg
(if (eq dired-del-marker dired-marker-char)
" for deletion"
"")))
Converted backquote to the new style.
2001-11-27 15:52:52 +00:00
(goto-char (point-min))
(while (not (eobp))
Make dired commands report how many files they mark * lisp/dired.el (dired-mark-if): Report the number of files marked when called, not the total number of marked files (bug#22457).
2019-06-25 15:42:25 +00:00
(when ,predicate
Fix previous patch to dired-mark-if * lisp/dired.el (dired-mark-if): Don't use looking-at to check for characters.
2019-06-25 23:15:06 +00:00
(unless (= (following-char) dired-marker-char)
Make dired commands report how many files they mark * lisp/dired.el (dired-mark-if): Report the number of files marked when called, not the total number of marked files (bug#22457).
2019-06-25 15:42:25 +00:00
(delete-char 1)
(insert dired-marker-char)
(setq count (1+ count))))
Converted backquote to the new style.
2001-11-27 15:52:52 +00:00
(forward-line 1))
Make dired commands report how many files they mark * lisp/dired.el (dired-mark-if): Report the number of files marked when called, not the total number of marked files (bug#22457).
2019-06-25 15:42:25 +00:00
(when ,msg (message "%s %s%s %s%s"
Converted backquote to the new style.
2001-11-27 15:52:52 +00:00
count
,msg
(dired-plural-s count)
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(if (eq dired-marker-char ?\s) "un" "")
Converted backquote to the new style.
2001-11-27 15:52:52 +00:00
(if (eq dired-marker-char dired-del-marker)
"flagged" "marked"))))
(and (> count 0) count)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-map-over-marks): New arg distinguish-one-marked. (dired-get-marked-files): New arg distinguish-one-marked. (dired-mark-pop-up): Handle FILES = (t FILE) specially.
2005-05-15 21:33:25 +00:00
(defmacro dired-map-over-marks (body arg &optional show-progress
distinguish-one-marked)
(dired-map-over-marks): Use modern backquotes and docstring.
2000-09-29 22:24:38 +00:00
"Eval BODY with point on each marked line. Return a list of BODY's results.
* dired.el (dired-map-over-marks): Refill the doc string (bug#6814).
2011-07-03 13:25:18 +00:00
If no marked file could be found, execute BODY on the current
line. ARG, if non-nil, specifies the files to use instead of the
marked files.
If ARG is an integer, use the next ARG (or previous -ARG, if
ARG<0) files. In that case, point is dragged along. This is so
that commands on the next ARG (instead of the marked) files can
be chained easily.
For any other non-nil value of ARG, use the current file.
(dired-map-over-marks): Use modern backquotes and docstring.
2000-09-29 22:24:38 +00:00
If optional third arg SHOW-PROGRESS evaluates to non-nil,
* dired.el (dired-map-over-marks): Refill the doc string (bug#6814).
2011-07-03 13:25:18 +00:00
redisplay the dired buffer after each file is processed.
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
No guarantee is made about the position on the marked line.
BODY must ensure this itself if it depends on this.
* dired.el (dired-map-over-marks): Refill the doc string (bug#6814).
2011-07-03 13:25:18 +00:00
Search starts at the beginning of the buffer, thus the car of the
list corresponds to the line nearest to the buffer's bottom.
This is also true for (positive and negative) integer values of
ARG.
(dired-map-over-marks): New arg distinguish-one-marked. (dired-get-marked-files): New arg distinguish-one-marked. (dired-mark-pop-up): Handle FILES = (t FILE) specially.
2005-05-15 21:33:25 +00:00
BODY should not be too long as it is expanded four times.
* dired.el (dired-map-over-marks): Refill the doc string (bug#6814).
2011-07-03 13:25:18 +00:00
If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one
marked file, return (t FILENAME) instead of (FILENAME)."
(dired-map-over-marks): Use modern backquotes and docstring.
2000-09-29 22:24:38 +00:00
;;
;;Warning: BODY must not add new lines before point - this may cause an
;;endless loop.
;;This warning should not apply any longer, sk 2-Sep-1991 14:10.
`(prog1
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(let ((inhibit-read-only t) case-fold-search found results)
(dired-map-over-marks): Use modern backquotes and docstring.
2000-09-29 22:24:38 +00:00
(if ,arg
(if (integerp ,arg)
(progn ;; no save-excursion, want to move point.
(dired-repeat-over-lines
,arg
Don't quote lambda forms * lisp/dired.el (dired-re-maybe-mark, dired-map-over-marks) (dired-mark, dired-desktop-buffer-misc-data) * lisp/dired-aux.el (dired-do-create-files, dired-do-create-files-regexp) (dired-create-files-non-directory, dired-insert-subdir-validate) (dired-alist-sort, dired-do-shell-command): Don't quote lambda forms.
2017-06-26 05:22:27 +00:00
(lambda ()
(if ,show-progress (sit-for 0))
(setq results (cons ,body results))))
(dired-map-over-marks): Use modern backquotes and docstring.
2000-09-29 22:24:38 +00:00
(if (< ,arg 0)
(nreverse results)
results))
;; non-nil, non-integer ARG means use current file:
(list ,body))
(let ((regexp (dired-marker-regexp)) next-position)
(save-excursion
(goto-char (point-min))
;; remember position of next marked file before BODY
;; can insert lines before the just found file,
;; confusing us by finding the same marked file again
;; and again and...
(setq next-position (and (re-search-forward regexp nil t)
(point-marker))
found (not (null next-position)))
(while next-position
(goto-char next-position)
(if ,show-progress (sit-for 0))
(setq results (cons ,body results))
;; move after last match
(goto-char next-position)
(forward-line 1)
(set-marker next-position nil)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(setq next-position (and (re-search-forward regexp nil t)
(dired-map-over-marks): Use modern backquotes and docstring.
2000-09-29 22:24:38 +00:00
(point-marker)))))
(dired-map-over-marks): New arg distinguish-one-marked. (dired-get-marked-files): New arg distinguish-one-marked. (dired-mark-pop-up): Handle FILES = (t FILE) specially.
2005-05-15 21:33:25 +00:00
(if (and ,distinguish-one-marked (= (length results) 1))
(setq results (cons t results)))
(dired-map-over-marks): Use modern backquotes and docstring.
2000-09-29 22:24:38 +00:00
(if found
results
(list ,body)))))
;; save-excursion loses, again
(dired-move-to-filename)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
* lisp/dired.el (dired-get-marked-files): Add new optional arg 'error'. Call user-error when it's non-nil and result is empty (bug#30285). * lisp/dired-aux.el (dired-do-chxxx, dired-do-chmod) (dired-do-print, dired-do-async-shell-command) (dired-do-shell-command, dired-do-compress-to) (dired-mark-confirm, dired-do-create-files) (dired-do-isearch, dired-do-isearch-regexp) (dired-do-query-replace-regexp, dired-do-find-regexp): * lisp/dired-x.el (dired-do-find-marked-files): Set arg 'error' of dired-get-marked-files call to t.
2018-02-06 21:32:08 +00:00
(defun dired-get-marked-files (&optional localp arg filter distinguish-one-marked error)
*** empty log message ***
1992-06-24 02:13:56 +00:00
"Return the marked files' names as list of strings.
The list is in the same order as the buffer, that is, the car is the
first marked file.
(dired-get-marked-files): New arg FILTER allows selection of some files.
2002-03-29 14:43:14 +00:00
Values returned are normally absolute file names.
*** empty log message ***
1992-06-24 02:13:56 +00:00
Optional arg LOCALP as in `dired-get-filename'.
(dired-get-marked-files, dired-map-over-marks): Doc fixes.
2008-10-22 20:37:22 +00:00
Optional second argument ARG, if non-nil, specifies files near
point instead of marked files. It usually comes from the prefix
argument.
If ARG is an integer, use the next ARG files.
* dired.el (dired-get-marked-files): Clarify doc. Fixes: debbugs:11534
2014-02-11 11:16:38 +00:00
If ARG is any other non-nil value, return the current file name.
If no files are marked, and ARG is nil, also return the current file name.
(dired-get-marked-files): New arg FILTER allows selection of some files.
2002-03-29 14:43:14 +00:00
Optional third argument FILTER, if non-nil, is a function to select
(dired-map-over-marks): New arg distinguish-one-marked. (dired-get-marked-files): New arg distinguish-one-marked. (dired-mark-pop-up): Handle FILES = (t FILE) specially.
2005-05-15 21:33:25 +00:00
some of the files--those for which (funcall FILTER FILENAME) is non-nil.
If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file,
return (t FILENAME) instead of (FILENAME).
* lisp/dired.el (dired-get-marked-files): Add new optional arg 'error'. Call user-error when it's non-nil and result is empty (bug#30285). * lisp/dired-aux.el (dired-do-chxxx, dired-do-chmod) (dired-do-print, dired-do-async-shell-command) (dired-do-shell-command, dired-do-compress-to) (dired-mark-confirm, dired-do-create-files) (dired-do-isearch, dired-do-isearch-regexp) (dired-do-query-replace-regexp, dired-do-find-regexp): * lisp/dired-x.el (dired-do-find-marked-files): Set arg 'error' of dired-get-marked-files call to t.
2018-02-06 21:32:08 +00:00
Don't use that together with FILTER.
If ERROR is non-nil, signal an error when the list of found files is empty.
ERROR can be a string with the error message."
Prune erroneous values in dired-get-marked-files Fixes: debbugs:13152
2013-01-18 18:35:44 +00:00
(let ((all-of-them
(save-excursion
(delq nil (dired-map-over-marks
(dired-get-filename localp 'no-error-if-not-filep)
arg nil distinguish-one-marked))))
result)
(when (equal all-of-them '(t))
(setq all-of-them nil))
(dired-get-marked-files): New arg FILTER allows selection of some files.
2002-03-29 14:43:14 +00:00
(if (not filter)
* lisp/dired.el (dired-get-marked-files): Add new optional arg 'error'. Call user-error when it's non-nil and result is empty (bug#30285). * lisp/dired-aux.el (dired-do-chxxx, dired-do-chmod) (dired-do-print, dired-do-async-shell-command) (dired-do-shell-command, dired-do-compress-to) (dired-mark-confirm, dired-do-create-files) (dired-do-isearch, dired-do-isearch-regexp) (dired-do-query-replace-regexp, dired-do-find-regexp): * lisp/dired-x.el (dired-do-find-marked-files): Set arg 'error' of dired-get-marked-files call to t.
2018-02-06 21:32:08 +00:00
(setq result
(if (and distinguish-one-marked (eq (car all-of-them) t))
all-of-them
(nreverse all-of-them)))
(dired-get-marked-files): New arg FILTER allows selection of some files.
2002-03-29 14:43:14 +00:00
(dolist (file all-of-them)
(if (funcall filter file)
* lisp/dired.el (dired-get-marked-files): Add new optional arg 'error'. Call user-error when it's non-nil and result is empty (bug#30285). * lisp/dired-aux.el (dired-do-chxxx, dired-do-chmod) (dired-do-print, dired-do-async-shell-command) (dired-do-shell-command, dired-do-compress-to) (dired-mark-confirm, dired-do-create-files) (dired-do-isearch, dired-do-isearch-regexp) (dired-do-query-replace-regexp, dired-do-find-regexp): * lisp/dired-x.el (dired-do-find-marked-files): Set arg 'error' of dired-get-marked-files call to t.
2018-02-06 21:32:08 +00:00
(push file result))))
(when (and (null result) error)
(user-error (if (stringp error) error "No files specified")))
result))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; The dired command
(defun dired-read-dir-and-switches (str)
;; For use in interactive.
(dired-read-dir-and-switches): Revert to 2007-11-22 version (bug@1285).
2008-11-08 14:24:54 +00:00
(reverse (list
(if current-prefix-arg
(read-string "Dired listing switches: "
dired-listing-switches))
Replace many instances of read-file-name with read-directory-name. * lisp/files.el (delete-directory, copy-directory, list-directory): Use read-directory-name. * lisp/find-file.el (ff-find-the-other-file): * lisp/net/ange-ftp.el (ange-ftp-make-directory): * lisp/printing.el (pr-interactive-dir): * lisp/progmodes/ada-prj.el (ada-prj-load-directory): * lisp/progmodes/ebnf2ps.el (ebnf-print-directory) (ebnf-spool-directory, ebnf-eps-directory) (ebnf-syntax-directory): * lisp/shell.el (shell): * lisp/speedbar.el (speedbar-create-directory): * lisp/vc/emerge.el (emerge-merge-directories): * lisp/vc/vc-dir.el (vc-dir): * lisp/vc/vc.el (vc-create-tag, vc-retrieve-tag): Likewise. * lisp/gnus.el (gnus-interactive): Use read-directory-name. * lisp/gnus-uu.el (gnus-uu-decode-uu-and-save) (gnus-uu-decode-unshar-and-save, gnus-uu-decode-save) (gnus-uu-decode-binhex, gnus-uu-decode-yenc) (gnus-uu-decode-save-view, gnus-uu-decode-postscript-and-save): Likewise. * lisp/mh-funcs.el (mh-store-msg, mh-store-buffer): * lisp/mh-mime.el (mh-mime-save-parts): Use read-directory-name. * lisp/dired.el: Clarify comment.
2011-03-05 21:56:00 +00:00
;; If a dialog is used, call `read-directory-name' so the
;; dialog code knows we want directories. Some dialogs
;; can only select directories or files when popped up,
;; not both. If no dialog is used, call `read-file-name'
;; because the user may want completion of file names for
;; use in a wildcard pattern.
(dired-read-dir-and-switches): Revert to 2007-11-22 version (bug@1285).
2008-11-08 14:24:54 +00:00
(if (next-read-file-uses-dialog-p)
(read-directory-name (format "Dired %s(directory): " str)
nil default-directory nil)
Provide additional default values (file name at point or at the current Dired line) via M-n for file reading minibuffers. (Bug#5010) * minibuffer.el (read-file-name-defaults): New function. (read-file-name): Reset `minibuffer-default' to nil when it duplicates initial input `insdef'. Bind `minibuffer-default-add-function' to lambda that calls `read-file-name-defaults' in `minibuffer-selected-window'. (minibuffer-insert-file-name-at-point): New command. * files.el (file-name-at-point-functions): New defcustom. (find-file-default): Remove defvar. (find-file-read-args): Don't use `find-file-default'. Move `minibuffer-with-setup-hook' that sets `minibuffer-default' to `read-file-name'. (find-file-literally): Use `read-file-name' with `confirm-nonexistent-file-or-buffer'. * ffap.el (ffap-guess-file-name-at-point): New autoloaded function. * dired.el (dired-read-dir-and-switches): Move `minibuffer-with-setup-hook' that sets `minibuffer-default' to `read-file-name'. (dired-file-name-at-point): New function. (dired-mode): Add hook `dired-file-name-at-point' to `file-name-at-point-functions'.
2009-11-25 17:11:29 +00:00
(read-file-name (format "Dired %s(directory): " str)
nil default-directory nil)))))
(dired-read-dir-and-switches): Revert to 2007-11-22 version (bug@1285).
2008-11-08 14:24:54 +00:00
;; We want to switch to a more sophisticated version of
;; dired-read-dir-and-switches like the following, if there is a way
;; to make it more intuitive. See bug#1285.
;; (defun dired-read-dir-and-switches (str)
;; ;; For use in interactive.
;; (reverse
;; (list
;; (if current-prefix-arg
;; (read-string "Dired listing switches: "
;; dired-listing-switches))
;; ;; If a dialog is about to be used, call read-directory-name so
;; ;; the dialog code knows we want directories. Some dialogs can
;; ;; only select directories or files when popped up, not both.
;; (if (next-read-file-uses-dialog-p)
;; (read-directory-name (format "Dired %s(directory): " str)
;; nil default-directory nil)
;; (let ((cie ()))
;; (dolist (ext completion-ignored-extensions)
;; (if (eq ?/ (aref ext (1- (length ext)))) (push ext cie)))
;; (setq cie (concat (regexp-opt cie "\\(?:") "\\'"))
Replace lexical-let by lexical-binding (except Gnus, CEDET, ERT). * lisp/term/ns-win.el (ns-define-service): * lisp/progmodes/pascal.el (pascal-goto-defun): * lisp/progmodes/js.el (js--read-tab): * lisp/progmodes/etags.el (tags-lazy-completion-table): * lisp/emacs-lisp/syntax.el (syntax-propertize-via-font-lock): * lisp/emacs-lisp/ewoc.el (ewoc--wrap): * lisp/emacs-lisp/assoc.el (aput, adelete, amake): * lisp/doc-view.el (doc-view-convert-current-doc): * lisp/url/url.el (url-retrieve-synchronously): * lisp/vc/diff.el (diff-no-select): Replace lexical-let by lexical-binding.
2012-04-26 12:43:28 +00:00
;; (let* ((default (and buffer-file-name
;; (abbreviate-file-name buffer-file-name)))
;; (cie cie)
;; (completion-table
;; ;; We need a mix of read-file-name and
;; ;; read-directory-name so that completion to directories
;; ;; is preferred, but if the user wants to enter a global
;; ;; pattern, he can still use completion on filenames to
;; ;; help him write the pattern.
;; ;; Essentially, we want to use
;; ;; (completion-table-with-predicate
;; ;; 'read-file-name-internal 'file-directory-p nil)
;; ;; but that doesn't work because read-file-name-internal
;; ;; does not obey its `predicate' argument.
;; (completion-table-in-turn
;; (lambda (str pred action)
;; (let ((read-file-name-predicate
;; (lambda (f)
;; (and (not (member f '("./" "../")))
;; ;; Hack! Faster than file-directory-p!
;; (eq (aref f (1- (length f))) ?/)
;; (not (string-match cie f))))))
;; (complete-with-action
;; action 'read-file-name-internal str nil)))
;; 'read-file-name-internal)))
(dired-read-dir-and-switches): Revert to 2007-11-22 version (bug@1285).
2008-11-08 14:24:54 +00:00
;; (minibuffer-with-setup-hook
;; (lambda ()
;; (setq minibuffer-default default)
;; (setq minibuffer-completion-table completion-table))
;; (read-file-name (format "Dired %s(directory): " str)
;; nil default-directory nil))))))))
Initial revision
1992-05-30 23:52:26 +00:00
Provide additional default values (file name at point or at the current Dired line) via M-n for file reading minibuffers. (Bug#5010) * minibuffer.el (read-file-name-defaults): New function. (read-file-name): Reset `minibuffer-default' to nil when it duplicates initial input `insdef'. Bind `minibuffer-default-add-function' to lambda that calls `read-file-name-defaults' in `minibuffer-selected-window'. (minibuffer-insert-file-name-at-point): New command. * files.el (file-name-at-point-functions): New defcustom. (find-file-default): Remove defvar. (find-file-read-args): Don't use `find-file-default'. Move `minibuffer-with-setup-hook' that sets `minibuffer-default' to `read-file-name'. (find-file-literally): Use `read-file-name' with `confirm-nonexistent-file-or-buffer'. * ffap.el (ffap-guess-file-name-at-point): New autoloaded function. * dired.el (dired-read-dir-and-switches): Move `minibuffer-with-setup-hook' that sets `minibuffer-default' to `read-file-name'. (dired-file-name-at-point): New function. (dired-mode): Add hook `dired-file-name-at-point' to `file-name-at-point-functions'.
2009-11-25 17:11:29 +00:00
(defun dired-file-name-at-point ()
"Try to get a file name at point in the current dired buffer.
* lisp/saveplace.el (save-place-to-alist): Add `dired-filename' as a position when `dired-directory' is non-nil. Check integer positions with `integerp'. (toggle-save-place, save-places-to-alist): Add check for `dired-directory'. (save-place-find-file-hook): Check integer positions with `integerp'. (save-place-dired-hook): Use `dired-goto-file' when `dired-filename' is found in the assoc list. Check integer positions with `integerp'. (dired-initial-position-hook): Rename from `dired-initial-point-hook'. * lisp/dired.el (dired-initial-position-hook): Rename back from `dired-initial-point-hook'. (dired-initial-position): Rename `dired-initial-point-hook' to `dired-initial-position-hook'. (dired-file-name-at-point): Doc fix. Fixes: debbugs:15329
2013-12-20 20:20:39 +00:00
This hook is intended to be put in `file-name-at-point-functions'.
Note that it returns an abbreviated name that can't be used
as an argument to `dired-goto-file'."
Provide additional default values (file name at point or at the current Dired line) via M-n for file reading minibuffers. (Bug#5010) * minibuffer.el (read-file-name-defaults): New function. (read-file-name): Reset `minibuffer-default' to nil when it duplicates initial input `insdef'. Bind `minibuffer-default-add-function' to lambda that calls `read-file-name-defaults' in `minibuffer-selected-window'. (minibuffer-insert-file-name-at-point): New command. * files.el (file-name-at-point-functions): New defcustom. (find-file-default): Remove defvar. (find-file-read-args): Don't use `find-file-default'. Move `minibuffer-with-setup-hook' that sets `minibuffer-default' to `read-file-name'. (find-file-literally): Use `read-file-name' with `confirm-nonexistent-file-or-buffer'. * ffap.el (ffap-guess-file-name-at-point): New autoloaded function. * dired.el (dired-read-dir-and-switches): Move `minibuffer-with-setup-hook' that sets `minibuffer-default' to `read-file-name'. (dired-file-name-at-point): New function. (dired-mode): Add hook `dired-file-name-at-point' to `file-name-at-point-functions'.
2009-11-25 17:11:29 +00:00
(let ((filename (dired-get-filename nil t)))
(when filename
(if (file-directory-p filename)
(file-name-as-directory (abbreviate-file-name filename))
(abbreviate-file-name filename)))))
Fix rgrep in dired using directory for search file pattern * lisp/progmodes/grep.el (grep-read-files): Allow major modes to define file name to use for default search pattern. Add non-directory file at point as default search pattern candidate. * lisp/dired.el (dired-grep-read-files): Use non-directory file at point for grep file name pattern. (Bug#34621) Copyright-paperwork-exempt: yes
2019-04-11 20:51:13 +00:00
(defun dired-grep-read-files ()
"Use file at point as the file for grep's default file-name pattern suggestion.
If a directory or nothing is found at point, return nil."
(let ((file-name (dired-file-name-at-point)))
(if (and file-name
(not (file-directory-p file-name)))
file-name)))
(put 'dired-mode 'grep-read-files 'dired-grep-read-files)
*** empty log message ***
1992-06-24 02:13:56 +00:00
;;;###autoload (define-key ctl-x-map "d" 'dired)
Initial revision
1992-05-30 23:52:26 +00:00
;;;###autoload
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired (dirname &optional switches)
Initial revision
1992-05-30 23:52:26 +00:00
"\"Edit\" directory DIRNAME--delete, rename, print, etc. some files in it.
*** empty log message ***
1992-06-24 02:13:56 +00:00
Optional second argument SWITCHES specifies the `ls' options used.
\(Interactively, use a prefix argument to be able to specify SWITCHES.)
* lisp/dired.el (dired): Doc fix. (Bug#20739)
2015-06-06 09:33:59 +00:00
If DIRNAME is a string, Dired displays a list of files in DIRNAME (which
may also have shell wildcards appended to select certain files).
If DIRNAME is a cons, its first element is taken as the directory name
and the rest as an explicit list of files to make directory entries for.
In this case, SWITCHES are applied to each of the files separately, and
therefore switches that control the order of the files in the produced
listing have no effect.
*** empty log message ***
1992-07-21 22:40:10 +00:00
\\<dired-mode-map>\
dired-noselect, dired-internal-noselect, dired-insert-directory: Enhancements to support passing dired a DIRNAME argument consisting of a directory-name car and a list-of-files cdr. This is needed to support VC's augmented dired, which wants a filtered file display that recurses (showing all version-controlled files in subdirectories as well as the top-level ones).
1993-04-08 16:35:59 +00:00
You can flag files for deletion with \\[dired-flag-file-deletion] and then
delete them by typing \\[dired-do-flagged-delete].
(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.
2005-07-20 14:08:39 +00:00
Type \\[describe-mode] after entering Dired for more info.
Initial revision
1992-05-30 23:52:26 +00:00
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
If DIRNAME is already in a Dired buffer, that buffer is used without refresh."
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Cannot use (interactive "D") because of wildcards.
(interactive (dired-read-dir-and-switches ""))
Preserve point under 'dired-auto-revert-buffer' (second case) * lisp/dired.el (dired): Use pop-to-buffer-same-window instead of switch-to-buffer. This preserves Dired window point when dired-auto-revert-buffer is non-nil. (Bug#27243) * test/lisp/dired-tests.el (dired-test-bug27243): New test.
2017-07-17 09:09:07 +00:00
(pop-to-buffer-same-window (dired-noselect dirname switches)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;;;###autoload (define-key ctl-x-4-map "d" 'dired-other-window)
Initial revision
1992-05-30 23:52:26 +00:00
;;;###autoload
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-other-window (dirname &optional switches)
Initial revision
1992-05-30 23:52:26 +00:00
"\"Edit\" directory DIRNAME. Like `dired' but selects in another window."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive (dired-read-dir-and-switches "in other window "))
(switch-to-buffer-other-window (dired-noselect dirname switches)))
Initial revision
1992-05-30 23:52:26 +00:00
(dired-other-frame): New function, with binding.
1993-05-26 22:52:13 +00:00
;;;###autoload (define-key ctl-x-5-map "d" 'dired-other-frame)
;;;###autoload
(defun dired-other-frame (dirname &optional switches)
"\"Edit\" directory DIRNAME. Like `dired' but makes a new frame."
(interactive (dired-read-dir-and-switches "in other frame "))
(switch-to-buffer-other-frame (dired-noselect dirname switches)))
More tab bar related key bindings. * lisp/subr.el (ctl-x-6-map, ctl-x-6-prefix): Move here from tab-bar.el to make it available to other modes like dired for 'C-x 6 d'. * lisp/dired.el (dired-other-tab): New command bound to 'C-x 6 d'. * lisp/tab-bar.el: Bind 'C-x 6 o' to tab-next. * doc/emacs/frames.texi (Tab Bars): Describe C-x 6 prefix key bindings.
2019-10-05 21:54:46 +00:00
;;;###autoload (define-key ctl-x-6-map "d" 'dired-other-tab)
;;;###autoload
(defun dired-other-tab (dirname &optional switches)
"\"Edit\" directory DIRNAME. Like `dired' but makes a new tab."
(interactive (dired-read-dir-and-switches "in other tab "))
(switch-to-buffer-other-tab (dired-noselect dirname switches)))
Initial revision
1992-05-30 23:52:26 +00:00
;;;###autoload
dired-noselect, dired-internal-noselect, dired-insert-directory: Enhancements to support passing dired a DIRNAME argument consisting of a directory-name car and a list-of-files cdr. This is needed to support VC's augmented dired, which wants a filtered file display that recurses (showing all version-controlled files in subdirectories as well as the top-level ones).
1993-04-08 16:35:59 +00:00
(defun dired-noselect (dir-or-list &optional switches)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Like `dired' but returns the Dired buffer as value, does not select it."
dired-noselect, dired-internal-noselect, dired-insert-directory: Enhancements to support passing dired a DIRNAME argument consisting of a directory-name car and a list-of-files cdr. This is needed to support VC's augmented dired, which wants a filtered file display that recurses (showing all version-controlled files in subdirectories as well as the top-level ones).
1993-04-08 16:35:59 +00:00
(or dir-or-list (setq dir-or-list default-directory))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; This loses the distinction between "/foo/*/" and "/foo/*" that
;; some shells make:
(dired-noselect): Avoid calling file-directory-p when the initial argument was syntactically a directory name.
1997-04-13 04:26:38 +00:00
(let (dirname initially-was-dirname)
dired-noselect, dired-internal-noselect, dired-insert-directory: Enhancements to support passing dired a DIRNAME argument consisting of a directory-name car and a list-of-files cdr. This is needed to support VC's augmented dired, which wants a filtered file display that recurses (showing all version-controlled files in subdirectories as well as the top-level ones).
1993-04-08 16:35:59 +00:00
(if (consp dir-or-list)
(setq dirname (car dir-or-list))
(setq dirname dir-or-list))
(dired-noselect): Avoid calling file-directory-p when the initial argument was syntactically a directory name.
1997-04-13 04:26:38 +00:00
(setq initially-was-dirname
(string= (file-name-as-directory dirname) dirname))
(dired-noselect): Call abbreviate-file-name here. (dired-internal-noselect): Not here.
1994-07-31 21:42:11 +00:00
(setq dirname (abbreviate-file-name
(expand-file-name (directory-file-name dirname))))
(dired-noselect): Resolve symbolic links in argument.
1996-04-05 19:11:05 +00:00
(if find-file-visit-truename
(setq dirname (file-truename dirname)))
(dired-noselect): Avoid calling file-directory-p when the initial argument was syntactically a directory name.
1997-04-13 04:26:38 +00:00
;; If the argument was syntactically a directory name not a file name,
;; or if it happens to name a file that is a directory,
;; convert it syntactically to a directory name.
;; The reason for checking initially-was-dirname
;; and not just file-directory-p
;; is that file-directory-p is slow over ftp.
(if (or initially-was-dirname (file-directory-p dirname))
(setq dirname (file-name-as-directory dirname)))
dired-noselect, dired-internal-noselect, dired-insert-directory: Enhancements to support passing dired a DIRNAME argument consisting of a directory-name car and a list-of-files cdr. This is needed to support VC's augmented dired, which wants a filtered file display that recurses (showing all version-controlled files in subdirectories as well as the top-level ones).
1993-04-08 16:35:59 +00:00
(if (consp dir-or-list)
(setq dir-or-list (cons dirname (cdr dir-or-list)))
(setq dir-or-list dirname))
(dired-internal-noselect dir-or-list switches)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-directory-changed-p, dired-buffer-stale-p): New functions. (dired-internal-noselect): Use dired-directory-changed-p. Eliminate revert messages. (dired-mode): Set buffer-stale-function to dired-buffer-stale-p.
2004-03-23 05:20:11 +00:00
;; The following is an internal dired function. It returns non-nil if
;; the directory visited by the current dired buffer has changed on
;; disk. DIRNAME should be the directory name of that directory.
(defun dired-directory-changed-p (dirname)
(not (let ((attributes (file-attributes dirname))
(dired-directory-changed-p): Reindent.
2004-03-25 04:21:24 +00:00
(modtime (visited-file-modtime)))
(or (eq modtime 0)
file-attributes cleanup Mostly, this replaces magic-number calls like (nth 4 A) with more-informative calls like (file-attribute-access-time A). It also fixes some documentation and minor timestamp coding issues that I noticed while looking into this. * doc/lispref/files.texi (File Attributes): * lisp/files.el (file-attribute-size) (file-attribute-inode-number, file-attribute-device-number): * src/dired.c (Fdirectory_files_and_attributes) (Ffile_attributes): Mention which attributes must be integers, or nonnegative integers, as opposed to merely being numbers. Remove no-longer-correct talk about representing large integers as conses of integers. * doc/lispref/files.texi (Magic File Names): * doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary): * lisp/autorevert.el (auto-revert-find-file-function) (auto-revert-tail-mode, auto-revert-handler): * lisp/auth-source.el (auth-source-netrc-parse): * lisp/cedet/ede/files.el (ede--inode-for-dir): * lisp/cedet/semantic/db-file.el (object-write): * lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook): * lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p) (semanticdb-synchronize): * lisp/cedet/srecode/table.el (srecode-mode-table-new): * lisp/desktop.el (desktop-save, desktop-read): * lisp/dired-aux.el (dired-file-set-difference) (dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive) (dired-create-files): * lisp/dired.el (dired-directory-changed-p, dired-readin): * lisp/dos-w32.el (w32-direct-print-region-helper): * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads) (autoload-find-destination, update-directory-autoloads): * lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent): * lisp/epg.el (epg--start, epg-wait-for-completion): * lisp/eshell/em-ls.el (eshell-ls-filetype-p) (eshell-ls-applicable, eshell-ls-size-string) (eshell-ls-file, eshell-ls-dir, eshell-ls-files) (eshell-ls-entries): * lisp/eshell/em-pred.el (eshell-predicate-alist) (eshell-pred-file-type, eshell-pred-file-links) (eshell-pred-file-size): * lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat) (eshell-du-sum-directory, eshell/du): * lisp/eshell/esh-util.el (eshell-read-passwd) (eshell-read-hosts): * lisp/files.el (remote-file-name-inhibit-cache) (find-file-noselect, insert-file-1, dir-locals-find-file) (dir-locals-read-from-dir, backup-buffer) (file-ownership-preserved-p, copy-directory) (read-file-modes): * lisp/find-lisp.el (find-lisp-format): * lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles) (gnus-agent-read-agentview, gnus-agent-expire-group-1) (gnus-agent-request-article, gnus-agent-regenerate-group) (gnus-agent-update-files-total-fetched-for) (gnus-agent-update-view-total-fetched-for): * lisp/gnus/gnus-cache.el (gnus-cache-read-active) (gnus-cache-update-file-total-fetched-for) (gnus-cache-update-overview-total-fetched-for): * lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p): * lisp/gnus/gnus-score.el (gnus-score-score-files): * lisp/gnus/gnus-start.el (gnus-save-newsrc-file) (gnus-master-read-slave-newsrc): * lisp/gnus/gnus-sum.el (gnus-summary-import-article): * lisp/gnus/gnus-util.el (gnus-file-newer-than) (gnus-cache-file-contents): * lisp/gnus/mail-source.el (mail-source-delete-old-incoming) (mail-source-callback, mail-source-movemail): * lisp/gnus/nneething.el (nneething-create-mapping) (nneething-make-head): * lisp/gnus/nnfolder.el (nnfolder-read-folder): * lisp/gnus/nnheader.el (nnheader-file-size) (nnheader-insert-nov-file): * lisp/gnus/nnmail.el (nnmail-activate): * lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum) (nnmaildir--new-number, nnmaildir--update-nov) (nnmaildir--scan, nnmaildir-request-scan) (nnmaildir-request-update-info) (nnmaildir-request-expire-articles): * lisp/gnus/nnmh.el (nnmh-request-list-1) (nnmh-request-expire-articles, nnmh-update-gnus-unreads): * lisp/gnus/nnml.el (nnml-request-expire-articles): * lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load) (spam-stat-process-directory, spam-stat-test-directory): * lisp/ido.el (ido-directory-too-big-p) (ido-file-name-all-completions): * lisp/image-dired.el (image-dired-get-thumbnail-image) (image-dired-create-thumb-1): * lisp/info.el (info-insert-file-contents): * lisp/ls-lisp.el (ls-lisp-insert-directory) (ls-lisp-handle-switches, ls-lisp-classify-file) (ls-lisp-format): * lisp/mail/blessmail.el: * lisp/mail/feedmail.el (feedmail-default-date-generator) (feedmail-default-message-id-generator): * lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases) (mail-abbrevs-setup): * lisp/mail/mspools.el (mspools-size-folder): * lisp/mail/rmail.el (rmail-insert-inbox-text): * lisp/mail/sendmail.el (sendmail-sync-aliases): * lisp/mh-e/mh-alias.el (mh-alias-tstamp): * lisp/net/ange-ftp.el (ange-ftp-parse-netrc) (ange-ftp-write-region, ange-ftp-file-newer-than-file-p) (ange-ftp-cf1): * lisp/net/eudcb-mab.el (eudc-mab-query-internal): * lisp/net/eww.el (eww-read-bookmarks): * lisp/net/netrc.el (netrc-parse): * lisp/net/newst-backend.el (newsticker--image-get): * lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file): * lisp/obsolete/fast-lock.el (fast-lock-save-cache): * lisp/obsolete/vc-arch.el (vc-arch-state) (vc-arch-diff3-rej-p): * lisp/org/ob-eval.el (org-babel--shell-command-on-region): * lisp/org/org-attach.el (org-attach-commit): * lisp/org/org-macro.el (org-macro-initialize-templates): * lisp/org/org.el (org-babel-load-file) (org-file-newer-than-p): * lisp/org/ox-html.el (org-html-format-spec): * lisp/org/ox-publish.el (org-publish-find-date) (org-publish-cache-ctime-of-src): * lisp/pcmpl-gnu.el (pcomplete/tar): * lisp/pcmpl-rpm.el (pcmpl-rpm-packages): * lisp/play/cookie1.el (cookie-snarf): * lisp/progmodes/cmacexp.el (c-macro-expansion): * lisp/ps-bdf.el (bdf-file-mod-time): * lisp/server.el (server-ensure-safe-dir): * lisp/simple.el (shell-command-on-region): * lisp/speedbar.el (speedbar-item-info-file-helper) (speedbar-check-obj-this-line): * lisp/thumbs.el (thumbs-cleanup-thumbsdir): * lisp/time.el (display-time-mail-check-directory) (display-time-file-nonempty-p): * lisp/url/url-cache.el (url-is-cached): * lisp/url/url-file.el (url-file-asynch-callback): * lisp/vc/diff-mode.el (diff-delete-if-empty): * lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries): * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): * lisp/vc/vc-cvs.el (vc-cvs-checkout-model) (vc-cvs-state-heuristic, vc-cvs-merge-news) (vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry): * lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1) (vc-hg--ignore-patterns-valid-p) (vc-hg--cached-dirstate-search, vc-hg-state-fast): * lisp/vc/vc-hooks.el (vc-after-save): * lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer): * lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status): * lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file): * lisp/xdg.el (xdg-mime-apps): Prefer (file-attribute-size A) to (nth 7 A), and similarly for other file attributes accessors. * doc/lispref/files.texi (File Attributes): * doc/lispref/intro.texi (Version Info): * doc/lispref/os.texi (Idle Timers): * lisp/erc/erc.el (erc-string-to-emacs-time): * lisp/files.el (file-attribute-access-time) (file-attribute-modification-time) (file-attribute-status-change-time): * lisp/net/tramp-compat.el: (tramp-compat-file-attribute-modification-time) (tramp-compat-file-attribute-size): * src/buffer.c (syms_of_buffer): * src/editfns.c (Fget_internal_run_time): * src/fileio.c (Fvisited_file_modtime) (Fset_visited_file_modtime): * src/keyboard.c (Fcurrent_idle_time): * src/process.c (Fprocess_attributes): Defer implementation details about timestamp format to the section that talks about timestamp format, to make it easier to change the documentation later if timestamp formats are extended. * lisp/gnus/gnus-util.el (gnus-file-newer-than): * lisp/speedbar.el (speedbar-check-obj-this-line): * lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer): Prefer time-less-p to doing it by hand. * lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses. * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Use eql, not eq, to compare integers that might be bignums. * lisp/org/ox-publish.el (org-publish-cache-ctime-of-src): Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
(not (eq (file-attribute-type attributes) t))
(equal (file-attribute-modification-time attributes) modtime)))))
(dired-directory-changed-p, dired-buffer-stale-p): New functions. (dired-internal-noselect): Use dired-directory-changed-p. Eliminate revert messages. (dired-mode): Set buffer-stale-function to dired-buffer-stale-p.
2004-03-23 05:20:11 +00:00
Improve `dired-buffer-stale-p' for remote files * lisp/dired.el (dired-buffer-stale-p): Check for ´file-remote-p' only if `auto-revert-remote-files' is non-nil.
2018-05-14 15:09:18 +00:00
(defvar auto-revert-remote-files)
(dired-directory-changed-p, dired-buffer-stale-p): New functions. (dired-internal-noselect): Use dired-directory-changed-p. Eliminate revert messages. (dired-mode): Set buffer-stale-function to dired-buffer-stale-p.
2004-03-23 05:20:11 +00:00
(defun dired-buffer-stale-p (&optional noconfirm)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Return non-nil if current Dired buffer needs updating.
Improve `dired-buffer-stale-p' for remote files * lisp/dired.el (dired-buffer-stale-p): Check for ´file-remote-p' only if `auto-revert-remote-files' is non-nil.
2018-05-14 15:09:18 +00:00
If NOCONFIRM is non-nil, then this function returns nil for a
remote directory, unless `auto-revert-remote-files' is non-nil.
This feature is used by Auto Revert mode."
(dired-directory-changed-p, dired-buffer-stale-p): New functions. (dired-internal-noselect): Use dired-directory-changed-p. Eliminate revert messages. (dired-mode): Set buffer-stale-function to dired-buffer-stale-p.
2004-03-23 05:20:11 +00:00
(let ((dirname
(if (consp dired-directory) (car dired-directory) dired-directory)))
(and (stringp dirname)
Improve `dired-buffer-stale-p' for remote files * lisp/dired.el (dired-buffer-stale-p): Check for ´file-remote-p' only if `auto-revert-remote-files' is non-nil.
2018-05-14 15:09:18 +00:00
(not (when noconfirm (and (not auto-revert-remote-files)
(file-remote-p dirname))))
(dired-directory-changed-p, dired-buffer-stale-p): New functions. (dired-internal-noselect): Use dired-directory-changed-p. Eliminate revert messages. (dired-mode): Set buffer-stale-function to dired-buffer-stale-p.
2004-03-23 05:20:11 +00:00
(file-readable-p dirname)
(dired-buffer-stale-p): Do not revert buffer that can be written.
2008-08-23 08:03:25 +00:00
;; Do not auto-revert when the dired buffer can be currently
;; written by the user as in `wdired-mode'.
buffer-read-only
(dired-directory-changed-p, dired-buffer-stale-p): New functions. (dired-internal-noselect): Use dired-directory-changed-p. Eliminate revert messages. (dired-mode): Set buffer-stale-function to dired-buffer-stale-p.
2004-03-23 05:20:11 +00:00
(dired-directory-changed-p dirname))))
(dired-auto-revert-buffer): New defcustom. (dired-internal-noselect): Use it.
2009-12-04 21:45:29 +00:00
(defcustom dired-auto-revert-buffer nil
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Automatically revert Dired buffer on revisiting.
If t, revisiting an existing Dired buffer automatically reverts it.
(dired-auto-revert-buffer): New defcustom. (dired-internal-noselect): Use it.
2009-12-04 21:45:29 +00:00
If its value is a function, call this function with the directory
name as single argument and revert the buffer if it returns non-nil.
Otherwise, a message offering to revert the changed dired buffer
is displayed.
Note that this is not the same as `auto-revert-mode' that
periodically reverts at specified time intervals."
:type '(choice
(const :tag "Don't revert" nil)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(const :tag "Always revert visited Dired buffer" t)
(const :tag "Revert changed Dired buffer" dired-directory-changed-p)
(dired-auto-revert-buffer): New defcustom. (dired-internal-noselect): Use it.
2009-12-04 21:45:29 +00:00
(function :tag "Predicate function"))
:group 'dired
:version "23.2")
Fix misalignment in Dired when dired-directory is a cons * lisp/dired.el (dired--need-align-p, dired--align-all-files): New defuns. (dired-internal-noselect): Call dired--align-all-files when dired-directory is a cons (Bug#27762). * test/lisp/dired-tests.el (dired-test-bug27762): Test should pass.
2017-08-01 15:01:45 +00:00
(defun dired--need-align-p ()
"Return non-nil if some file names are misaligned.
The return value is the target column for the file names."
(save-excursion
(goto-char (point-min))
(dired-goto-next-file)
;; Use point difference instead of `current-column', because
;; the former works when `dired-hide-details-mode' is enabled.
(let* ((first (- (point) (point-at-bol)))
(target first))
(while (and (not (eobp))
(progn
(forward-line)
(dired-move-to-filename)))
(when-let* ((distance (- (point) (point-at-bol)))
(higher (> distance target)))
(setq target distance)))
(and (/= first target) target))))
(defun dired--align-all-files ()
"Align all files adding spaces in front of the size column."
(let ((target (dired--need-align-p))
(regexp directory-listing-before-filename-regexp))
(when target
(save-excursion
(goto-char (point-min))
(dired-goto-next-file)
(while (dired-move-to-filename)
;; Use point difference instead of `current-column', because
;; the former works when `dired-hide-details-mode' is enabled.
(let ((distance (- target (- (point) (point-at-bol))))
(inhibit-read-only t))
(unless (zerop distance)
(re-search-backward regexp nil t)
(goto-char (match-beginning 0))
(search-backward-regexp "[[:space:]]" nil t)
(skip-chars-forward "[:space:]")
(insert-char ?\s distance 'inherit))
(forward-line)))))))
(dired-internal-noselect): New arg MODE. If it's non-nil, switch to that nil. (dired-find-buffer-nocreate): New arg MODE.
1995-09-03 17:34:56 +00:00
(defun dired-internal-noselect (dir-or-list &optional switches mode)
dired: Revert buffer when DIRNAME is a cons * lisp/dired.el (dired-internal-noselect): Revert buffer if DIR-OR-LIST is a cons, or dired-directory is a cons and DIR-OR-LIST a string (Bug#7131). Update the comments. * test/lisp/dired-tests.el (dired-test-bug7131): Test should pass.
2017-07-21 04:32:48 +00:00
;; If DIR-OR-LIST is a string and there is an existing dired buffer
;; for it, just leave buffer as it is (don't even call dired-revert).
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; This saves time especially for deep trees or with ange-ftp.
(dired-directory-changed-p, dired-buffer-stale-p): New functions. (dired-internal-noselect): Use dired-directory-changed-p. Eliminate revert messages. (dired-mode): Set buffer-stale-function to dired-buffer-stale-p.
2004-03-23 05:20:11 +00:00
;; The user can type `g' easily, and it is more consistent with find-file.
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; But if SWITCHES are given they are probably different from the
;; buffer's old value, so call dired-sort-other, which does
;; revert the buffer.
dired: Revert buffer when DIRNAME is a cons * lisp/dired.el (dired-internal-noselect): Revert buffer if DIR-OR-LIST is a cons, or dired-directory is a cons and DIR-OR-LIST a string (Bug#7131). Update the comments. * test/lisp/dired-tests.el (dired-test-bug7131): Test should pass.
2017-07-21 04:32:48 +00:00
;; Revert the buffer if DIR-OR-LIST is a cons or `dired-directory'
;; is a cons and DIR-OR-LIST is a string.
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; A pity we can't possibly do "Directory has changed - refresh? "
;; like find-file does.
(dired-internal-noselect): New arg MODE. If it's non-nil, switch to that nil. (dired-find-buffer-nocreate): New arg MODE.
1995-09-03 17:34:56 +00:00
;; Optional argument MODE is passed to dired-find-buffer-nocreate,
;; see there.
* textmodes/ispell.el (ispell-check-version, ispell-send-string): * international/mule.el (load-with-code-conversion): * emacs-lisp/debug.el (debug): * ediff-vers.el (ediff-rcs-get-output-buffer): * dired.el (dired-internal-noselect): Don't let-bind default-major-mode around code that doesn't use it. E.g. buffer creation via get-buffer-create doesn't use it.
2009-08-28 16:29:25 +00:00
(let* ((old-buf (current-buffer))
(dirname (if (consp dir-or-list) (car dir-or-list) dir-or-list))
;; Look for an existing buffer.
(buffer (dired-find-buffer-nocreate dirname mode))
;; Note that buffer already is in dired-mode, if found.
(new-buffer-p (null buffer)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(or buffer
* textmodes/ispell.el (ispell-check-version, ispell-send-string): * international/mule.el (load-with-code-conversion): * emacs-lisp/debug.el (debug): * ediff-vers.el (ediff-rcs-get-output-buffer): * dired.el (dired-internal-noselect): Don't let-bind default-major-mode around code that doesn't use it. E.g. buffer creation via get-buffer-create doesn't use it.
2009-08-28 16:29:25 +00:00
(setq buffer (create-file-buffer (directory-file-name dirname))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(set-buffer buffer)
(dired-directory-changed-p, dired-buffer-stale-p): New functions. (dired-internal-noselect): Use dired-directory-changed-p. Eliminate revert messages. (dired-mode): Set buffer-stale-function to dired-buffer-stale-p.
2004-03-23 05:20:11 +00:00
(if (not new-buffer-p) ; existing buffer ...
(cond (switches ; ... but new switches
(dired-internal-noselect): Set dired-directory when refreshing a buffer that displays a list of files. (dired-find-buffer-nocreate): Handle the case when dired-directory is a list. (dired-sort-other): Don't set mode-name if we are not in dired-mode.
1995-09-08 20:38:17 +00:00
;; file list may have changed
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(setq dired-directory dir-or-list)
(dired-internal-noselect): Set dired-directory when refreshing a buffer that displays a list of files. (dired-find-buffer-nocreate): Handle the case when dired-directory is a list. (dired-sort-other): Don't set mode-name if we are not in dired-mode.
1995-09-08 20:38:17 +00:00
;; this calls dired-revert
Cygwin support patch.
2003-01-31 15:24:20 +00:00
(dired-sort-other switches))
dired: Revert buffer when DIRNAME is a cons * lisp/dired.el (dired-internal-noselect): Revert buffer if DIR-OR-LIST is a cons, or dired-directory is a cons and DIR-OR-LIST a string (Bug#7131). Update the comments. * test/lisp/dired-tests.el (dired-test-bug7131): Test should pass.
2017-07-21 04:32:48 +00:00
;; Always revert when `dir-or-list' is a cons. Also revert
;; if `dired-directory' is a cons but `dir-or-list' is not.
((or (consp dir-or-list) (consp dired-directory))
(setq dired-directory dir-or-list)
(revert-buffer))
(dired-auto-revert-buffer): New defcustom. (dired-internal-noselect): Use it.
2009-12-04 21:45:29 +00:00
;; Always revert regardless of whether it has changed or not.
((eq dired-auto-revert-buffer t)
(revert-buffer))
;; Revert when predicate function returns non-nil.
((functionp dired-auto-revert-buffer)
(when (funcall dired-auto-revert-buffer dirname)
(revert-buffer)
(message "Changed directory automatically updated")))
(dired-internal-noselect): Set dired-directory when refreshing a buffer that displays a list of files. (dired-find-buffer-nocreate): Handle the case when dired-directory is a list. (dired-sort-other): Don't set mode-name if we are not in dired-mode.
1995-09-08 20:38:17 +00:00
;; If directory has changed on disk, offer to revert.
(dired-directory-changed-p, dired-buffer-stale-p): New functions. (dired-internal-noselect): Use dired-directory-changed-p. Eliminate revert messages. (dired-mode): Set buffer-stale-function to dired-buffer-stale-p.
2004-03-23 05:20:11 +00:00
((when (dired-directory-changed-p dirname)
(dired-internal-noselect): Pass proper format string to message.
1996-01-25 00:52:48 +00:00
(message "%s"
Fix indentation.
1996-01-25 07:09:48 +00:00
(substitute-command-keys
"Directory has changed on disk; type \\[revert-buffer] to update Dired")))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Else a new buffer
(dired-readin-insert): Expand default-directory and dirname before comparing them. (dired-internal-noselect): Set default-directory to abbreviated name.
1993-11-22 09:29:51 +00:00
(setq default-directory
Dired: Handle posix wildcards in directory part Allow Dired to handle calls like \(dired \"~/foo/*/*.el\"), that is, with wildcards within the directory part of the file argument (Bug#27631). * lisp/files.el (insert-directory-wildcard-in-dir-p): New predicate. (insert-directory-clean): New defun extracted from insert-directory. (insert-directory) * lisp/dired.el (dired-internal-noselect) (dired-insert-directory): Use the new predicate; when it's true, handle the directory wildcards with a shell call. * lisp/eshell/em-ls.el (eshell-ls-use-in-dired): Add/remove both advices. (eshell-ls-unload-hook): New defun. Use it in eshell-ls-unload-hook instead of an anonymous function. (eshell-ls--dired) * lisp/ls-lisp.el (ls-lisp--dired): Advice dired to handle wildcards in the directory part with both eshell-ls and ls-lisp. * etc/NEWS: Announce it. * doc/emacs/dired.texi (Dired Enter): Update manual. * test/lisp/dired-tests.el (dired-test-bug27631): Add test.
2017-07-30 02:02:49 +00:00
(or (car-safe (insert-directory-wildcard-in-dir-p dirname))
;; We can do this unconditionally
;; because dired-noselect ensures that the name
;; is passed in directory name syntax
;; if it was the name of a directory at all.
(file-name-directory dirname)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(or switches (setq switches dired-listing-switches))
(dired-internal-noselect): Call either dired-mode or MODE, but not both.
1998-06-05 12:46:02 +00:00
(if mode (funcall mode)
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(dired-mode dir-or-list switches))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; default-directory and dired-actual-switches are set now
;; (buffer-local), so we can call dired-readin:
(let ((failed t))
(unwind-protect
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(progn (dired-readin)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(setq failed nil))
;; dired-readin can fail if parent directories are inaccessible.
;; Don't leave an empty buffer around in that case.
(if failed (kill-buffer buffer))))
(goto-char (point-min))
(dired-initial-position dirname))
Fix misalignment in Dired when dired-directory is a cons * lisp/dired.el (dired--need-align-p, dired--align-all-files): New defuns. (dired-internal-noselect): Call dired--align-all-files when dired-directory is a cons (Bug#27762). * test/lisp/dired-tests.el (dired-test-bug27762): Test should pass.
2017-08-01 15:01:45 +00:00
(when (consp dired-directory)
(dired--align-all-files))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(set-buffer old-buf)
Initial revision
1992-05-30 23:52:26 +00:00
buffer))
(dired-find-alternate-file): New function. (dired-mode-map): Bind `a' to dired-find-alternate-file. (toplevel): Require dired-aux when compiling. (dired-buffers): Move defvar within file to avoid compiler warning.
2000-07-07 13:00:21 +00:00
(defvar dired-buffers nil
;; Enlarged by dired-advertise
;; Queried by function dired-buffers-for-dir. When this detects a
;; killed buffer, it is removed from this list.
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Alist of expanded directories and their associated Dired buffers.")
(dired-find-alternate-file): New function. (dired-mode-map): Bind `a' to dired-find-alternate-file. (toplevel): Require dired-aux when compiling. (dired-buffers): Move defvar within file to avoid compiler warning.
2000-07-07 13:00:21 +00:00
Merge dired-x's dired-find-buffer-nocreate into dired.el. * lisp/dired-x.el (dired-find-buffer-nocreate): Merge into dired.el. * lisp/dired.el (dired-find-buffer-nocreate): Merge dired-x version. * doc/misc/dired-x.texi (Technical Details): No longer redefines dired-find-buffer-nocreate.
2011-02-19 20:36:54 +00:00
(defvar dired-find-subdir)
;; FIXME add a doc-string, and document dired-x extensions.
(dired-internal-noselect): New arg MODE. If it's non-nil, switch to that nil. (dired-find-buffer-nocreate): New arg MODE.
1995-09-03 17:34:56 +00:00
(defun dired-find-buffer-nocreate (dirname &optional mode)
;; This differs from dired-buffers-for-dir in that it does not consider
;; subdirs of default-directory and searches for the first match only.
;; Also, the major mode must be MODE.
Merge dired-x's dired-find-buffer-nocreate into dired.el. * lisp/dired-x.el (dired-find-buffer-nocreate): Merge into dired.el. * lisp/dired.el (dired-find-buffer-nocreate): Merge dired-x version. * doc/misc/dired-x.texi (Technical Details): No longer redefines dired-find-buffer-nocreate.
2011-02-19 20:36:54 +00:00
(if (and (featurep 'dired-x)
dired-find-subdir
;; Don't try to find a wildcard as a subdirectory.
(string-equal dirname (file-name-directory dirname)))
(let* ((cur-buf (current-buffer))
(buffers (nreverse
(dired-buffers-for-dir (expand-file-name dirname))))
(cur-buf-matches (and (memq cur-buf buffers)
;; Wildcards must match, too:
(equal dired-directory dirname))))
;; We don't want to switch to the same buffer---
(setq buffers (delq cur-buf buffers))
(or (car (sort buffers #'dired-buffer-more-recently-used-p))
;; ---unless it's the only possibility:
(and cur-buf-matches cur-buf)))
;; No dired-x, or dired-find-subdir nil.
(setq dirname (expand-file-name dirname))
(let (found (blist dired-buffers)) ; was (buffer-list)
(or mode (setq mode 'dired-mode))
(while blist
(if (null (buffer-name (cdr (car blist))))
(setq blist (cdr blist))
(with-current-buffer (cdr (car blist))
(if (and (eq major-mode mode)
dired-directory ;; nil during find-alternate-file
(equal dirname
(expand-file-name
(if (consp dired-directory)
(car dired-directory)
dired-directory))))
(setq found (cdr (car blist))
blist nil)
(setq blist (cdr blist))))))
found)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Read in a new dired buffer
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(defun dired-readin ()
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Read in a new Dired buffer.
(dired-align-file): Don't assume line starts with spaces.
2004-11-22 05:07:07 +00:00
Differs from `dired-insert-subdir' in that it accepts
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
wildcards, erases the buffer, and builds the subdir-alist anew
\(including making it buffer-local and clearing it first)."
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; default-directory and dired-actual-switches must be buffer-local
;; and initialized by now.
(dired-readin): Inhibit modification hooks.
2008-12-22 19:28:44 +00:00
(let (dirname
Fix doc typos * lisp/simple.el (line-move-ignore-invisible): * lisp/sort.el (sort-regexp-fields): * lisp/cedet/ede.el (project-add-file): * lisp/gnus/message.el (message-bogus-recipient-p): * lisp/international/mule.el (define-coding-system): * lisp/progmodes/ebrowse.el (ebrowse-member-buffer-object-menu): * lisp/progmodes/xscheme.el (xscheme-allow-output-p) (scheme-interaction-mode, scheme-debugger-mode) (xscheme-yank-pop, xscheme-yank-push): Doc fixes.
2017-10-29 00:10:25 +00:00
;; This makes read-in much faster.
(dired-readin): Inhibit modification hooks.
2008-12-22 19:28:44 +00:00
;; In particular, it prevents the font lock hook from running
;; until the directory is all read in.
(inhibit-modification-hooks t))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(if (consp dired-directory)
(setq dirname (car dired-directory))
(setq dirname dired-directory))
dired-noselect, dired-internal-noselect, dired-insert-directory: Enhancements to support passing dired a DIRNAME argument consisting of a directory-name car and a list-of-files cdr. This is needed to support VC's augmented dired, which wants a filtered file display that recurses (showing all version-controlled files in subdirectories as well as the top-level ones).
1993-04-08 16:35:59 +00:00
(setq dirname (expand-file-name dirname))
(save-excursion
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
;; This hook which may want to modify dired-actual-switches
;; based on dired-directory, e.g. with ange-ftp to a SysV host
;; where ls won't understand -Al switches.
(run-hooks 'dired-before-readin-hook)
(if (consp buffer-undo-list)
(setq buffer-undo-list nil))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(setq-local file-name-coding-system
(or coding-system-for-read file-name-coding-system))
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(let ((inhibit-read-only t)
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
;; Don't make undo entries for readin.
(buffer-undo-list t))
dired-noselect, dired-internal-noselect, dired-insert-directory: Enhancements to support passing dired a DIRNAME argument consisting of a directory-name car and a list-of-files cdr. This is needed to support VC's augmented dired, which wants a filtered file display that recurses (showing all version-controlled files in subdirectories as well as the top-level ones).
1993-04-08 16:35:59 +00:00
(widen)
(erase-buffer)
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(dired-readin-insert))
(goto-char (point-min))
dired-noselect, dired-internal-noselect, dired-insert-directory: Enhancements to support passing dired a DIRNAME argument consisting of a directory-name car and a list-of-files cdr. This is needed to support VC's augmented dired, which wants a filtered file display that recurses (showing all version-controlled files in subdirectories as well as the top-level ones).
1993-04-08 16:35:59 +00:00
;; Must first make alist buffer local and set it to nil because
;; dired-build-subdir-alist will call dired-clear-alist first
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(setq-local dired-subdir-alist nil)
(dired-readin): Clear modified flag at the very end.
1994-05-20 23:56:40 +00:00
(dired-build-subdir-alist)
(dired-readin): Record the directory's modtime. (dired-internal-noselect): Offer to revert if dir has changed.
1994-06-28 08:36:16 +00:00
(let ((attributes (file-attributes dirname)))
(if (eq (car attributes) t)
file-attributes cleanup Mostly, this replaces magic-number calls like (nth 4 A) with more-informative calls like (file-attribute-access-time A). It also fixes some documentation and minor timestamp coding issues that I noticed while looking into this. * doc/lispref/files.texi (File Attributes): * lisp/files.el (file-attribute-size) (file-attribute-inode-number, file-attribute-device-number): * src/dired.c (Fdirectory_files_and_attributes) (Ffile_attributes): Mention which attributes must be integers, or nonnegative integers, as opposed to merely being numbers. Remove no-longer-correct talk about representing large integers as conses of integers. * doc/lispref/files.texi (Magic File Names): * doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary): * lisp/autorevert.el (auto-revert-find-file-function) (auto-revert-tail-mode, auto-revert-handler): * lisp/auth-source.el (auth-source-netrc-parse): * lisp/cedet/ede/files.el (ede--inode-for-dir): * lisp/cedet/semantic/db-file.el (object-write): * lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook): * lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p) (semanticdb-synchronize): * lisp/cedet/srecode/table.el (srecode-mode-table-new): * lisp/desktop.el (desktop-save, desktop-read): * lisp/dired-aux.el (dired-file-set-difference) (dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive) (dired-create-files): * lisp/dired.el (dired-directory-changed-p, dired-readin): * lisp/dos-w32.el (w32-direct-print-region-helper): * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads) (autoload-find-destination, update-directory-autoloads): * lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent): * lisp/epg.el (epg--start, epg-wait-for-completion): * lisp/eshell/em-ls.el (eshell-ls-filetype-p) (eshell-ls-applicable, eshell-ls-size-string) (eshell-ls-file, eshell-ls-dir, eshell-ls-files) (eshell-ls-entries): * lisp/eshell/em-pred.el (eshell-predicate-alist) (eshell-pred-file-type, eshell-pred-file-links) (eshell-pred-file-size): * lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat) (eshell-du-sum-directory, eshell/du): * lisp/eshell/esh-util.el (eshell-read-passwd) (eshell-read-hosts): * lisp/files.el (remote-file-name-inhibit-cache) (find-file-noselect, insert-file-1, dir-locals-find-file) (dir-locals-read-from-dir, backup-buffer) (file-ownership-preserved-p, copy-directory) (read-file-modes): * lisp/find-lisp.el (find-lisp-format): * lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles) (gnus-agent-read-agentview, gnus-agent-expire-group-1) (gnus-agent-request-article, gnus-agent-regenerate-group) (gnus-agent-update-files-total-fetched-for) (gnus-agent-update-view-total-fetched-for): * lisp/gnus/gnus-cache.el (gnus-cache-read-active) (gnus-cache-update-file-total-fetched-for) (gnus-cache-update-overview-total-fetched-for): * lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p): * lisp/gnus/gnus-score.el (gnus-score-score-files): * lisp/gnus/gnus-start.el (gnus-save-newsrc-file) (gnus-master-read-slave-newsrc): * lisp/gnus/gnus-sum.el (gnus-summary-import-article): * lisp/gnus/gnus-util.el (gnus-file-newer-than) (gnus-cache-file-contents): * lisp/gnus/mail-source.el (mail-source-delete-old-incoming) (mail-source-callback, mail-source-movemail): * lisp/gnus/nneething.el (nneething-create-mapping) (nneething-make-head): * lisp/gnus/nnfolder.el (nnfolder-read-folder): * lisp/gnus/nnheader.el (nnheader-file-size) (nnheader-insert-nov-file): * lisp/gnus/nnmail.el (nnmail-activate): * lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum) (nnmaildir--new-number, nnmaildir--update-nov) (nnmaildir--scan, nnmaildir-request-scan) (nnmaildir-request-update-info) (nnmaildir-request-expire-articles): * lisp/gnus/nnmh.el (nnmh-request-list-1) (nnmh-request-expire-articles, nnmh-update-gnus-unreads): * lisp/gnus/nnml.el (nnml-request-expire-articles): * lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load) (spam-stat-process-directory, spam-stat-test-directory): * lisp/ido.el (ido-directory-too-big-p) (ido-file-name-all-completions): * lisp/image-dired.el (image-dired-get-thumbnail-image) (image-dired-create-thumb-1): * lisp/info.el (info-insert-file-contents): * lisp/ls-lisp.el (ls-lisp-insert-directory) (ls-lisp-handle-switches, ls-lisp-classify-file) (ls-lisp-format): * lisp/mail/blessmail.el: * lisp/mail/feedmail.el (feedmail-default-date-generator) (feedmail-default-message-id-generator): * lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases) (mail-abbrevs-setup): * lisp/mail/mspools.el (mspools-size-folder): * lisp/mail/rmail.el (rmail-insert-inbox-text): * lisp/mail/sendmail.el (sendmail-sync-aliases): * lisp/mh-e/mh-alias.el (mh-alias-tstamp): * lisp/net/ange-ftp.el (ange-ftp-parse-netrc) (ange-ftp-write-region, ange-ftp-file-newer-than-file-p) (ange-ftp-cf1): * lisp/net/eudcb-mab.el (eudc-mab-query-internal): * lisp/net/eww.el (eww-read-bookmarks): * lisp/net/netrc.el (netrc-parse): * lisp/net/newst-backend.el (newsticker--image-get): * lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file): * lisp/obsolete/fast-lock.el (fast-lock-save-cache): * lisp/obsolete/vc-arch.el (vc-arch-state) (vc-arch-diff3-rej-p): * lisp/org/ob-eval.el (org-babel--shell-command-on-region): * lisp/org/org-attach.el (org-attach-commit): * lisp/org/org-macro.el (org-macro-initialize-templates): * lisp/org/org.el (org-babel-load-file) (org-file-newer-than-p): * lisp/org/ox-html.el (org-html-format-spec): * lisp/org/ox-publish.el (org-publish-find-date) (org-publish-cache-ctime-of-src): * lisp/pcmpl-gnu.el (pcomplete/tar): * lisp/pcmpl-rpm.el (pcmpl-rpm-packages): * lisp/play/cookie1.el (cookie-snarf): * lisp/progmodes/cmacexp.el (c-macro-expansion): * lisp/ps-bdf.el (bdf-file-mod-time): * lisp/server.el (server-ensure-safe-dir): * lisp/simple.el (shell-command-on-region): * lisp/speedbar.el (speedbar-item-info-file-helper) (speedbar-check-obj-this-line): * lisp/thumbs.el (thumbs-cleanup-thumbsdir): * lisp/time.el (display-time-mail-check-directory) (display-time-file-nonempty-p): * lisp/url/url-cache.el (url-is-cached): * lisp/url/url-file.el (url-file-asynch-callback): * lisp/vc/diff-mode.el (diff-delete-if-empty): * lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries): * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): * lisp/vc/vc-cvs.el (vc-cvs-checkout-model) (vc-cvs-state-heuristic, vc-cvs-merge-news) (vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry): * lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1) (vc-hg--ignore-patterns-valid-p) (vc-hg--cached-dirstate-search, vc-hg-state-fast): * lisp/vc/vc-hooks.el (vc-after-save): * lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer): * lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status): * lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file): * lisp/xdg.el (xdg-mime-apps): Prefer (file-attribute-size A) to (nth 7 A), and similarly for other file attributes accessors. * doc/lispref/files.texi (File Attributes): * doc/lispref/intro.texi (Version Info): * doc/lispref/os.texi (Idle Timers): * lisp/erc/erc.el (erc-string-to-emacs-time): * lisp/files.el (file-attribute-access-time) (file-attribute-modification-time) (file-attribute-status-change-time): * lisp/net/tramp-compat.el: (tramp-compat-file-attribute-modification-time) (tramp-compat-file-attribute-size): * src/buffer.c (syms_of_buffer): * src/editfns.c (Fget_internal_run_time): * src/fileio.c (Fvisited_file_modtime) (Fset_visited_file_modtime): * src/keyboard.c (Fcurrent_idle_time): * src/process.c (Fprocess_attributes): Defer implementation details about timestamp format to the section that talks about timestamp format, to make it easier to change the documentation later if timestamp formats are extended. * lisp/gnus/gnus-util.el (gnus-file-newer-than): * lisp/speedbar.el (speedbar-check-obj-this-line): * lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer): Prefer time-less-p to doing it by hand. * lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses. * lisp/vc/vc-bzr.el (vc-bzr-state-heuristic): Use eql, not eq, to compare integers that might be bignums. * lisp/org/ox-publish.el (org-publish-cache-ctime-of-src): Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
(set-visited-file-modtime (file-attribute-modification-time
attributes))))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(set-buffer-modified-p nil)
;; No need to narrow since the whole buffer contains just
;; dired-readin's output, nothing else. The hook can
;; successfully use dired functions (e.g. dired-get-filename)
;; as the subdir-alist has been built in dired-readin.
(run-hooks 'dired-after-readin-hook))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Subroutines of dired-readin
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(defun dired-readin-insert ()
;; Insert listing for the specified dir (and maybe file list)
;; already in dired-directory, assuming a clean buffer.
(let (dir file-list)
(if (consp dired-directory)
(setq dir (car dired-directory)
file-list (cdr dired-directory))
(setq dir dired-directory
file-list nil))
(dired-readin-insert): Expand dired-directory.
2002-10-16 21:27:40 +00:00
(setq dir (expand-file-name dir))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(if (and (equal "" (file-name-nondirectory dir))
(not file-list))
(dired-readin-insert): If we got a list of files, pass nil for WILDCARD arg to dired-insert-directory. (dired-readin-insert): Don't use the "whole directory" case if DIR-OR-LIST is a list.
1993-07-26 05:56:43 +00:00
;; If we are reading a whole single directory...
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(dired-insert-directory dir dired-actual-switches nil nil t)
Dired: Handle posix wildcards in directory part Allow Dired to handle calls like \(dired \"~/foo/*/*.el\"), that is, with wildcards within the directory part of the file argument (Bug#27631). * lisp/files.el (insert-directory-wildcard-in-dir-p): New predicate. (insert-directory-clean): New defun extracted from insert-directory. (insert-directory) * lisp/dired.el (dired-internal-noselect) (dired-insert-directory): Use the new predicate; when it's true, handle the directory wildcards with a shell call. * lisp/eshell/em-ls.el (eshell-ls-use-in-dired): Add/remove both advices. (eshell-ls-unload-hook): New defun. Use it in eshell-ls-unload-hook instead of an anonymous function. (eshell-ls--dired) * lisp/ls-lisp.el (ls-lisp--dired): Advice dired to handle wildcards in the directory part with both eshell-ls and ls-lisp. * etc/NEWS: Announce it. * doc/emacs/dired.texi (Dired Enter): Update manual. * test/lisp/dired-tests.el (dired-test-bug27631): Add test.
2017-07-30 02:02:49 +00:00
(if (and (not (insert-directory-wildcard-in-dir-p dir))
(not (file-readable-p
(directory-file-name (file-name-directory dir)))))
(error "Directory %s inaccessible or nonexistent" dir))
;; Else treat it as a wildcard spec
;; unless we have an explicit list of files.
(dired-insert-directory dir dired-actual-switches
file-list (not file-list) t))))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
(defun dired-align-file (beg end)
"Align the fields of a file to the ones of surrounding lines.
BEG..END is the line where the file info is located."
;; Some versions of ls try to adjust the size of each field so as to just
;; hold the largest element ("largest" in the current invocation, of
;; course). So when a single line is output, the size of each field is
;; just big enough for that one output. Thus when dired refreshes one
;; line, the alignment if this line w.r.t the rest is messed up because
;; the fields of that one line will generally be smaller.
;;
* files.el (directory-listing-before-filename-regexp): New defvar. Replaces `dired-move-to-filename-regexp' from dired.el. * dired.el (dired-move-to-filename-regexp): Removed. All occurences replaced by `directory-listing-before-filename-regexp'. * dired-x.el, locate.el, vc.el: Replace `dired-move-to-filename-regexp' by `directory-listing-before-filename-regexp'. In vc.el it is overwritten locally; maybe this can be handled in files.el too. * net/ange-ftp.el (ange-ftp-date-regexp): Removed. All occurences replaced by `directory-listing-before-filename-regexp'. * faq.texi (Bugs and problems): Replace `dired-move-to-filename-regexp' by `directory-listing-before-filename-regexp'.
2005-10-23 12:17:28 +00:00
;; To work around this problem, we here add spaces to try and
;; re-align the fields as needed. Since this is purely aesthetic,
;; it is of utmost importance that it doesn't mess up anything like
;; `dired-move-to-filename'. To this end, we limit ourselves to
;; adding spaces only, and to only add them at places where there
;; was already at least one space. This way, as long as
;; `directory-listing-before-filename-regexp' always matches spaces
;; with "*" or "+", we know we haven't made anything worse. There
;; is one spot where the exact number of spaces is important, which
;; is just before the actual filename, so we refrain from adding
;; spaces there (and within the filename as well, of course).
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
(save-excursion
(let (file file-col other other-col)
Spelling fixes.
2011-11-14 23:59:56 +00:00
;; Check that there is indeed a file, and that there is another adjacent
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
;; file with which to align, and that additional spaces are needed to
;; align the filenames.
(when (and (setq file (progn (goto-char beg)
(dired-move-to-filename nil end)))
(setq file-col (current-column))
(setq other
(or (and (goto-char beg)
(zerop (forward-line -1))
(dired-move-to-filename))
(and (goto-char beg)
(zerop (forward-line 1))
(dired-move-to-filename))))
(setq other-col (current-column))
(/= file other)
;; Make sure there is some work left to do.
(> other-col file-col))
;; If we've only looked at the line above, check to see if the line
;; below exists as well and if so, align with the shorter one.
(when (and (< other file)
(goto-char beg)
(zerop (forward-line 1))
(dired-move-to-filename))
(let ((alt-col (current-column)))
(when (< alt-col other-col)
(setq other-col alt-col)
(setq other (point)))))
;; Keep positions uptodate when we insert stuff.
(if (> other file) (setq other (copy-marker other)))
(setq file (copy-marker file))
;; Main loop.
(goto-char beg)
(dired-align-file): Don't assume line starts with spaces.
2004-11-22 05:07:07 +00:00
(skip-chars-forward " ") ;Skip to the first field.
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
(while (and (> other-col file-col)
;; Don't touch anything just before (and after) the
;; beginning of the filename.
(> file (point)))
;; We're now just in front of a field, with a space behind us.
(let* ((curcol (current-column))
;; Nums are right-aligned.
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(num-align (looking-at-p "[0-9]"))
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
;; Let's look at the other line, in the same column: we
;; should be either near the end of the previous field, or
;; in the space between that field and the next.
;; [ Of course, it's also possible that we're already within
;; the next field or even past it, but that's unlikely since
;; other-col > file-col. ]
;; Let's find the distance to the alignment-point (either
;; the beginning or the end of the next field, depending on
;; whether this field is left or right aligned).
(align-pt-offset
(save-excursion
(goto-char other)
(move-to-column curcol)
(when (looking-at
(concat
(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.
2005-07-20 14:08:39 +00:00
(if (eq (char-before) ?\s) " *" "[^ ]* *")
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
(if num-align "[0-9][^ ]*")))
(- (match-end 0) (match-beginning 0)))))
;; Now, the number of spaces to insert is align-pt-offset
;; minus the distance to the equivalent point on the
;; current line.
(spaces
(if (not num-align)
align-pt-offset
(and align-pt-offset
(save-excursion
(skip-chars-forward "^ ")
(- align-pt-offset (- (current-column) curcol)))))))
(when (and spaces (> spaces 0))
(setq file-col (+ spaces file-col))
(if (> file-col other-col)
(setq spaces (- spaces (- file-col other-col))))
dired-align-file: Inherit text properties in inserted spaces * lisp/dired.el (dired-align-file): Inherit text properties in inserted spaces (Bug#27899). * test/lisp/dired-tests.el (dired-test-bug27899): Add test.
2017-08-02 08:52:57 +00:00
(insert-char ?\s spaces 'inherit)
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
;; Let's just make really sure we did not mess up.
(unless (save-excursion
(dired-align-file): Don't assume line starts with spaces.
2004-11-22 05:07:07 +00:00
(eq (dired-move-to-filename) (marker-position file)))
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
;; Damn! We messed up: let's revert the change.
(dired-align-file): Don't assume line starts with spaces.
2004-11-22 05:07:07 +00:00
(delete-char (- spaces)))))
;; Now skip to next field.
(skip-chars-forward "^ ") (skip-chars-forward " "))
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
(set-marker file nil)))))
(dired-align-file): Don't assume line starts with spaces.
2004-11-22 05:07:07 +00:00
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
Fix Dired on DOS/Windows. dired.el (dired-insert-directory): Don't invoke `ls' when ls-lisp.el is used to emulate it.
2011-02-02 16:21:52 +00:00
(defvar ls-lisp-use-insert-directory-program)
* lisp/dired.el (dired-check-switches, dired-switches-recursive-p): New functions. (dired-switches-escape-p, dired-move-to-end-of-filename): Use `dired-check-switches'. (dired-insert-old-subdirs, dired-build-subdir-alist) (dired-sort-R-check): Use `dired-switches-recursive-p'. Fixes: debbugs:17218
2014-05-03 09:22:59 +00:00
(defun dired-check-switches (switches short &optional long)
"Return non-nil if the string SWITCHES matches LONG or SHORT format."
(let (case-fold-search)
(and (stringp switches)
(string-match-p (concat "\\(\\`\\| \\)-[[:alnum:]]*" short
(if long (concat "\\|--" long "\\>") ""))
switches))))
dired fix for `ls -b' quoting of spaces (bug#10469) * lisp/dired.el (dired-switches-escape-p): New function. (dired-insert-directory): Use dired-switches-escape-p. (dired-get-filename): Undo "\ " quoting if needed.
2012-01-13 23:09:28 +00:00
(defun dired-switches-escape-p (switches)
"Return non-nil if the string SWITCHES contains -b or --escape."
;; Do not match things like "--block-size" that happen to contain "b".
* lisp/dired.el (dired-check-switches, dired-switches-recursive-p): New functions. (dired-switches-escape-p, dired-move-to-end-of-filename): Use `dired-check-switches'. (dired-insert-old-subdirs, dired-build-subdir-alist) (dired-sort-R-check): Use `dired-switches-recursive-p'. Fixes: debbugs:17218
2014-05-03 09:22:59 +00:00
(dired-check-switches switches "b" "escape"))
(defun dired-switches-recursive-p (switches)
"Return non-nil if the string SWITCHES contains -R or --recursive."
(dired-check-switches switches "R" "recursive"))
dired fix for `ls -b' quoting of spaces (bug#10469) * lisp/dired.el (dired-switches-escape-p): New function. (dired-insert-directory): Use dired-switches-escape-p. (dired-get-filename): Undo "\ " quoting if needed.
2012-01-13 23:09:28 +00:00
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(defun dired-insert-directory (dir switches &optional file-list wildcard hdr)
"Insert a directory listing of DIR, Dired style.
Use SWITCHES to make the listings.
If FILE-LIST is non-nil, list only those files.
Otherwise, if WILDCARD is non-nil, expand wildcards;
in that case, DIR should be a file name that uses wildcards.
In other cases, DIR should be a directory name or a directory filename.
If HDR is non-nil, insert a header line with the directory name."
(dired-insert-directory): Quote certain chars with \. (dired-get-filename): Always unquote \ quoting.
1994-12-07 10:57:12 +00:00
(let ((opoint (point))
(dired-insert-directory): Force use of C locale.
1996-01-04 00:32:19 +00:00
(process-environment (copy-sequence process-environment))
(dired-insert-directory): Quote certain chars with \. (dired-get-filename): Always unquote \ quoting.
1994-12-07 10:57:12 +00:00
end)
Fix Dired on DOS/Windows. dired.el (dired-insert-directory): Don't invoke `ls' when ls-lisp.el is used to emulate it.
2011-02-02 16:21:52 +00:00
(if (and
;; Don't try to invoke `ls' if we are on DOS/Windows where
;; ls-lisp emulation is used, except if they want to use `ls'
;; as indicated by `ls-lisp-use-insert-directory-program'.
(not (and (featurep 'ls-lisp)
(null ls-lisp-use-insert-directory-program)))
Eshell dependencies: Fix recent regressions * lisp/dired.el (dired-insert-directory): Tweak bug#27817's ugly hack. * lisp/eshell/em-ls.el: Refine 'require's. * lisp/eshell/esh-opt.el: Require esh-util on behalf of its clients.
2019-04-10 14:11:50 +00:00
;; FIXME: Big ugly hack for Eshell's eshell-ls-use-in-dired.
(not (bound-and-true-p eshell-ls-use-in-dired))
* lisp/dired.el (dired-insert-directory): Move `file-remote-p' check up.
2017-07-30 11:11:00 +00:00
(or (file-remote-p dir)
(if (eq dired-use-ls-dired 'unspecified)
Fix Dired on DOS/Windows. dired.el (dired-insert-directory): Don't invoke `ls' when ls-lisp.el is used to emulate it.
2011-02-02 16:21:52 +00:00
;; Check whether "ls --dired" gives exit code 0, and
;; save the answer in `dired-use-ls-dired'.
Small dired fixes related to bug#9039. * lisp/dired.el (dired-use-ls-dired): Doc fix. (dired-insert-directory): Give a message the first time if ls is found not to support --dired.
2011-07-13 17:34:31 +00:00
(or (setq dired-use-ls-dired
(eq 0 (call-process insert-directory-program
* lisp/dired.el (dired-insert-directory): Move `file-remote-p' check up.
2017-07-30 11:11:00 +00:00
nil nil nil "--dired")))
Small dired fixes related to bug#9039. * lisp/dired.el (dired-use-ls-dired): Doc fix. (dired-insert-directory): Give a message the first time if ls is found not to support --dired.
2011-07-13 17:34:31 +00:00
(progn
(message "ls does not support --dired; \
see `dired-use-ls-dired' for more details.")
nil))
* lisp/dired.el (dired-insert-directory): Move `file-remote-p' check up.
2017-07-30 11:11:00 +00:00
dired-use-ls-dired)))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(setq switches (concat "--dired " switches)))
Dired: Handle posix wildcards in directory part Allow Dired to handle calls like \(dired \"~/foo/*/*.el\"), that is, with wildcards within the directory part of the file argument (Bug#27631). * lisp/files.el (insert-directory-wildcard-in-dir-p): New predicate. (insert-directory-clean): New defun extracted from insert-directory. (insert-directory) * lisp/dired.el (dired-internal-noselect) (dired-insert-directory): Use the new predicate; when it's true, handle the directory wildcards with a shell call. * lisp/eshell/em-ls.el (eshell-ls-use-in-dired): Add/remove both advices. (eshell-ls-unload-hook): New defun. Use it in eshell-ls-unload-hook instead of an anonymous function. (eshell-ls--dired) * lisp/ls-lisp.el (ls-lisp--dired): Advice dired to handle wildcards in the directory part with both eshell-ls and ls-lisp. * etc/NEWS: Announce it. * doc/emacs/dired.texi (Dired Enter): Update manual. * test/lisp/dired-tests.el (dired-test-bug27631): Add test.
2017-07-30 02:02:49 +00:00
;; Expand directory wildcards and fill file-list.
(let ((dir-wildcard (insert-directory-wildcard-in-dir-p dir)))
(cond (dir-wildcard
(setq switches (concat "-d " switches))
Small adaptions for directory wildcards * lisp/dired.el (dired-insert-directory): Remove "--dired" when there are wildcards, and the directory is remote. * test/lisp/net/tramp-tests.el (tramp--test-make-temp-name): Adapt docstring. (tramp-test17-dired-with-wildcards): Skip for all methods but those from tamp-sh.p.
2017-07-31 12:32:24 +00:00
;; We don't know whether the remote ls supports
;; "--dired", so we cannot add it to the `process-file'
;; call for wildcards.
(when (file-remote-p dir)
(setq switches (dired-replace-in-string "--dired" "" switches)))
Don't assume /bin/sh as the 'sh' location in the local host * lisp/dired.el (dired-insert-directory): Use executable-find in a local host.
2017-08-02 07:50:37 +00:00
(let* ((default-directory (car dir-wildcard))
(script (format "ls %s %s" switches (cdr dir-wildcard)))
(remotep (file-remote-p dir))
(sh (or (and remotep "/bin/sh")
(and (bound-and-true-p explicit-shell-file-name)
(executable-find explicit-shell-file-name))
(executable-find "sh")))
(switch (if remotep "-c" shell-command-switch)))
* lisp/dired.el (dired-insert-directory): Move `file-remote-p' check up.
2017-07-30 11:11:00 +00:00
(unless
(zerop
Don't assume /bin/sh as the 'sh' location in the local host * lisp/dired.el (dired-insert-directory): Use executable-find in a local host.
2017-08-02 07:50:37 +00:00
(process-file sh nil (current-buffer) nil switch script))
* lisp/dired.el (dired-insert-directory): Move `file-remote-p' check up.
2017-07-30 11:11:00 +00:00
(user-error
"%s: No files matching wildcard" (cdr dir-wildcard)))
Dired: Handle posix wildcards in directory part Allow Dired to handle calls like \(dired \"~/foo/*/*.el\"), that is, with wildcards within the directory part of the file argument (Bug#27631). * lisp/files.el (insert-directory-wildcard-in-dir-p): New predicate. (insert-directory-clean): New defun extracted from insert-directory. (insert-directory) * lisp/dired.el (dired-internal-noselect) (dired-insert-directory): Use the new predicate; when it's true, handle the directory wildcards with a shell call. * lisp/eshell/em-ls.el (eshell-ls-use-in-dired): Add/remove both advices. (eshell-ls-unload-hook): New defun. Use it in eshell-ls-unload-hook instead of an anonymous function. (eshell-ls--dired) * lisp/ls-lisp.el (ls-lisp--dired): Advice dired to handle wildcards in the directory part with both eshell-ls and ls-lisp. * etc/NEWS: Announce it. * doc/emacs/dired.texi (Dired Enter): Update manual. * test/lisp/dired-tests.el (dired-test-bug27631): Add test.
2017-07-30 02:02:49 +00:00
(insert-directory-clean (point) switches)))
(t
* lisp/dired.el (dired-insert-directory): Move `file-remote-p' check up.
2017-07-30 11:11:00 +00:00
;; We used to specify the C locale here, to force English
;; month names; but this should not be necessary any
;; more, with the new value of
;; `directory-listing-before-filename-regexp'.
Dired: Handle posix wildcards in directory part Allow Dired to handle calls like \(dired \"~/foo/*/*.el\"), that is, with wildcards within the directory part of the file argument (Bug#27631). * lisp/files.el (insert-directory-wildcard-in-dir-p): New predicate. (insert-directory-clean): New defun extracted from insert-directory. (insert-directory) * lisp/dired.el (dired-internal-noselect) (dired-insert-directory): Use the new predicate; when it's true, handle the directory wildcards with a shell call. * lisp/eshell/em-ls.el (eshell-ls-use-in-dired): Add/remove both advices. (eshell-ls-unload-hook): New defun. Use it in eshell-ls-unload-hook instead of an anonymous function. (eshell-ls--dired) * lisp/ls-lisp.el (ls-lisp--dired): Advice dired to handle wildcards in the directory part with both eshell-ls and ls-lisp. * etc/NEWS: Announce it. * doc/emacs/dired.texi (Dired Enter): Update manual. * test/lisp/dired-tests.el (dired-test-bug27631): Add test.
2017-07-30 02:02:49 +00:00
(if file-list
(dolist (f file-list)
(let ((beg (point)))
(insert-directory f switches nil nil)
;; Re-align fields, if necessary.
(dired-align-file beg (point))))
(insert-directory dir switches wildcard (not wildcard))))))
(dired-insert-directory): Quote certain chars with \. (dired-get-filename): Always unquote \ quoting.
1994-12-07 10:57:12 +00:00
;; Quote certain characters, unless ls quoted them for us.
dired fix for `ls -b' quoting of spaces (bug#10469) * lisp/dired.el (dired-switches-escape-p): New function. (dired-insert-directory): Use dired-switches-escape-p. (dired-get-filename): Undo "\ " quoting if needed.
2012-01-13 23:09:28 +00:00
(if (not (dired-switches-escape-p dired-actual-switches))
Wrap filename character quoting code with save-excursion so following forms relying on point aren't broken.
1995-03-30 07:10:08 +00:00
(save-excursion
(setq end (point-marker))
(goto-char opoint)
(while (search-forward "\\" end t)
(dired-insert-directory): Preserve text properties when quoting.
2002-12-21 17:06:54 +00:00
(replace-match (apply #'propertize
"\\\\"
(text-properties-at (match-beginning 0)))
nil t))
Wrap filename character quoting code with save-excursion so following forms relying on point aren't broken.
1995-03-30 07:10:08 +00:00
(goto-char opoint)
(while (search-forward "\^m" end t)
(dired-insert-directory): Preserve text properties when quoting.
2002-12-21 17:06:54 +00:00
(replace-match (apply #'propertize
"\\015"
(text-properties-at (match-beginning 0)))
nil t))
Dired fixes for newlines in directory names. * lisp/dired.el (dired-insert-directory): Handle newlines in directory name. (dired-build-subdir-alist): Unescape newlines in directory name.
2012-01-17 22:27:46 +00:00
(set-marker end nil))
;; Replace any newlines in DIR with literal "\n"s, for the sake
;; of the header line. To disambiguate a literal "\n" in the
;; actual dirname, we also replace "\" with "\\".
;; Personally, I think this should always be done, irrespective
;; of the value of dired-actual-switches, because:
;; i) Dired simply does not work with an unescaped newline in
;; the directory name used in the header (bug=10469#28), and
;; ii) "\" is always replaced with "\\" in the listing, so doing
;; it in the header as well makes things consistent.
;; But at present it is only done if "-b" is in ls-switches,
;; because newlines in dirnames are uncommon, and people may
;; have gotten used to seeing unescaped "\" in the headers.
;; Note: adjust dired-build-subdir-alist if you change this.
(setq dir (replace-regexp-in-string "\\\\" "\\\\" dir nil t)
dir (replace-regexp-in-string "\n" "\\n" dir nil t)))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
;; If we used --dired and it worked, the lines are already indented.
;; Otherwise, indent them.
(unless (save-excursion
(dired-insert-directory): When looking for existing indentation, goto OPOINT instead of beginning of buffer.
2002-10-12 23:33:06 +00:00
(goto-char opoint)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(looking-at-p " "))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(let ((indent-tabs-mode nil))
(indent-rigidly opoint (point) 2)))
;; Insert text at the beginning to standardize things.
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
(let ((content-point opoint))
(save-excursion
(goto-char opoint)
(when (and (or hdr wildcard)
lisp/dired.el (dired-insert-directory): Revert change in 2013-06-21T12:24:37Z!lekktu@gmail.com. Fixes: debbugs:15028
2013-08-06 01:03:08 +00:00
(not (and (looking-at "^ \\(.*\\):$")
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
(file-name-absolute-p (match-string 1)))))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
;; Note that dired-build-subdir-alist will replace the name
;; by its expansion, so it does not matter whether what we insert
;; here is fully expanded, but it should be absolute.
Dired: Handle posix wildcards in directory part Allow Dired to handle calls like \(dired \"~/foo/*/*.el\"), that is, with wildcards within the directory part of the file argument (Bug#27631). * lisp/files.el (insert-directory-wildcard-in-dir-p): New predicate. (insert-directory-clean): New defun extracted from insert-directory. (insert-directory) * lisp/dired.el (dired-internal-noselect) (dired-insert-directory): Use the new predicate; when it's true, handle the directory wildcards with a shell call. * lisp/eshell/em-ls.el (eshell-ls-use-in-dired): Add/remove both advices. (eshell-ls-unload-hook): New defun. Use it in eshell-ls-unload-hook instead of an anonymous function. (eshell-ls--dired) * lisp/ls-lisp.el (ls-lisp--dired): Advice dired to handle wildcards in the directory part with both eshell-ls and ls-lisp. * etc/NEWS: Announce it. * doc/emacs/dired.texi (Dired Enter): Update manual. * test/lisp/dired-tests.el (dired-test-bug27631): Add test.
2017-07-30 02:02:49 +00:00
(insert " " (or (car-safe (insert-directory-wildcard-in-dir-p dir))
(directory-file-name (file-name-directory dir))) ":\n")
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
(setq content-point (point)))
(when wildcard
;; Insert "wildcard" line where "total" line would be for a full dir.
Dired: Handle posix wildcards in directory part Allow Dired to handle calls like \(dired \"~/foo/*/*.el\"), that is, with wildcards within the directory part of the file argument (Bug#27631). * lisp/files.el (insert-directory-wildcard-in-dir-p): New predicate. (insert-directory-clean): New defun extracted from insert-directory. (insert-directory) * lisp/dired.el (dired-internal-noselect) (dired-insert-directory): Use the new predicate; when it's true, handle the directory wildcards with a shell call. * lisp/eshell/em-ls.el (eshell-ls-use-in-dired): Add/remove both advices. (eshell-ls-unload-hook): New defun. Use it in eshell-ls-unload-hook instead of an anonymous function. (eshell-ls--dired) * lisp/ls-lisp.el (ls-lisp--dired): Advice dired to handle wildcards in the directory part with both eshell-ls and ls-lisp. * etc/NEWS: Announce it. * doc/emacs/dired.texi (Dired Enter): Update manual. * test/lisp/dired-tests.el (dired-test-bug27631): Add test.
2017-07-30 02:02:49 +00:00
(insert " wildcard " (or (cdr-safe (insert-directory-wildcard-in-dir-p dir))
(file-name-nondirectory dir))
"\n")))
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
(dired-insert-set-properties content-point (point)))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-insert-directory): Add mouse-face properties. (dired-insert-set-properties): New subroutine.
1994-04-01 18:51:39 +00:00
(defun dired-insert-set-properties (beg end)
(dired-insert-set-properties): Make the doc string reflect what it does now Fixes: debbugs:5325
2011-07-13 15:15:26 +00:00
"Add various text properties to the lines in the region."
(dired-insert-directory): Add mouse-face properties. (dired-insert-set-properties): New subroutine.
1994-04-01 18:51:39 +00:00
(save-excursion
(goto-char beg)
(while (< (point) end)
lisp/*.el: Remove lexical-binding warnings; additional small cleanups. * calculator.el (calculator): Mark unused argument. (calculator-paste, calculator-quit, calculator-integer-p): Use ignore-errors. (calculator-string-to-number, calculator-decimal, calculator-exp) (calculator-op-or-exp): Use string-match-p. * dired-aux.el (dired-compress): Use ignore-errors. (dired-do-chxxx, dired-do-chmod, dired-trample-file-versions) (dired-do-async-shell-command, dired-do-shell-command) (dired-shell-stuff-it, dired-compress-file, dired-insert-subdir) (dired-insert-subdir-validate): Use string-match-p. (dired-map-dired-file-lines, dired-subdir-hidden-p): Use looking-at-p. (dired-add-entry): Use string-match-p, looking-at-p. (dired-insert-subdir-newpos): Remove unused local variable. * dired.el (dired-buffer-more-recently-used-p): Declare. (dired-insert-set-properties, dired-insert-old-subdirs): Use ignore-errors. * filenotify.el (file-notify-callback): Remove unused local variable. * filesets.el (filesets-error): Mark unused argument. (filesets-which-command-p, filesets-filter-dir-names) (filesets-directory-files, filesets-get-external-viewer) (filesets-ingroup-get-data): Use string-match-p. * find-file.el (ff-other-file-name, ff-other-file-name) (ff-find-the-other-file, ff-cc-hh-converter): Remove unused local variables. (ff-get-file-name): Use string-match-p. (ff-all-dirs-under): Use ignore-errors. * follow.el (follow-comint-scroll-to-bottom): Mark unused argument. (follow-select-if-visible): Remove unused local variable. * forms.el (read-file-filter): Move declaration. (forms--make-format, forms--make-parser, forms-insert-record): Quote function with #'. (forms--update): Use string-match-p. Quote function with #'. * help-mode.el (help-dir-local-var-def): Mark unused argument. (help-make-xrefs): Use looking-at-p. (help-xref-on-pp): Use looking-at-p, ignore-errors. * ibuffer.el (ibuffer-ext-visible-p): Declare. (ibuffer-confirm-operation-on): Use string-match-p. * msb.el (msb-item-handler, msb-dired-item-handler): Mark unused arguments. * ses.el (ses-decode-cell-symbol) (ses-kill-override): Remove unused local variable. (ses-create-cell-variable, ses-relocate-formula): Use string-match-p. (ses-load): Use ignore-errors, looking-at-p. (ses-jump-safe): Use ignore-errors. (ses-export-tsv, ses-export-tsf, ses-unsafe): Mark unused arguments. * tabify.el (untabify, tabify): Mark unused arguments. * thingatpt.el (thing-at-point--bounds-of-well-formed-url): Mark unused argument. (bounds-of-thing-at-point, thing-at-point-bounds-of-list-at-point) (thing-at-point-newsgroup-p, form-at-point): Use ignore-errors.
2013-08-10 15:17:29 +00:00
(ignore-errors
(if (not (dired-move-to-filename))
* dired.el (dired-insert-set-properties): Do not consider subdirectory headings and empty lines to be information that `dired-hide-details-mode' should hide. (Bug#17228)
2014-04-22 18:17:17 +00:00
(unless (or (looking-at-p "^$")
(looking-at-p dired-subdir-regexp))
(put-text-property (line-beginning-position)
(1+ (line-end-position))
'invisible 'dired-hide-details-information))
lisp/*.el: Remove lexical-binding warnings; additional small cleanups. * calculator.el (calculator): Mark unused argument. (calculator-paste, calculator-quit, calculator-integer-p): Use ignore-errors. (calculator-string-to-number, calculator-decimal, calculator-exp) (calculator-op-or-exp): Use string-match-p. * dired-aux.el (dired-compress): Use ignore-errors. (dired-do-chxxx, dired-do-chmod, dired-trample-file-versions) (dired-do-async-shell-command, dired-do-shell-command) (dired-shell-stuff-it, dired-compress-file, dired-insert-subdir) (dired-insert-subdir-validate): Use string-match-p. (dired-map-dired-file-lines, dired-subdir-hidden-p): Use looking-at-p. (dired-add-entry): Use string-match-p, looking-at-p. (dired-insert-subdir-newpos): Remove unused local variable. * dired.el (dired-buffer-more-recently-used-p): Declare. (dired-insert-set-properties, dired-insert-old-subdirs): Use ignore-errors. * filenotify.el (file-notify-callback): Remove unused local variable. * filesets.el (filesets-error): Mark unused argument. (filesets-which-command-p, filesets-filter-dir-names) (filesets-directory-files, filesets-get-external-viewer) (filesets-ingroup-get-data): Use string-match-p. * find-file.el (ff-other-file-name, ff-other-file-name) (ff-find-the-other-file, ff-cc-hh-converter): Remove unused local variables. (ff-get-file-name): Use string-match-p. (ff-all-dirs-under): Use ignore-errors. * follow.el (follow-comint-scroll-to-bottom): Mark unused argument. (follow-select-if-visible): Remove unused local variable. * forms.el (read-file-filter): Move declaration. (forms--make-format, forms--make-parser, forms-insert-record): Quote function with #'. (forms--update): Use string-match-p. Quote function with #'. * help-mode.el (help-dir-local-var-def): Mark unused argument. (help-make-xrefs): Use looking-at-p. (help-xref-on-pp): Use looking-at-p, ignore-errors. * ibuffer.el (ibuffer-ext-visible-p): Declare. (ibuffer-confirm-operation-on): Use string-match-p. * msb.el (msb-item-handler, msb-dired-item-handler): Mark unused arguments. * ses.el (ses-decode-cell-symbol) (ses-kill-override): Remove unused local variable. (ses-create-cell-variable, ses-relocate-formula): Use string-match-p. (ses-load): Use ignore-errors, looking-at-p. (ses-jump-safe): Use ignore-errors. (ses-export-tsv, ses-export-tsf, ses-unsafe): Mark unused arguments. * tabify.el (untabify, tabify): Mark unused arguments. * thingatpt.el (thing-at-point--bounds-of-well-formed-url): Mark unused argument. (bounds-of-thing-at-point, thing-at-point-bounds-of-list-at-point) (thing-at-point-newsgroup-p, form-at-point): Use ignore-errors.
2013-08-10 15:17:29 +00:00
(put-text-property (+ (line-beginning-position) 1) (1- (point))
'invisible 'dired-hide-details-detail)
(add-text-properties
(point)
(progn
(dired-move-to-end-of-filename)
(point))
'(mouse-face
highlight
dired-filename t
help-echo "mouse-2: visit this file in other window"))
(when (< (+ (point) 4) (line-end-position))
(put-text-property (+ (point) 4) (line-end-position)
'invisible 'dired-hide-details-link))))
(dired-insert-directory): Add mouse-face properties. (dired-insert-set-properties): New subroutine.
1994-04-01 18:51:39 +00:00
(forward-line 1))))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Reverting a dired buffer
* doc/lispref/variables.texi (Scope): Mention the availability of lexbind. (Lexical Binding): New node. * doc/lispref/eval.texi (Eval): Add `eval's new `lexical' arg. * lisp/emacs-lisp/cconv.el (cconv-liftwhen): Increase threshold. (cconv-closure-convert-rec): Convert interactive spec in empty lexenv. (cconv-analyse-use): Improve unused vars warnings. (cconv-analyse-form): Analyze interactive spec in empty lexenv. * lisp/emacs-lisp/bytecomp.el (byte-compile-lambda): Always byte-compile the interactive spec in lexical-binding mode. (byte-compile-refresh-preloaded): Don't reload byte-compiler files. * lisp/custom.el (custom-initialize-default): Use defvar. (custom-declare-variable): Set the special-variable-p flag. * lisp/help-fns.el (help-make-usage): Drop leading underscores. * lisp/dired.el (dired-revert, dired-make-relative): Mark unused args. (dired-unmark-all-files): Remove unused var `query'. (dired-overwrite-confirmed): Declare. (dired-restore-desktop-buffer): Don't use dynamically scoped arg names. * lisp/mpc.el: Mark unused args. (mpc--faster-toggle): Remove unused var `songnb'. * lisp/server.el (server-kill-buffer-running): Move before first use. * lisp/minibuffer.el: Mark unused args. * src/callint.c (quotify_arg): Simplify the logic. (Fcall_interactively): Use lexical binding when evaluating the interactive spec of a lexically bound function.
2011-03-01 05:03:24 +00:00
(defun dired-revert (&optional _arg _noconfirm)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Reread the Dired buffer.
(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.
2005-07-20 14:08:39 +00:00
Must also be called after `dired-actual-switches' have changed.
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
Should not fail even on completely garbaged buffers.
* dired.el (dired-revert): Doc fix (Bug#7758).
2011-01-23 20:06:51 +00:00
Preserves old cursor, marks/flags, hidden-p.
Dired sets `revert-buffer-function' to this function. The args
ARG and NOCONFIRM, passed from `revert-buffer', are ignored."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(widen) ; just in case user narrowed
(dired-revert): If buffer is marked unmodified before reverting, keep it marked unmodified. Adapt to new conventions for commenting out code. (dired-make-relative): Adapt to new conventions for commenting out code.
2004-06-11 22:38:52 +00:00
(let ((modflag (buffer-modified-p))
(dired-save-positions, dired-restore-positions): New funs. (dired-revert): Use them (bug#4880).
2009-11-12 22:37:58 +00:00
(positions (dired-save-positions))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(mark-alist nil) ; save marked files
(hidden-subdirs (dired-remember-hidden))
(old-subdir-alist (cdr (reverse dired-subdir-alist))) ; except pwd
(case-fold-search nil) ; we check for upper case ls flags
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(inhibit-read-only t))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(goto-char (point-min))
(setq mark-alist;; only after dired-remember-hidden since this unhides:
(dired-remember-marks (point-min) (point-max)))
;; treat top level dir extra (it may contain wildcards)
* dired.el (dired-revert): If DIRED-DIRECTORY is a cons cell, call `dired-uncache' for every elemnt which is an absolute file name. * net/tramp.el (tramp-handle-dired-uncache): When DIR is not a directory, handle its directory component. (tramp-handle-file-remote-p): Let-bind `tramp-verbose' to 3; this function is called permanently and creates noise, otherwise. * net/tramp-imap.el (tramp-imap-handle-insert-directory): * net/tramp-smb.el (tramp-smb-handle-insert-directory): Handle the case, FILENAME is not in `default-directory'. (Bug#5478)
2010-02-04 16:25:57 +00:00
(if (not (consp dired-directory))
(dired-uncache dired-directory)
(dired-uncache (car dired-directory))
(dolist (dir (cdr dired-directory))
(if (file-name-absolute-p dir)
(dired-uncache dir))))
(dired-revert): Turn off dired-after-readin-hook around call to dired-readin.
2006-12-04 00:32:00 +00:00
;; Run dired-after-readin-hook just once, below.
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let ((dired-after-readin-hook nil))
(dired-revert): Turn off dired-after-readin-hook around call to dired-readin.
2006-12-04 00:32:00 +00:00
(dired-readin)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-insert-old-subdirs old-subdir-alist))
(dired-mark-remembered mark-alist) ; mark files that were marked
;; ... run the hook for the whole buffer, and only after markers
;; have been reinserted (else omitting in dired-x would omit marked files)
(run-hooks 'dired-after-readin-hook) ; no need to narrow
(dired-save-positions, dired-restore-positions): New funs. (dired-revert): Use them (bug#4880).
2009-11-12 22:37:58 +00:00
(dired-restore-positions positions)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(save-excursion ; hide subdirs that were hidden
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
(dolist (dir hidden-subdirs)
(if (dired-goto-subdir dir)
(dired-revert): If buffer is marked unmodified before reverting, keep it marked unmodified. Adapt to new conventions for commenting out code. (dired-make-relative): Adapt to new conventions for commenting out code.
2004-06-11 22:38:52 +00:00
(dired-hide-subdir 1))))
Fix Bug#30663 * lisp/dired.el (dired-revert): Call `hack-dir-local-variables-non-file-buffer'. (Bug#30663)
2018-05-14 15:12:16 +00:00
(unless modflag (restore-buffer-modified-p nil))
(hack-dir-local-variables-non-file-buffer))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; outside of the let scope
(dired-revert): If buffer is marked unmodified before reverting, keep it marked unmodified. Adapt to new conventions for commenting out code. (dired-make-relative): Adapt to new conventions for commenting out code.
2004-06-11 22:38:52 +00:00
;;; Might as well not override the user if the user changed this.
*** empty log message ***
1992-06-24 02:13:56 +00:00
;;; (setq buffer-read-only t)
)
;; Subroutines of dired-revert
;; Some of these are also used when inserting subdirs.
(dired-save-positions, dired-restore-positions): New funs. (dired-revert): Use them (bug#4880).
2009-11-12 22:37:58 +00:00
(defun dired-save-positions ()
Save and restore dired buffer's point positions too. (Bug#4880) (dired-save-positions): Return in the first element buffer's position in format (BUFFER DIRED-FILENAME BUFFER-POINT). Doc fix. (dired-restore-positions): First restore buffer's position. While restoring window's positions, check if window still displays the original buffer.
2009-12-05 23:22:03 +00:00
"Return current positions in the buffer and all windows with this directory.
The positions have the form (BUFFER-POSITION WINDOW-POSITIONS).
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
BUFFER-POSITION is the point position in the current Dired buffer.
dired-revert: save line numbers instead of positions Positions might change if the length of one dired header line changes; this happen, for instance, if we add new files. Instead, line numbers are invariant under shrinks/enlargements of the file header. https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01092.html * lisp/dired.el (dired-save-positions): Save the line numbers at point. (dired-restore-positions): Use forward-line to restore the original position (Bug#27968). * test/lisp/dired-tests.el (dired-test-bug27968): Add test.
2017-08-06 04:05:16 +00:00
It has the form (BUFFER DIRED-FILENAME BUFFER-LINE-NUMBER).
Save and restore dired buffer's point positions too. (Bug#4880) (dired-save-positions): Return in the first element buffer's position in format (BUFFER DIRED-FILENAME BUFFER-POINT). Doc fix. (dired-restore-positions): First restore buffer's position. While restoring window's positions, check if window still displays the original buffer.
2009-12-05 23:22:03 +00:00
WINDOW-POSITIONS are current positions in all windows displaying
this dired buffer. The window positions have the form (WINDOW
dired-revert: save line numbers instead of positions Positions might change if the length of one dired header line changes; this happen, for instance, if we add new files. Instead, line numbers are invariant under shrinks/enlargements of the file header. https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01092.html * lisp/dired.el (dired-save-positions): Save the line numbers at point. (dired-restore-positions): Use forward-line to restore the original position (Bug#27968). * test/lisp/dired-tests.el (dired-test-bug27968): Add test.
2017-08-06 04:05:16 +00:00
DIRED-FILENAME WINDOW-LINE-NUMBER).
We store line numbers instead of point positions because the header
lines might change as well: when this happen the line number doesn't
change; the point does."
Save and restore dired buffer's point positions too. (Bug#4880) (dired-save-positions): Return in the first element buffer's position in format (BUFFER DIRED-FILENAME BUFFER-POINT). Doc fix. (dired-restore-positions): First restore buffer's position. While restoring window's positions, check if window still displays the original buffer.
2009-12-05 23:22:03 +00:00
(list
dired-revert: save line numbers instead of positions Positions might change if the length of one dired header line changes; this happen, for instance, if we add new files. Instead, line numbers are invariant under shrinks/enlargements of the file header. https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01092.html * lisp/dired.el (dired-save-positions): Save the line numbers at point. (dired-restore-positions): Use forward-line to restore the original position (Bug#27968). * test/lisp/dired-tests.el (dired-test-bug27968): Add test.
2017-08-06 04:05:16 +00:00
(list (current-buffer) (dired-get-filename nil t) (line-number-at-pos))
Save and restore dired buffer's point positions too. (Bug#4880) (dired-save-positions): Return in the first element buffer's position in format (BUFFER DIRED-FILENAME BUFFER-POINT). Doc fix. (dired-restore-positions): First restore buffer's position. While restoring window's positions, check if window still displays the original buffer.
2009-12-05 23:22:03 +00:00
(mapcar (lambda (w)
dired-revert: save line numbers instead of positions Positions might change if the length of one dired header line changes; this happen, for instance, if we add new files. Instead, line numbers are invariant under shrinks/enlargements of the file header. https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01092.html * lisp/dired.el (dired-save-positions): Save the line numbers at point. (dired-restore-positions): Use forward-line to restore the original position (Bug#27968). * test/lisp/dired-tests.el (dired-test-bug27968): Add test.
2017-08-06 04:05:16 +00:00
(with-selected-window w
(list w
(dired-get-filename nil t)
(line-number-at-pos (window-point w)))))
Adjust windows' previous buffers when reverting dired buffers (Bug#33458) * lisp/dired.el (dired-save-positions, dired-restore-positions): For each window that showed the reverted buffer before, fix the point positions in its list of previously shown buffers the way these routines handle window point for all windows currently showing the buffer (Bug#33458).
2018-12-08 08:18:28 +00:00
(get-buffer-window-list nil 0 t))
;; For each window that showed the current buffer before, scan its
;; list of previous buffers. For each association thus found save
;; a triple <point, name, line> where 'point' is that window's
;; window-point marker stored in the window's list of previous
;; buffers, 'name' is the filename at the position of 'point' and
;; 'line' is the line number at the position of 'point'.
(let ((buffer (current-buffer))
prevs)
(walk-windows
(lambda (window)
(let ((prev (assq buffer (window-prev-buffers window))))
(when prev
(with-current-buffer buffer
(save-excursion
(goto-char (nth 2 prev))
(setq prevs
(cons
(list (nth 2 prev)
(dired-get-filename nil t)
(line-number-at-pos (point)))
prevs)))))))
'nomini t)
prevs)))
(dired-save-positions, dired-restore-positions): New funs. (dired-revert): Use them (bug#4880).
2009-11-12 22:37:58 +00:00
(defun dired-restore-positions (positions)
"Restore POSITIONS saved with `dired-save-positions'."
Save and restore dired buffer's point positions too. (Bug#4880) (dired-save-positions): Return in the first element buffer's position in format (BUFFER DIRED-FILENAME BUFFER-POINT). Doc fix. (dired-restore-positions): First restore buffer's position. While restoring window's positions, check if window still displays the original buffer.
2009-12-05 23:22:03 +00:00
(let* ((buf-file-pos (nth 0 positions))
Adjust windows' previous buffers when reverting dired buffers (Bug#33458) * lisp/dired.el (dired-save-positions, dired-restore-positions): For each window that showed the reverted buffer before, fix the point positions in its list of previously shown buffers the way these routines handle window point for all windows currently showing the buffer (Bug#33458).
2018-12-08 08:18:28 +00:00
(buffer (nth 0 buf-file-pos))
(prevs (nth 2 positions)))
Save and restore dired buffer's point positions too. (Bug#4880) (dired-save-positions): Return in the first element buffer's position in format (BUFFER DIRED-FILENAME BUFFER-POINT). Doc fix. (dired-restore-positions): First restore buffer's position. While restoring window's positions, check if window still displays the original buffer.
2009-12-05 23:22:03 +00:00
(unless (and (nth 1 buf-file-pos)
(dired-goto-file (nth 1 buf-file-pos)))
dired-revert: save line numbers instead of positions Positions might change if the length of one dired header line changes; this happen, for instance, if we add new files. Instead, line numbers are invariant under shrinks/enlargements of the file header. https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01092.html * lisp/dired.el (dired-save-positions): Save the line numbers at point. (dired-restore-positions): Use forward-line to restore the original position (Bug#27968). * test/lisp/dired-tests.el (dired-test-bug27968): Add test.
2017-08-06 04:05:16 +00:00
(goto-char (point-min))
(forward-line (1- (nth 2 buf-file-pos)))
Save and restore dired buffer's point positions too. (Bug#4880) (dired-save-positions): Return in the first element buffer's position in format (BUFFER DIRED-FILENAME BUFFER-POINT). Doc fix. (dired-restore-positions): First restore buffer's position. While restoring window's positions, check if window still displays the original buffer.
2009-12-05 23:22:03 +00:00
(dired-move-to-filename))
(dolist (win-file-pos (nth 1 positions))
;; Ensure that window still displays the original buffer.
(when (eq (window-buffer (nth 0 win-file-pos)) buffer)
(with-selected-window (nth 0 win-file-pos)
(unless (and (nth 1 win-file-pos)
(dired-goto-file (nth 1 win-file-pos)))
dired-revert: save line numbers instead of positions Positions might change if the length of one dired header line changes; this happen, for instance, if we add new files. Instead, line numbers are invariant under shrinks/enlargements of the file header. https://lists.gnu.org/archive/html/emacs-devel/2017-07/msg01092.html * lisp/dired.el (dired-save-positions): Save the line numbers at point. (dired-restore-positions): Use forward-line to restore the original position (Bug#27968). * test/lisp/dired-tests.el (dired-test-bug27968): Add test.
2017-08-06 04:05:16 +00:00
(goto-char (point-min))
(forward-line (1- (nth 2 win-file-pos)))
Adjust windows' previous buffers when reverting dired buffers (Bug#33458) * lisp/dired.el (dired-save-positions, dired-restore-positions): For each window that showed the reverted buffer before, fix the point positions in its list of previously shown buffers the way these routines handle window point for all windows currently showing the buffer (Bug#33458).
2018-12-08 08:18:28 +00:00
(dired-move-to-filename)))))
(when prevs
(with-current-buffer buffer
(save-excursion
(dolist (prev prevs)
(let ((point (nth 0 prev)))
;; Sanity check of the point marker.
(when (and (markerp point)
(eq (marker-buffer point) buffer))
Fix typo in 'dired-restore-positions' * lisp/dired.el (dired-restore-positions): Fix typo in last change fixing Bug#33458.
2018-12-11 07:56:15 +00:00
(unless (and (nth 1 prev)
Adjust windows' previous buffers when reverting dired buffers (Bug#33458) * lisp/dired.el (dired-save-positions, dired-restore-positions): For each window that showed the reverted buffer before, fix the point positions in its list of previously shown buffers the way these routines handle window point for all windows currently showing the buffer (Bug#33458).
2018-12-08 08:18:28 +00:00
(dired-goto-file (nth 1 prev)))
(goto-char (point-min))
(forward-line (1- (nth 2 prev))))
(dired-move-to-filename)
(move-marker point (point) buffer)))))))))
(dired-save-positions, dired-restore-positions): New funs. (dired-revert): Use them (bug#4880).
2009-11-12 22:37:58 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-remember-marks (beg end)
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
"Return alist of files and their marks, from BEG to END."
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(if (dired--find-hidden-pos (point-min) (point-max))
(dired--unhide (point-min) (point-max))) ;Must unhide to make this work.
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let (fil chr alist)
(save-excursion
(goto-char beg)
(while (re-search-forward dired-re-mark end t)
(if (setq fil (dired-get-filename nil t))
(setq chr (preceding-char)
alist (cons (cons fil chr) alist)))))
alist))
(defun dired-mark-remembered (alist)
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
"Mark all files remembered in ALIST.
Each element of ALIST looks like (FILE . MARKERCHAR)."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let (elt fil chr)
In dired-mark-remembered don't clobber point (Bug#11795). * dired.el (dired-mark-remembered): Don't clobber point. (Bug#11795)
2012-08-22 06:59:38 +00:00
(save-excursion
(while alist
(setq elt (car alist)
alist (cdr alist)
fil (car elt)
chr (cdr elt))
(when (dired-goto-file fil)
(beginning-of-line)
(delete-char 1)
(insert chr))))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-remember-hidden ()
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
"Return a list of names of subdirs currently hidden."
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(let (result)
(pcase-dolist (`(,dir . ,pos) dired-subdir-alist)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(goto-char pos)
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(end-of-line)
(if (dired--hidden-p)
(push dir result)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
result))
(defun dired-insert-old-subdirs (old-subdir-alist)
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
"Try to insert all subdirs that were displayed before.
Do so according to the former subdir alist OLD-SUBDIR-ALIST."
* lisp/dired.el (dired-check-switches, dired-switches-recursive-p): New functions. (dired-switches-escape-p, dired-move-to-end-of-filename): Use `dired-check-switches'. (dired-insert-old-subdirs, dired-build-subdir-alist) (dired-sort-R-check): Use `dired-switches-recursive-p'. Fixes: debbugs:17218
2014-05-03 09:22:59 +00:00
(or (dired-switches-recursive-p dired-actual-switches)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let (elt dir)
(while old-subdir-alist
(setq elt (car old-subdir-alist)
old-subdir-alist (cdr old-subdir-alist)
dir (car elt))
lisp/*.el: Remove lexical-binding warnings; additional small cleanups. * calculator.el (calculator): Mark unused argument. (calculator-paste, calculator-quit, calculator-integer-p): Use ignore-errors. (calculator-string-to-number, calculator-decimal, calculator-exp) (calculator-op-or-exp): Use string-match-p. * dired-aux.el (dired-compress): Use ignore-errors. (dired-do-chxxx, dired-do-chmod, dired-trample-file-versions) (dired-do-async-shell-command, dired-do-shell-command) (dired-shell-stuff-it, dired-compress-file, dired-insert-subdir) (dired-insert-subdir-validate): Use string-match-p. (dired-map-dired-file-lines, dired-subdir-hidden-p): Use looking-at-p. (dired-add-entry): Use string-match-p, looking-at-p. (dired-insert-subdir-newpos): Remove unused local variable. * dired.el (dired-buffer-more-recently-used-p): Declare. (dired-insert-set-properties, dired-insert-old-subdirs): Use ignore-errors. * filenotify.el (file-notify-callback): Remove unused local variable. * filesets.el (filesets-error): Mark unused argument. (filesets-which-command-p, filesets-filter-dir-names) (filesets-directory-files, filesets-get-external-viewer) (filesets-ingroup-get-data): Use string-match-p. * find-file.el (ff-other-file-name, ff-other-file-name) (ff-find-the-other-file, ff-cc-hh-converter): Remove unused local variables. (ff-get-file-name): Use string-match-p. (ff-all-dirs-under): Use ignore-errors. * follow.el (follow-comint-scroll-to-bottom): Mark unused argument. (follow-select-if-visible): Remove unused local variable. * forms.el (read-file-filter): Move declaration. (forms--make-format, forms--make-parser, forms-insert-record): Quote function with #'. (forms--update): Use string-match-p. Quote function with #'. * help-mode.el (help-dir-local-var-def): Mark unused argument. (help-make-xrefs): Use looking-at-p. (help-xref-on-pp): Use looking-at-p, ignore-errors. * ibuffer.el (ibuffer-ext-visible-p): Declare. (ibuffer-confirm-operation-on): Use string-match-p. * msb.el (msb-item-handler, msb-dired-item-handler): Mark unused arguments. * ses.el (ses-decode-cell-symbol) (ses-kill-override): Remove unused local variable. (ses-create-cell-variable, ses-relocate-formula): Use string-match-p. (ses-load): Use ignore-errors, looking-at-p. (ses-jump-safe): Use ignore-errors. (ses-export-tsv, ses-export-tsf, ses-unsafe): Mark unused arguments. * tabify.el (untabify, tabify): Mark unused arguments. * thingatpt.el (thing-at-point--bounds-of-well-formed-url): Mark unused argument. (bounds-of-thing-at-point, thing-at-point-bounds-of-list-at-point) (thing-at-point-newsgroup-p, form-at-point): Use ignore-errors.
2013-08-10 15:17:29 +00:00
(ignore-errors
(dired-uncache dir)
(dired-insert-subdir dir))))))
*** empty log message ***
1992-09-13 20:40:20 +00:00
(defun dired-uncache (dir)
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
"Remove directory DIR from any directory cache."
Pass operation to find-file-name-handler.
1994-04-22 23:59:24 +00:00
(let ((handler (find-file-name-handler dir 'dired-uncache)))
*** empty log message ***
1992-09-13 20:40:20 +00:00
(if handler
(funcall handler 'dired-uncache dir))))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; dired mode key bindings and initialization
Initial revision
1992-05-30 23:52:26 +00:00
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
(defvar dired-mode-map
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; This looks ugly when substitute-command-keys uses C-d instead d:
;; (define-key dired-mode-map "\C-d" 'dired-flag-file-deletion)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(let ((map (make-keymap)))
* lisp/simple.el (special-mode-map): Bind "h" to `describe-mode'; bind "z" to `kill-this-buffer'. (completion-list-mode-map): Bind "z" to `kill-this-buffer'. * lisp/apropos.el (apropos-mode-map): Inherit from `special-mode-map'. (apropos-mode): Inherit from `special-mode'. * lisp/arc-mode.el (archive-mode-map): Inherit from `special-mode-map'. * lisp/bookmark.el (bookmark-bmenu-mode): Define using `define-derived-mode' inheriting from `special-mode'. * lisp/dired.el (dired-mode-map): Inherit from `special-mode-map'. * lisp/image-mode.el (image-mode-map): Ditto. * lisp/replace.el (occur-mode): Define using `define-derived-mode' inheriting from `special-mode'. * lisp/tar-mode.el (tar-mode): Inherit from `special-mode'. * lisp/calendar/diary-lib.el (diary-fancy-display-mode): Inherit from `special-mode-map'. * lisp/emacs-lisp/ert.el (ert-simple-view-mode, ert-results-mode): Inherit from `special-mode'. * lisp/emacs-lisp/package.el (package-menu-mode-map): Copy from `special-mode-map'. (package-menu-mode): Define using `define-derived-mode' inheriting from `special-mode'. * erc/erc-list.el (erc-list-menu-mode): Inherit from `special-mode'. * lisp/net/xesam.el (xesam-mode): Inherit from `special-mode'. (xesam-mode-map): Define separately. * lisp/play/solitaire.el (solitaire-mode): Inherit from `special-mode'. * lisp/progmodes/compile.el (compilation-minor-mode-map) (compilation-mode-map): Inherit from `special-mode-map'. * lisp/vc/diff-mode.el (diff-mode-shared-map): Inherit from `special-mode-map'. * lisp/vc/log-view.el (log-view-mode-map): Add a comment.
2011-02-01 21:22:21 +00:00
(set-keymap-parent map special-mode-map)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [mouse-2] 'dired-mouse-find-file-other-window)
(dired-mode-map): Map follow-link to mouse-face.
2004-12-17 15:18:02 +00:00
(define-key map [follow-link] 'mouse-face)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
;; Commands to mark or flag certain categories of files
(define-key map "#" 'dired-flag-auto-save-files)
(define-key map "." 'dired-clean-directory)
(define-key map "~" 'dired-flag-backup-files)
;; Upper case keys (except !) for operating on the marked files
Add xref-based replacements for Dired search commands * lisp/dired-aux.el (dired-do-find-regexp) (dired-do-find-regexp-and-replace): New commands. http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00864.html * lisp/dired.el (dired-mode-map): Change bindings for `A' and `Q' to the new commands. * lisp/progmodes/xref.el (xref-query-replace) (xref-collect-matches): Add progress reporters. (xref--find-ignores-arguments): Return nil for zero ignores. (xref--show-xrefs): Add an optional argument. (xref-collect-matches): Drop the assert. 'find' accepts a regular file in place of directory argument, too.
2016-01-18 19:11:46 +00:00
(define-key map "A" 'dired-do-find-regexp)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "C" 'dired-do-copy)
(define-key map "B" 'dired-do-byte-compile)
(define-key map "D" 'dired-do-delete)
(define-key map "G" 'dired-do-chgrp)
(define-key map "H" 'dired-do-hardlink)
(define-key map "L" 'dired-do-load)
(define-key map "M" 'dired-do-chmod)
(define-key map "O" 'dired-do-chown)
(define-key map "P" 'dired-do-print)
Add xref-based replacements for Dired search commands * lisp/dired-aux.el (dired-do-find-regexp) (dired-do-find-regexp-and-replace): New commands. http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00864.html * lisp/dired.el (dired-mode-map): Change bindings for `A' and `Q' to the new commands. * lisp/progmodes/xref.el (xref-query-replace) (xref-collect-matches): Add progress reporters. (xref--find-ignores-arguments): Return nil for zero ignores. (xref--show-xrefs): Add an optional argument. (xref-collect-matches): Drop the assert. 'find' accepts a regular file in place of directory argument, too.
2016-01-18 19:11:46 +00:00
(define-key map "Q" 'dired-do-find-regexp-and-replace)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "R" 'dired-do-rename)
(define-key map "S" 'dired-do-symlink)
Add autoload for `dired-do-touch'. (dired-touch-program): New var. (dired-mode-map): Bind `dired-do-touch' to T and add menu-item. (dired-no-confirm): Add `touch' to docstring.
2004-03-31 16:29:46 +00:00
(define-key map "T" 'dired-do-touch)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "X" 'dired-do-shell-command)
(define-key map "Z" 'dired-do-compress)
Add dired-do-compress-to command bound to "c" * lisp/dired-aux.el (dired-shell-command): Use the caller's `default-directory', return the result of `process-file'. (dired-compress-file-suffixes): Add comment on why "tar -zxf" isn't used by default. (dired-compress-files-alist): New defvar. (dired-do-compress-to): New command. * lisp/dired.el (dired-mode-map): Bind `dired-do-compress-to' to "c". (dired-do-compress-to): Add an autoload entry. * etc/NEWS: Add two entries.
2015-10-21 14:39:36 +00:00
(define-key map "c" 'dired-do-compress-to)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "!" 'dired-do-shell-command)
(dired-mode-map): Rebind `dired-flag-garbage-files' from `&' to `%&'. Bind `&' to `dired-do-async-shell-command'.
2008-07-29 16:37:31 +00:00
(define-key map "&" 'dired-do-async-shell-command)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
;; Comparison commands
(define-key map "=" 'dired-diff)
;; Tree Dired commands
(define-key map "\M-\C-?" 'dired-unmark-all-files)
(define-key map "\M-\C-d" 'dired-tree-down)
(define-key map "\M-\C-u" 'dired-tree-up)
(define-key map "\M-\C-n" 'dired-next-subdir)
(define-key map "\M-\C-p" 'dired-prev-subdir)
;; move to marked files
(define-key map "\M-{" 'dired-prev-marked-file)
(define-key map "\M-}" 'dired-next-marked-file)
;; Make all regexp commands share a `%' prefix:
;; We used to get to the submap via a symbol dired-regexp-prefix,
;; but that seems to serve little purpose, and copy-keymap
;; does a better job without it.
(define-key map "%" nil)
(define-key map "%u" 'dired-upcase)
(define-key map "%l" 'dired-downcase)
(define-key map "%d" 'dired-flag-files-regexp)
(dired-mark-files-containing-regexp): New command. (dired-mode-map): Bind it to %g and in menu bar.
1998-05-24 00:55:39 +00:00
(define-key map "%g" 'dired-mark-files-containing-regexp)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "%m" 'dired-mark-files-regexp)
(define-key map "%r" 'dired-do-rename-regexp)
(define-key map "%C" 'dired-do-copy-regexp)
(define-key map "%H" 'dired-do-hardlink-regexp)
(define-key map "%R" 'dired-do-rename-regexp)
(define-key map "%S" 'dired-do-symlink-regexp)
(dired-mode-map): Rebind `dired-flag-garbage-files' from `&' to `%&'. Bind `&' to `dired-do-async-shell-command'.
2008-07-29 16:37:31 +00:00
(define-key map "%&" 'dired-flag-garbage-files)
(dired-mode-map): Make * a prefix for mark commands. Delete the old *, / and @ keybindings.
1996-11-02 07:56:50 +00:00
;; Commands for marking and unmarking.
(define-key map "*" nil)
(define-key map "**" 'dired-mark-executables)
(define-key map "*/" 'dired-mark-directories)
(define-key map "*@" 'dired-mark-symlinks)
(define-key map "*%" 'dired-mark-files-regexp)
Add a new command to report the number and size of the marked files 2019-06-25 Constantino Calancha <f92capac@gmail.com> * lisp/dired.el (dired-mode-map): New keystroke and menu binding (bug#22829). 2019-06-25 Lars Ingebrigtsen <larsi@gnus.org> * doc/emacs/dired.texi (Marks vs Flags): Document it. * lisp/dired.el (dired-number-of-marked-files): New command.
2019-06-25 14:29:03 +00:00
(define-key map "*N" 'dired-number-of-marked-files)
(dired-mode-map): Make * a prefix for mark commands. Delete the old *, / and @ keybindings.
1996-11-02 07:56:50 +00:00
(define-key map "*c" 'dired-change-marks)
(dired-mode-map): Put dired-mark-subdir-files on *s.
1996-11-04 23:51:33 +00:00
(define-key map "*s" 'dired-mark-subdir-files)
(dired-mode-map): Make * a prefix for mark commands. Delete the old *, / and @ keybindings.
1996-11-02 07:56:50 +00:00
(define-key map "*m" 'dired-mark)
(define-key map "*u" 'dired-unmark)
(define-key map "*?" 'dired-unmark-all-files)
(dired-unmark-all-marks): Renamed from dired-unmark-all-files-no-query.
1997-06-07 19:31:24 +00:00
(define-key map "*!" 'dired-unmark-all-marks)
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
(define-key map "U" 'dired-unmark-all-marks)
(dired-mode-map): Make * a prefix for mark commands. Delete the old *, / and @ keybindings.
1996-11-02 07:56:50 +00:00
(define-key map "*\177" 'dired-unmark-backward)
(define-key map "*\C-n" 'dired-next-marked-file)
(define-key map "*\C-p" 'dired-prev-marked-file)
(dired-toggle-marks): Renamed from dired-do-toggle. Bindings changed.
2002-03-28 18:32:59 +00:00
(define-key map "*t" 'dired-toggle-marks)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
;; Lower keys for commands not operating on all the marked files
(dired-find-alternate-file): New function. (dired-mode-map): Bind `a' to dired-find-alternate-file. (toplevel): Require dired-aux when compiling. (dired-buffers): Move defvar within file to avoid compiler warning.
2000-07-07 13:00:21 +00:00
(define-key map "a" 'dired-find-alternate-file)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "d" 'dired-flag-file-deletion)
(define-key map "e" 'dired-find-file)
(define-key map "f" 'dired-find-file)
* keymap.c (QCadvertised_binding): New constant. (syms_of_keymap): Initialize it. (Fwhere_is_internal): Try and use bindings from :advertised-binding if applicable. * progmodes/xscheme.el (xscheme-evaluation-commands): Put a :advertised-binding property rather than using advertised-xscheme-send-previous-expression. (advertised-xscheme-send-previous-expression): Declare obsolete. * emulation/crisp.el (crisp-mode-map): Use `undo' rather than `advertised-undo'. (crisp-mode): Add corresponding bindings to undo's :advertised-binding instead. * dired.el (dired-mode-map): Put a :advertised-binding property rather than using dired-advertised-find-file. (dired-advertised-find-file): * simple.el (advertised-undo): * wid-edit.el (advertised-widget-backward): Declare obsolete. (widget-keymap): Put a :advertised-binding property rather than using advertised-widget-backward. * bindings.el (ctl-x-map): Put a :advertised-binding property rather than using advertised-undo. * tutorial.el (tutorial--default-keys): Adjust accordingly.
2009-09-11 00:58:59 +00:00
(define-key map "\C-m" 'dired-find-file)
(put 'dired-find-file :advertised-binding "\C-m")
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "g" 'revert-buffer)
(define-key map "i" 'dired-maybe-insert-subdir)
(dired-mode-map): Put dired-goto-file on j, not M-g. (dired-goto-file): Doc fix.
2006-05-21 00:22:46 +00:00
(define-key map "j" 'dired-goto-file)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "k" 'dired-do-kill-lines)
(define-key map "l" 'dired-do-redisplay)
(define-key map "m" 'dired-mark)
(define-key map "n" 'dired-next-line)
(define-key map "o" 'dired-find-file-other-window)
(define-key map "\C-o" 'dired-display-file)
(define-key map "p" 'dired-previous-line)
(define-key map "s" 'dired-sort-toggle-or-edit)
(dired-toggle-marks): Renamed from dired-do-toggle. Bindings changed.
2002-03-28 18:32:59 +00:00
(define-key map "t" 'dired-toggle-marks)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "u" 'dired-unmark)
(define-key map "v" 'dired-view-file)
(dired-copy-filename-as-kill): Moved from dired-x.el. (dired-mode-map): Bind w to dired-copy-filename-as-kill.
2001-12-17 01:58:05 +00:00
(define-key map "w" 'dired-copy-filename-as-kill)
Add a command to view files in the browser to dired * lisp/dired.el (dired-mode-map): Add the `W' command (bug#18810).
2015-12-25 19:36:54 +00:00
(define-key map "W" 'browse-url-of-dired-file)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "x" 'dired-do-flagged-delete)
(dired-mode-map): Bind `y' to dired-show-file-type instread of `w' which is already in use.
2001-08-28 09:12:52 +00:00
(define-key map "y" 'dired-show-file-type)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "+" 'dired-create-directory)
;; moving
(define-key map "<" 'dired-prev-dirline)
(define-key map ">" 'dired-next-dirline)
(define-key map "^" 'dired-up-directory)
Bind [?\S-\ ] to previous line command in Dired-like modes. * lisp/arc-mode.el (archive-mode-map): * lisp/dired.el (dired-mode-map): * lisp/proced.el (proced-mode-map): * lisp/vc/vc-dir.el (vc-dir-mode-map): Bind [?\S-\ ] to previous line command. (Bug#20790)
2015-11-12 20:54:01 +00:00
(define-key map " " 'dired-next-line)
(define-key map [?\S-\ ] 'dired-previous-line)
* dired.el (dired-mode-map): Use command remapping (bug#6632).
2010-07-22 11:54:27 +00:00
(define-key map [remap next-line] 'dired-next-line)
(define-key map [remap previous-line] 'dired-previous-line)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
;; hiding
(define-key map "$" 'dired-hide-subdir)
(define-key map "\M-$" 'dired-hide-all)
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
(define-key map "(" 'dired-hide-details-mode)
(dired-mode-map): Bind dired-do-isearch to `M-s a C-s' and dired-do-isearch-regexp to `M-s a M-C-s'. Add menu items.
2008-07-28 14:32:34 +00:00
;; isearch
(define-key map (kbd "M-s a C-s") 'dired-do-isearch)
(define-key map (kbd "M-s a M-C-s") 'dired-do-isearch-regexp)
(dired-insert-set-properties): Add new text property `dired-filename' to put on file names. (dired-mode-map): Bind `M-s f C-s' to `dired-isearch-filenames' and `M-s f M-C-s' to `dired-isearch-filenames-regexp'. Add menu items. (dired-mode): Add hook `dired-isearch-filenames-setup' to buffer-local `isearch-mode-hook'.
2008-07-29 14:42:07 +00:00
(define-key map (kbd "M-s f C-s") 'dired-isearch-filenames)
(define-key map (kbd "M-s f M-C-s") 'dired-isearch-filenames-regexp)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
;; misc
* lisp/dired.el (dired-mode-map): Add [remap read-only-mode] for `dired-toggle-read-only'. Fixes: debbugs:12462
2012-09-22 22:57:11 +00:00
(define-key map [remap read-only-mode] 'dired-toggle-read-only)
;; `toggle-read-only' is an obsolete alias for `read-only-mode'
* dired.el (dired-mode-map): Use command remapping (bug#6632).
2010-07-22 11:54:27 +00:00
(define-key map [remap toggle-read-only] 'dired-toggle-read-only)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map "?" 'dired-summary)
(define-key map "\177" 'dired-unmark-backward)
(dired-mode-map): Remap `undo' and `advertised-undo' instead of rebinding C-x u and C-_.
2005-01-29 17:28:48 +00:00
(define-key map [remap undo] 'dired-undo)
(define-key map [remap advertised-undo] 'dired-undo)
Rename "thumbnails" to "image-dired".
2007-04-22 13:40:00 +00:00
;; thumbnail manipulation (image-dired)
(define-key map "\C-td" 'image-dired-display-thumbs)
(define-key map "\C-tt" 'image-dired-tag-files)
(define-key map "\C-tr" 'image-dired-delete-tag)
(define-key map "\C-tj" 'image-dired-jump-thumbnail-buffer)
(define-key map "\C-ti" 'image-dired-dired-display-image)
(define-key map "\C-tx" 'image-dired-dired-display-external)
(define-key map "\C-ta" 'image-dired-display-thumbs-append)
(define-key map "\C-t." 'image-dired-display-thumb)
(define-key map "\C-tc" 'image-dired-dired-comment-files)
(define-key map "\C-tf" 'image-dired-mark-tagged-files)
* dired.el (dired-mode-map): Rebind "\C-t\C-t" from `image-dired-dired-insert-marked-thumbs' to `image-dired-dired-toggle-marked-thumbs'. * image-dired.el: Require cl when compiling. (image-dired-dired-toggle-marked-thumbs): Rename from `image-dired-dired-insert-marked-thumbs'. Add ARG. Doc fix. Use interactive spec "P". Set LOCALP arg of `dired-get-filename' to 'no-dir. Skip files whose names don't match `image-file-name-regexp'. When file has a thumbnail overlay, delete it. (Bug#5270)
2010-05-25 17:43:58 +00:00
(define-key map "\C-t\C-t" 'image-dired-dired-toggle-marked-thumbs)
Rename "thumbnails" to "image-dired".
2007-04-22 13:40:00 +00:00
(define-key map "\C-te" 'image-dired-dired-edit-comment-and-tags)
* epa-file.el (auto-encryption-mode): Rename from epa-file-mode. (epa-file-handler): Put 'safe-magic and 'operations properties. * epa.el (epa-global-minor-modes, epa-mode, epa-menu) (epa-menu-items): Remove. * epa-dired.el (epa-dired-do-decrypt, epa-dired-do-verify) (epa-dired-do-sign, epa-dired-do-encrypt): Add autoload cookie. (epa-dired-mode, epa-global-dired-mode): Remove. * dired.el (dired-mode-map): Bind encryption/decryption commands. * menu-bar.el (menu-bar-encryption-decryption-menu): New menu item. * files.el (insert-file-contents-literally): Inhibit epa-file-handler.
2008-04-27 19:49:15 +00:00
;; encryption and decryption (epa-dired)
(define-key map ":d" 'epa-dired-do-decrypt)
(define-key map ":v" 'epa-dired-do-verify)
(define-key map ":s" 'epa-dired-do-sign)
(define-key map ":e" 'epa-dired-do-encrypt)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
;; Make menu bar items.
; Fix some trivial doc typos
2019-01-12 22:47:33 +00:00
;; No need to do this, now that top-level items are fewer.
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
;;;;
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
;; Get rid of the Edit menu bar item to save space.
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
;(define-key map [menu-bar edit] 'undefined)
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar subdir]
(cons "Subdir" (make-sparse-keymap "Subdir")))
(define-key map [menu-bar subdir hide-all]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Hide All" dired-hide-all
:help "Hide all subdirectories, leave only header lines"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar subdir hide-subdir]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Hide/UnHide Subdir" dired-hide-subdir
:help "Hide or unhide current directory listing"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar subdir tree-down]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Tree Down" dired-tree-down
:help "Go to first subdirectory header down the tree"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar subdir tree-up]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Tree Up" dired-tree-up
:help "Go to first subdirectory header up the tree"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar subdir up]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Up Directory" dired-up-directory
:help "Edit the parent directory"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar subdir prev-subdir]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Prev Subdir" dired-prev-subdir
:help "Go to previous subdirectory header line"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar subdir next-subdir]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Next Subdir" dired-next-subdir
:help "Go to next subdirectory header line"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar subdir prev-dirline]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Prev Dirline" dired-prev-dirline
:help "Move to next directory-file line"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar subdir next-dirline]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Next Dirline" dired-next-dirline
:help "Move to previous directory-file line"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar subdir insert]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Insert This Subdir" dired-maybe-insert-subdir
* dired-aux.el (dired-query): Place cursor in echo area and allow C-g. * dired.el (dired-mode-map): Disable dired-maybe-insert-subdir menu item if not on a directory (Bug#4701).
2009-11-08 00:32:18 +00:00
:help "Insert contents of subdirectory"
:enable (let ((f (dired-get-filename nil t)))
(and f (file-directory-p f)))))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar immediate]
(cons "Immediate" (make-sparse-keymap "Immediate")))
(dired-mode-map): Fix breakage.
2006-05-24 21:42:14 +00:00
(define-key map
Rename "thumbnails" to "image-dired".
2007-04-22 13:40:00 +00:00
[menu-bar immediate image-dired-dired-display-external]
'(menu-item "Display Image Externally" image-dired-dired-display-external
* dired.el (dired-mode-map): Add help-echo strings to tumme commands. * dired.el (dired-mode-map): Bind `tumme-dired-display-image' to C-t i.
2006-05-25 15:11:10 +00:00
:help "Display image in external viewer"))
(dired-mode-map): Fix breakage.
2006-05-24 21:42:14 +00:00
(define-key map
Rename "thumbnails" to "image-dired".
2007-04-22 13:40:00 +00:00
[menu-bar immediate image-dired-dired-display-image]
'(menu-item "Display Image" image-dired-dired-display-image
* dired.el (dired-mode-map): Add help-echo strings to tumme commands. * dired.el (dired-mode-map): Bind `tumme-dired-display-image' to C-t i.
2006-05-25 15:11:10 +00:00
:help "Display sized image in a separate window"))
Capitalize non-function content words in menu item strings. * lisp/buff-menu.el (Buffer-menu-mode-map): * lisp/dired.el (dired-mode-map): * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-mode-map) (lisp-interaction-mode-map): * lisp/emacs-lisp/package.el (package-menu-mode-map): * lisp/epa.el (epa-key-list-mode-map): * lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu) (menu-bar-options-menu): * lisp/outline.el (outline-mode-menu-bar-map): * lisp/vc/vc-bzr.el (vc-bzr-shelve-menu-map, vc-bzr-extra-menu-map): * lisp/vc/vc-dir.el (vc-dir-menu-map): * lisp/vc/vc-git.el (vc-git-stash-menu-map, vc-git-extra-menu-map): Capitalize non-function content words in menu item strings. * lisp/dired.el (dired-mode-map): Add menu item for `image-dired-dired-toggle-marked-thumbs'.
2011-09-18 20:43:20 +00:00
(define-key map
[menu-bar immediate image-dired-dired-toggle-marked-thumbs]
'(menu-item "Toggle Image Thumbnails in This Buffer" image-dired-dired-toggle-marked-thumbs
:help "Add or remove image thumbnails in front of marked file names"))
(dired-mode-map): `tumme-display-dired-image' was renamed in tumme.el, but there was still a key binding to it here. Changed the binding to the new name.
2006-05-25 12:09:01 +00:00
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
(define-key map [menu-bar immediate hide-details]
'(menu-item "Hide Details" dired-hide-details-mode
:help "Hide details in buffer"
:button (:toggle . dired-hide-details-mode)))
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
(define-key map [menu-bar immediate revert-buffer]
'(menu-item "Refresh" revert-buffer
:help "Update contents of shown directories"))
Add a new command to report the number and size of the marked files 2019-06-25 Constantino Calancha <f92capac@gmail.com> * lisp/dired.el (dired-mode-map): New keystroke and menu binding (bug#22829). 2019-06-25 Lars Ingebrigtsen <larsi@gnus.org> * doc/emacs/dired.texi (Marks vs Flags): Document it. * lisp/dired.el (dired-number-of-marked-files): New command.
2019-06-25 14:29:03 +00:00
(define-key map [menu-bar immediate dired-number-of-marked-files]
'(menu-item "#Marked Files" dired-number-of-marked-files
:help "Display the number and size of the marked files"))
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
(define-key map [menu-bar immediate dashes]
'("--"))
(dired-mode-map): Fix breakage.
2006-05-24 21:42:14 +00:00
(dired-insert-set-properties): Add new text property `dired-filename' to put on file names. (dired-mode-map): Bind `M-s f C-s' to `dired-isearch-filenames' and `M-s f M-C-s' to `dired-isearch-filenames-regexp'. Add menu items. (dired-mode): Add hook `dired-isearch-filenames-setup' to buffer-local `isearch-mode-hook'.
2008-07-29 14:42:07 +00:00
(define-key map [menu-bar immediate isearch-filenames-regexp]
'(menu-item "Isearch Regexp in File Names..." dired-isearch-filenames-regexp
:help "Incrementally search for regexp in file names only"))
(define-key map [menu-bar immediate isearch-filenames]
'(menu-item "Isearch in File Names..." dired-isearch-filenames
:help "Incrementally search for string in file names only."))
(dired-mode-map): Add menu item "Compare directories" for dired-compare-directories.
2005-03-24 19:47:20 +00:00
(define-key map [menu-bar immediate compare-directories]
* dired.el (dired-mode-map): Change `tumme-tag-remove' to `tumme-delete-tag'. Rename `Remove Image Tag' to `Delete Image Tag'. Change "Compare directories..." to "Change Directories...". * dired.el (dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 23:27:55 +00:00
'(menu-item "Compare Directories..." dired-compare-directories
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
:help "Mark files with different attributes in two Dired buffers"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar immediate backup-diff]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Compare with Backup" dired-backup-diff
:help "Diff file at cursor with its latest backup"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar immediate diff]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Diff..." dired-diff
:help "Compare file at cursor with another file"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar immediate view]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "View This File" dired-view-file
:help "Examine file at cursor in read-only mode"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar immediate display]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Display in Other Window" dired-display-file
:help "Display file at cursor in other window"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar immediate find-file-other-window]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Find in Other Window" dired-find-file-other-window
:help "Edit file at cursor in other window"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar immediate find-file]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Find This File" dired-find-file
:help "Edit file at cursor"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar immediate create-directory]
(dired-mode-map): Add :help.
2008-04-30 05:41:52 +00:00
'(menu-item "Create Directory..." dired-create-directory
:help "Create a directory"))
New commands to create an empty file Similarly as `create-directory', `dired-create-directory', the new commands create the parent dirs as needed (Bug#24150). * lisp/files.el (make-empty-file): New command. * lisp/dired-aux.el (dired-create-empty-file): New command. (dired--find-topmost-parent-dir): New function extracted from `dired-create-directory'. (dired-create-directory, dired-create-empty-file): Use it. * lisp/dired.el (dired-mode-map): Add menu entry for `dired-create-empty-file'. * doc/emacs/dired.texi (Misc Dired Features) * doc/lispref/files.texi (Create/Delete Dirs): Update manual. ; * etc/NEWS: Announce the changes.
2018-08-02 04:20:46 +00:00
(define-key map [menu-bar immediate create-empty-file]
'(menu-item "Create Empty file..." dired-create-empty-file
:help "Create an empty file"))
(dired-mode-map): Add a menu entry for wdired.
2004-04-23 22:13:32 +00:00
(define-key map [menu-bar immediate wdired-mode]
(dired-mode-map): Bind C-x C-q to dired-toggle-read-only. Filter out menu item "Edit File Names" `wdired-change-to-wdired-mode' when major-mode is not dired-mode. (dired-toggle-read-only): New function. (dired-recursive-deletes): Remove obsolete comments about old default value. (dired-do-flagged-delete, dired-do-delete): Refill docstring.
2007-07-29 09:18:15 +00:00
'(menu-item "Edit File Names" wdired-change-to-wdired-mode
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
:help "Put a Dired buffer in a mode in which filenames are editable"
* dired.el (dired-mode-map): Show the key binding for wdired. * menu-bar.el (menu-bar-file-menu): Show the key binding for exiting emacs.
2008-07-23 05:58:24 +00:00
:keys "C-x C-q"
(dired-mode-map): Bind C-x C-q to dired-toggle-read-only. Filter out menu item "Edit File Names" `wdired-change-to-wdired-mode' when major-mode is not dired-mode. (dired-toggle-read-only): New function. (dired-recursive-deletes): Remove obsolete comments about old default value. (dired-do-flagged-delete, dired-do-delete): Refill docstring.
2007-07-29 09:18:15 +00:00
:filter (lambda (x) (if (eq major-mode 'dired-mode) x))))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar regexp]
(cons "Regexp" (make-sparse-keymap "Regexp")))
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
(define-key map
Rename "thumbnails" to "image-dired".
2007-04-22 13:40:00 +00:00
[menu-bar regexp image-dired-mark-tagged-files]
'(menu-item "Mark From Image Tag..." image-dired-mark-tagged-files
(dired-recursive-deletes, dired-recursive-copies): Doc fixes.
2007-05-16 10:51:25 +00:00
:help "Mark files whose image tags matches regexp"))
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
(define-key map [menu-bar regexp dashes-1]
(dired-recursive-deletes, dired-recursive-copies): Doc fixes.
2007-05-16 10:51:25 +00:00
'("--"))
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar regexp downcase]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Downcase" dired-downcase
;; When running on plain MS-DOS, there's only one
;; letter-case for file names.
:enable (or (not (fboundp 'msdos-long-file-names))
(msdos-long-file-names))
:help "Rename marked files to lower-case name"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar regexp upcase]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Upcase" dired-upcase
:enable (or (not (fboundp 'msdos-long-file-names))
(msdos-long-file-names))
:help "Rename marked files to upper-case name"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar regexp hardlink]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Hardlink..." dired-do-hardlink-regexp
:help "Make hard links for files matching regexp"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar regexp symlink]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Symlink..." dired-do-symlink-regexp
:visible (fboundp 'make-symbolic-link)
:help "Make symbolic links for files matching regexp"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar regexp rename]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Rename..." dired-do-rename-regexp
:help "Rename marked files matching regexp"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar regexp copy]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Copy..." dired-do-copy-regexp
:help "Copy marked files matching regexp"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar regexp flag]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Flag..." dired-flag-files-regexp
:help "Flag files matching regexp for deletion"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar regexp mark]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Mark..." dired-mark-files-regexp
:help "Mark files matching regexp for future operations"))
(dired-mode-map): Fix duplicate [menu-bar regexp mark].
1999-01-07 19:40:25 +00:00
(define-key map [menu-bar regexp mark-cont]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Mark Containing..." dired-mark-files-containing-regexp
:help "Mark files whose contents matches regexp"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark]
(cons "Mark" (make-sparse-keymap "Mark")))
(define-key map [menu-bar mark prev]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Previous Marked" dired-prev-marked-file
:help "Move to previous marked file"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark next]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Next Marked" dired-next-marked-file
:help "Move to next marked file"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark marks]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Change Marks..." dired-change-marks
:help "Replace marker with another character"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark unmark-all]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Unmark All" dired-unmark-all-marks))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark symlinks]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Mark Symlinks" dired-mark-symlinks
:visible (fboundp 'make-symbolic-link)
:help "Mark all symbolic links"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark directories]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Mark Directories" dired-mark-directories
:help "Mark all directories except `.' and `..'"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark directory]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Mark Old Backups" dired-clean-directory
:help "Flag old numbered backups for deletion"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark executables]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Mark Executables" dired-mark-executables
:help "Mark all executable files"))
(dired-garbage-files-regexp): New variable. (dired-flag-garbage-files): New command. (dired-mode-map): Put dired-flag-garbage-files on & and in menu.
1997-01-04 00:10:30 +00:00
(define-key map [menu-bar mark garbage-files]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Flag Garbage Files" dired-flag-garbage-files
:help "Flag unneeded files for deletion"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark backup-files]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Flag Backup Files" dired-flag-backup-files
:help "Flag all backup files for deletion"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark auto-save-files]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Flag Auto-save Files" dired-flag-auto-save-files
:help "Flag auto-save files for deletion"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark deletion]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Flag" dired-flag-file-deletion
:help "Flag current line's file for deletion"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark unmark]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Unmark" dired-unmark
:help "Unmark or unflag current line's file"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar mark mark]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Mark" dired-mark
:help "Mark current line's file for future operations"))
(dired-do-toggle): Moved here from dired-x.el. (dired-mode-map): Changed dired-do-toggle from "T" to "t".
1998-02-27 21:45:01 +00:00
(define-key map [menu-bar mark toggle-marks]
(dired-toggle-marks): Renamed from dired-do-toggle. Bindings changed.
2002-03-28 18:32:59 +00:00
'(menu-item "Toggle Marks" dired-toggle-marks
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
:help "Mark unmarked files, unmark marked ones"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate]
(cons "Operate" (make-sparse-keymap "Operate")))
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
(define-key map
Rename "thumbnails" to "image-dired".
2007-04-22 13:40:00 +00:00
[menu-bar operate image-dired-delete-tag]
'(menu-item "Delete Image Tag..." image-dired-delete-tag
* dired.el (dired-mode-map): Change `tumme-tag-remove' to `tumme-delete-tag'. Rename `Remove Image Tag' to `Delete Image Tag'. * dired.el (dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:33:53 +00:00
:help "Delete image tag from current or marked files"))
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
(define-key map
Rename "thumbnails" to "image-dired".
2007-04-22 13:40:00 +00:00
[menu-bar operate image-dired-tag-files]
'(menu-item "Add Image Tags..." image-dired-tag-files
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
:help "Add image tags to current or marked files"))
(define-key map
Rename "thumbnails" to "image-dired".
2007-04-22 13:40:00 +00:00
[menu-bar operate image-dired-dired-comment-files]
'(menu-item "Add Image Comment..." image-dired-dired-comment-files
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
:help "Add image comment to current or marked files"))
(define-key map
Rename "thumbnails" to "image-dired".
2007-04-22 13:40:00 +00:00
[menu-bar operate image-dired-display-thumbs]
Capitalize non-function content words in menu item strings. * lisp/buff-menu.el (Buffer-menu-mode-map): * lisp/dired.el (dired-mode-map): * lisp/emacs-lisp/lisp-mode.el (emacs-lisp-mode-map) (lisp-interaction-mode-map): * lisp/emacs-lisp/package.el (package-menu-mode-map): * lisp/epa.el (epa-key-list-mode-map): * lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu) (menu-bar-options-menu): * lisp/outline.el (outline-mode-menu-bar-map): * lisp/vc/vc-bzr.el (vc-bzr-shelve-menu-map, vc-bzr-extra-menu-map): * lisp/vc/vc-dir.el (vc-dir-menu-map): * lisp/vc/vc-git.el (vc-git-stash-menu-map, vc-git-extra-menu-map): Capitalize non-function content words in menu item strings. * lisp/dired.el (dired-mode-map): Add menu item for `image-dired-dired-toggle-marked-thumbs'.
2011-09-18 20:43:20 +00:00
'(menu-item "Display Image Thumbnails" image-dired-display-thumbs
(dired-mode-map): Fix menu text of image-dired-display-thumbs.
2008-07-19 23:55:41 +00:00
:help "Display image thumbnails for current or marked image files"))
(dired-recursive-deletes, dired-recursive-copies): Doc fixes.
2007-05-16 10:51:25 +00:00
* dired.el (dired-mode-map): Move encryption items to "Operate" menu (Bug#4703).
2009-11-15 16:23:07 +00:00
(define-key map [menu-bar operate dashes-4]
'("--"))
(define-key map
[menu-bar operate epa-dired-do-decrypt]
* dired.el (dired-mode-map): Menu string fixes. Fixes: debbugs:11616
2012-09-02 02:47:02 +00:00
'(menu-item "Decrypt..." epa-dired-do-decrypt
* dired.el (dired-mode-map): Make :help text more accurate. Fixes: debbugs:14893
2014-02-08 06:10:22 +00:00
:help "Decrypt current or marked files"))
* dired.el (dired-mode-map): Move encryption items to "Operate" menu (Bug#4703).
2009-11-15 16:23:07 +00:00
(define-key map
[menu-bar operate epa-dired-do-verify]
'(menu-item "Verify" epa-dired-do-verify
* dired.el (dired-mode-map): Make :help text more accurate. Fixes: debbugs:14893
2014-02-08 06:10:22 +00:00
:help "Verify digital signature of current or marked files"))
* dired.el (dired-mode-map): Move encryption items to "Operate" menu (Bug#4703).
2009-11-15 16:23:07 +00:00
(define-key map
[menu-bar operate epa-dired-do-sign]
* dired.el (dired-mode-map): Menu string fixes. Fixes: debbugs:11616
2012-09-02 02:47:02 +00:00
'(menu-item "Sign..." epa-dired-do-sign
* dired.el (dired-mode-map): Make :help text more accurate. Fixes: debbugs:14893
2014-02-08 06:10:22 +00:00
:help "Create digital signature of current or marked files"))
* dired.el (dired-mode-map): Move encryption items to "Operate" menu (Bug#4703).
2009-11-15 16:23:07 +00:00
(define-key map
[menu-bar operate epa-dired-do-encrypt]
* dired.el (dired-mode-map): Menu string fixes. Fixes: debbugs:11616
2012-09-02 02:47:02 +00:00
'(menu-item "Encrypt..." epa-dired-do-encrypt
* dired.el (dired-mode-map): Make :help text more accurate. Fixes: debbugs:14893
2014-02-08 06:10:22 +00:00
:help "Encrypt current or marked files"))
* dired.el (dired-mode-map): Move encryption items to "Operate" menu (Bug#4703).
2009-11-15 16:23:07 +00:00
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
(define-key map [menu-bar operate dashes-3]
(dired-recursive-deletes, dired-recursive-copies): Doc fixes.
2007-05-16 10:51:25 +00:00
'("--"))
(dired-mode-map): Move tumme commands to Operate, Regexp and Immediate menus. Change "Add Comment" to "Add Image Comment". Change "Add Image Tag" to "Add Image Tags".
2006-05-26 22:07:04 +00:00
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate query-replace]
Fix menu bindings of Dired 'A' and 'Q' commands * lisp/dired.el (dired-mode-map): Rebind "Search Files" and "Query Replace in Files" menu items to 'dired-do-find-regexp' and 'dired-do-find-regexp-and-replace', respectively. (Bug#24977)
2016-11-21 16:22:10 +00:00
'(menu-item "Query Replace in Files..." dired-do-find-regexp-and-replace
:help "Replace regexp matches in marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate search]
Fix menu bindings of Dired 'A' and 'Q' commands * lisp/dired.el (dired-mode-map): Rebind "Search Files" and "Query Replace in Files" menu items to 'dired-do-find-regexp' and 'dired-do-find-regexp-and-replace', respectively. (Bug#24977)
2016-11-21 16:22:10 +00:00
'(menu-item "Search Files..." dired-do-find-regexp
:help "Search marked files for matches of regexp"))
(dired-mode-map): Bind dired-do-isearch to `M-s a C-s' and dired-do-isearch-regexp to `M-s a M-C-s'. Add menu items.
2008-07-28 14:32:34 +00:00
(define-key map [menu-bar operate isearch-regexp]
'(menu-item "Isearch Regexp Files..." dired-do-isearch-regexp
:help "Incrementally search marked files for regexp"))
(define-key map [menu-bar operate isearch]
'(menu-item "Isearch Files..." dired-do-isearch
:help "Incrementally search marked files for string"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate chown]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Change Owner..." dired-do-chown
:visible (not (memq system-type '(ms-dos windows-nt)))
:help "Change the owner of marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate chgrp]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Change Group..." dired-do-chgrp
:visible (not (memq system-type '(ms-dos windows-nt)))
:help "Change the group of marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate chmod]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Change Mode..." dired-do-chmod
:help "Change mode (attributes) of marked files"))
Add autoload for `dired-do-touch'. (dired-touch-program): New var. (dired-mode-map): Bind `dired-do-touch' to T and add menu-item. (dired-no-confirm): Add `touch' to docstring.
2004-03-31 16:29:46 +00:00
(define-key map [menu-bar operate touch]
'(menu-item "Change Timestamp..." dired-do-touch
:help "Change timestamp of marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate load]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Load" dired-do-load
:help "Load marked Emacs Lisp files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate compile]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Byte-compile" dired-do-byte-compile
:help "Byte-compile marked Emacs Lisp files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate compress]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Compress" dired-do-compress
:help "Compress/uncompress marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate print]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Print..." dired-do-print
:help "Ask for print command and print marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate hardlink]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Hardlink to..." dired-do-hardlink
:help "Make hard links for current or marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate symlink]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Symlink to..." dired-do-symlink
:visible (fboundp 'make-symbolic-link)
:help "Make symbolic links for current or marked files"))
(dired-mode-map): Add menu entry for async shell command.
2009-09-15 02:36:26 +00:00
(define-key map [menu-bar operate async-command]
'(menu-item "Asynchronous Shell Command..." dired-do-async-shell-command
:help "Run a shell command asynchronously on current or marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate command]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Shell Command..." dired-do-shell-command
(dired-mode-map): Add menu entry for async shell command.
2009-09-15 02:36:26 +00:00
:help "Run a shell command on current or marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate delete]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Delete" dired-do-delete
:help "Delete current file or all marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate rename]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Rename to..." dired-do-rename
:help "Rename current file or move marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(define-key map [menu-bar operate copy]
(dired-mode-map): Don't remove "Edit" from the menu bar. Menu items converted to (menu-item format, help strings added. [downcase, upcase]: Don't enable on MS-DOS. [symlink, symlinks]: Don't show if make-symbolic-link is not bound. [chown, chgrp]: Don't show on MS-DOS and MS-Windows.
2000-02-24 12:59:48 +00:00
'(menu-item "Copy to..." dired-do-copy
:help "Copy current file or all marked files"))
(dired-mode-map): Set up the map completely before storing it into dired-mode-map.
1995-08-08 05:16:23 +00:00
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
map)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Local keymap for Dired mode buffers.")
Revert last change.
2001-01-26 13:14:11 +00:00
Initial revision
1992-05-30 23:52:26 +00:00
;; Dired mode is suitable only for specially formatted data.
(put 'dired-mode 'mode-class 'special)
Add handler to desktop-buffer-mode-handlers. (dired-restore-desktop-buffer): Remove autoload cookie. (dired-mode): Add autoload cookie.
2005-08-10 19:39:16 +00:00
;; Autoload cookie needed by desktop.el
;;;###autoload
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-mode (&optional dirname switches)
"\
Mode for \"editing\" directory listings.
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
In Dired, you are \"editing\" a list of the files in a directory and
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(optionally) its subdirectories, in the format of `ls -lR'.
*** empty log message ***
1992-06-24 02:13:56 +00:00
Each directory is a page: use \\[backward-page] and \\[forward-page] to move pagewise.
\"Editing\" means that you can run shell commands on files, visit,
compress, load or byte-compile them, change their file attributes
and insert subdirectories into the same buffer. You can \"mark\"
files for later commands or \"flag\" them for deletion, either file
by file or all files matching certain criteria.
You can move using the usual cursor motion commands.\\<dired-mode-map>
* dired.el (dired-mode): Fix up the doc string as suggested by Drew Adams (bug#8817).
2011-07-01 11:56:36 +00:00
The buffer is read-only. Digits are prefix arguments.
Type \\[dired-flag-file-deletion] to flag a file `D' for deletion.
*** empty log message ***
1992-06-24 02:13:56 +00:00
Type \\[dired-mark] to Mark a file or subdirectory for later commands.
Most commands operate on the marked files and use the current file
if no files are marked. Use a numeric prefix argument to operate on
the next ARG (or previous -ARG if ARG<0) files, or just `1'
to operate on the current file only. Prefix arguments override marks.
Mark-using commands display a list of failures afterwards. Type \\[dired-summary]
to see why something went wrong.
* dired.el (dired-mode): Fix up the doc string as suggested by Drew Adams (bug#8817).
2011-07-01 11:56:36 +00:00
Type \\[dired-unmark] to Unmark a file or all files of an inserted subdirectory.
* dired.el (dired-mode): Clarify "unmark or unflag". (dired-unmark-backward): Ditto. (dired-flag-backup-files): Ditto. * dired-x.el (dired-mark-sexp): Ditto. Fixes: debbugs:8770
2011-07-06 17:10:36 +00:00
Type \\[dired-unmark-backward] to back up one line and unmark or unflag.
* lisp/dired.el (dired-mode): make terminology for eXpunge command consistent. Fixes: debbugs:17276
2014-04-30 21:39:57 +00:00
Type \\[dired-do-flagged-delete] to delete (eXpunge) the files flagged `D'.
* keymap.c (QCadvertised_binding): New constant. (syms_of_keymap): Initialize it. (Fwhere_is_internal): Try and use bindings from :advertised-binding if applicable. * progmodes/xscheme.el (xscheme-evaluation-commands): Put a :advertised-binding property rather than using advertised-xscheme-send-previous-expression. (advertised-xscheme-send-previous-expression): Declare obsolete. * emulation/crisp.el (crisp-mode-map): Use `undo' rather than `advertised-undo'. (crisp-mode): Add corresponding bindings to undo's :advertised-binding instead. * dired.el (dired-mode-map): Put a :advertised-binding property rather than using dired-advertised-find-file. (dired-advertised-find-file): * simple.el (advertised-undo): * wid-edit.el (advertised-widget-backward): Declare obsolete. (widget-keymap): Put a :advertised-binding property rather than using advertised-widget-backward. * bindings.el (ctl-x-map): Put a :advertised-binding property rather than using advertised-undo. * tutorial.el (tutorial--default-keys): Adjust accordingly.
2009-09-11 00:58:59 +00:00
Type \\[dired-find-file] to Find the current line's file
*** empty log message ***
1992-06-24 02:13:56 +00:00
(or dired it in another buffer, if it is a directory).
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
Type \\[dired-find-file-other-window] to find file or Dired directory in Other window.
*** empty log message ***
1992-06-24 02:13:56 +00:00
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.
(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.
2005-07-20 14:08:39 +00:00
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.
*** empty log message ***
1992-06-24 02:13:56 +00:00
This retains all marks and hides subdirs again that were hidden before.
* dired.el (dired-mode): Fix up the doc string as suggested by Drew Adams (bug#8817).
2011-07-01 11:56:36 +00:00
Use `SPC' and `DEL' to move down and up by lines.
*** empty log message ***
1992-06-24 02:13:56 +00:00
(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.
2005-07-20 14:08:39 +00:00
If Dired ever gets confused, you can either type \\[revert-buffer] \
*** empty log message ***
1992-06-24 02:13:56 +00:00
to read the
directories again, type \\[dired-do-redisplay] \
* dired.el (dired-mode): Fix up the doc string as suggested by Drew Adams (bug#8817).
2011-07-01 11:56:36 +00:00
to relist the file at point or the marked files or a
*** empty log message ***
1992-06-24 02:13:56 +00:00
subdirectory, or type \\[dired-build-subdir-alist] to parse the buffer
again for the directory tree.
Customization variables (rename this buffer and type \\[describe-variable] on each line
for more info):
(dired-align-file): Don't assume line starts with spaces.
2004-11-22 05:07:07 +00:00
`dired-listing-switches'
`dired-trivial-filenames'
`dired-marker-char'
`dired-del-marker'
`dired-keep-marker-rename'
`dired-keep-marker-copy'
`dired-keep-marker-hardlink'
`dired-keep-marker-symlink'
*** empty log message ***
1992-06-24 02:13:56 +00:00
Hooks (use \\[describe-variable] to see their documentation):
(dired-align-file): Don't assume line starts with spaces.
2004-11-22 05:07:07 +00:00
`dired-before-readin-hook'
`dired-after-readin-hook'
`dired-mode-hook'
`dired-load-hook'
*** empty log message ***
1992-06-24 02:13:56 +00:00
Keybindings:
Initial revision
1992-05-30 23:52:26 +00:00
\\{dired-mode-map}"
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Not to be called interactively (e.g. dired-directory will be set
;; to default-directory, which is wrong with wildcards).
Initial revision
1992-05-30 23:52:26 +00:00
(kill-all-local-variables)
(use-local-map dired-mode-map)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-advertise) ; default-directory is already set
(setq major-mode 'dired-mode
mode-name "Dired"
(dired-align-file): Don't assume line starts with spaces.
2004-11-22 05:07:07 +00:00
;; case-fold-search nil
*** empty log message ***
1992-06-24 02:13:56 +00:00
buffer-read-only t
(dired-mode): Call propertized-buffer-identification to set mode-line-buffer-identification with text properties added.
2000-02-20 15:59:26 +00:00
mode-line-buffer-identification
(propertized-buffer-identification "%17b"))
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(add-to-invisibility-spec '(dired . t))
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
;; Ignore dired-hide-details-* value of invisible text property by default.
(when (eq buffer-invisibility-spec t)
(setq buffer-invisibility-spec (list t)))
Use #' instead of (function ...) * lisp/dired-aux.el (dired-do-chxxx, dired-clean-directory) (dired-mark-confirm, dired-query, dired-byte-compile) (dired-load, dired-update-file-line, dired-after-subdir-garbage) (dired-relist-file, dired-rename-subdir, dired-do-create-files) (dired-mark-read-file-name, dired-do-copy, dired-do-symlink) (dired-do-hardlink, dired-do-rename, dired-do-rename-regexp) (dired-do-copy-regexp, dired-do-hardlink-regexp) (dired-do-symlink-regexp, dired-create-files-non-directory) (dired-upcase, dired-downcase) * lisp/dired.el (dired-mode, dired-copy-filename-as-kill) (dired-internal-do-deletions, dired-internal-do-deletions): Prefer #' instead of (function ...).
2017-06-26 05:22:34 +00:00
(setq-local revert-buffer-function #'dired-revert)
(setq-local buffer-stale-function #'dired-buffer-stale-p)
Don't use file notification on non-file buffers Allow non-file buffers to declare that notification on their default-directory is sufficient to know when auto-revert updates are required by setting the new variable `buffer-auto-revert-by-notification' to non-nil. If nil, the default, then auto-revert will poll those buffers instead. (bug#35418). Currently, only Dired sets that variable. * lisp/autorevert.el (auto-revert-buffers): Modify condition for using notification. * lisp/files.el (buffer-auto-revert-by-notification): New variable. * lisp/dired.el (dired-mode): Set buffer-auto-revert-by-notification. * doc/emacs/arevert-xtra.texi (Non-File Buffers): Document new variable. * etc/NEWS (Changes in Specialized Modes and Packages): Describe new variable.
2019-05-07 22:02:59 +00:00
(setq-local buffer-auto-revert-by-notification t)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(setq-local page-delimiter "\n\n")
(setq-local dired-directory (or dirname default-directory))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; list-buffers uses this to display the dir being edited in this buffer.
* menu-bar.el (list-buffers-directory): Add docstring. Make automatically buffer-local. * dired.el (dired-mode): * files.el (cd-absolute): * pcvs.el (cvs-temp-buffer): * pcvs-util.el (cvs-get-buffer-create): * shell.el (shell-mode): * vc-dir.el (vc-dir-mode): Don't make `list-buffers-directory' buffer local.
2009-09-25 04:35:14 +00:00
(setq list-buffers-directory
(expand-file-name (if (listp dired-directory)
(car dired-directory)
dired-directory)))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(setq-local dired-actual-switches (or switches dired-listing-switches))
(setq-local font-lock-defaults
'(dired-font-lock-keywords t nil nil beginning-of-line))
(setq-local desktop-save-buffer 'dired-desktop-buffer-misc-data)
(dired-subdir-switches, dired-switches-alist): New vars. (dired-insert-old-subdirs): Do not repeatedly delete and reinsert subdirs if -R switch is used for a subdir. (dired-mode): Set `dired-switches-alist'. (dired-build-subdir-alist): Only print number of directories in echo area when invoked interactively.
2004-06-06 02:22:41 +00:00
(setq dired-switches-alist nil)
Obsolete dired-x's directory local variables in favor of standard ones. * lisp/dired.el (dired-mode): Call hack-dir-local-variables-non-file-buffer. * lisp/dired-x.el (dired-omit-mode): Safe if boolean. (dired-enable-local-variables): Fix doc and custom type. Mark risky. (dired-enable-local-variables, dired-local-variables-file) (dired-hack-local-variables): Make obsolete. (dired-omit-here-always): Use dir-locals.el instead. * doc/misc/dired-x.texi (Features): Don't advertise obsolete local variables. Simplify layout. (Omitting Variables): Update local variables example. (Local Variables): Say this is obsolete. Fix description of dired-enable-local-variables possible values. * etc/NEWS: Relocate the existing entry about directory local variables in file-les buffers, and make it clearer. Mention above dired changes.
2011-02-23 03:44:13 +00:00
(hack-dir-local-variables-non-file-buffer) ; before sorting
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-sort-other dired-actual-switches t)
* dired.el (dired-mode): Use dnd-* instead of x-dnd-* (dired-dnd-handle-local-file): Call dnd-get-local-file-name. (dired-dnd-handle-file): Call dnd-get-local-file-uri
2005-04-11 19:28:07 +00:00
(when (featurep 'dnd)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(setq-local dnd-protocol-alist
(append dired-dnd-protocol-alist dnd-protocol-alist)))
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(add-hook 'file-name-at-point-functions #'dired-file-name-at-point nil t)
(add-hook 'isearch-mode-hook #'dired-isearch-filenames-setup nil t)
* dnd.el (dnd-protocol-alist): Improve custom type. * dired.el (dired-dnd-protocol-alist): New variable. (dired-mode): Use `dired-dnd-protocol-alist'. Move call of `dired-mode-hook' to the end.
2005-05-11 19:32:51 +00:00
(run-mode-hooks 'dired-mode-hook))
Revert last change.
2001-01-26 13:14:11 +00:00
Apply typo patches from Paul Eggert.
1993-06-09 11:59:12 +00:00
;; Idiosyncratic dired commands that don't deal with marks.
Initial revision
1992-05-30 23:52:26 +00:00
(defun dired-summary ()
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Summarize basic Dired commands and show recent Dired errors."
Initial revision
1992-05-30 23:52:26 +00:00
(interactive)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-why)
Initial revision
1992-05-30 23:52:26 +00:00
;>> this should check the key-bindings and use substitute-command-keys if non-standard
(message
* dired.el (dired-summary): dired-do-rename is on "R", not "r".
1993-06-18 17:55:42 +00:00
"d-elete, u-ndelete, x-punge, f-ind, o-ther window, R-ename, C-opy, h-elp"))
Initial revision
1992-05-30 23:52:26 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-undo ()
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Undo in a Dired buffer.
*** empty log message ***
1992-06-24 02:13:56 +00:00
This doesn't recover lost files, it just undoes changes in the buffer itself.
(dired-undo): Call `dired-build-subdir-alist'. Limit scope of `buffer-read-only' binding.
2004-06-07 18:29:14 +00:00
You can use it to recover marks, killed lines or subdirs."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive)
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(let ((inhibit-read-only t))
(dired-undo): Call `dired-build-subdir-alist'. Limit scope of `buffer-read-only' binding.
2004-06-07 18:29:14 +00:00
(undo))
(dired-build-subdir-alist)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(message "Change in Dired buffer undone.
(dired-undo): Call `dired-build-subdir-alist'. Limit scope of `buffer-read-only' binding.
2004-06-07 18:29:14 +00:00
Actual changes in files cannot be undone by Emacs."))
Initial revision
1992-05-30 23:52:26 +00:00
(dired-mode-map): Bind C-x C-q to dired-toggle-read-only. Filter out menu item "Edit File Names" `wdired-change-to-wdired-mode' when major-mode is not dired-mode. (dired-toggle-read-only): New function. (dired-recursive-deletes): Remove obsolete comments about old default value. (dired-do-flagged-delete, dired-do-delete): Refill docstring.
2007-07-29 09:18:15 +00:00
(defun dired-toggle-read-only ()
Don't warn on toggle-read-only calls. Clarify the documentation of toggle-read-only, and audit the code tree for uses of toggle-read-only; where appropriate, switch to setting the variable buffer-read-only or calling toggle-read-only with a (new) second arg. * lisp/files.el (toggle-read-only): Doc fix and code cleanup. New arg to allow printing the message when called from Lisp. * lisp/emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions): Remove toggle-read-only. * lisp/bindings.el (mode-line-toggle-read-only): * lisp/dired.el (dired-toggle-read-only): * lisp/ibuffer.el (ibuffer-do-toggle-read-only): Call toggle-read-only with non-nil second arg. * lisp/bs.el (bs-toggle-readonly): * lisp/buff-menu.el (Buffer-menu-toggle-read-only): Remove with-no-warnings around toggle-read-only. * lisp/ffap.el (ffap--toggle-read-only): Accept a list of buffers. Remove with-no-warnings around toggle-read-only. (ffap-read-only, ffap-read-only-other-window) (ffap-read-only-other-frame): Callers changed. * lisp/help-mode.el: Don't require view package. (help-mode-finish): Set buffer-read-only instead of calling toggle-read-only. * lisp/emacs-lisp/eieio-custom.el (eieio-customize-object): * lisp/vc/ediff.el (ediff-set-read-only-in-buf-A): Set buffer-read-only directly. * lisp/gnus/smime.el (smime-certificate-info): Set buffer-read-only directly, instead of calling toggle-read-only with a (bogus) argument. * doc/emacs/buffers.texi (Misc Buffer): Document view-read-only. * doc/lispref/buffers.texi (Read Only Buffers): Document toggle-read-only changes. Reword to account for the fact that read-only is currently not supported in overlay properties.
2012-07-13 07:06:09 +00:00
"Edit Dired buffer with Wdired, or make it read-only.
If the current buffer can be edited with Wdired, (i.e. the major
mode is `dired-mode'), call `wdired-change-to-wdired-mode'.
Small fixes re toggle-read-only, mainly doc * progmodes/hideif.el (hide-ifdef-mode-submap): Also substitute read-only-mode. * bindings.el (mode-line-toggle-read-only): * bs.el (bs-toggle-readonly): * buff-menu.el (Buffer-menu-toggle-read-only): * dired.el (dired-toggle-read-only): * files.el (view-read-only, find-file-read-only) (find-file-read-only-other-window) (find-file-read-only-other-frame): * progmodes/hideif.el (hide-ifdef-toggle-outside-read-only): Doc fixes re toggle-read-only. * view.el: Comment updates.
2014-07-21 05:38:17 +00:00
Otherwise, toggle `read-only-mode'."
(dired-mode-map): Bind C-x C-q to dired-toggle-read-only. Filter out menu item "Edit File Names" `wdired-change-to-wdired-mode' when major-mode is not dired-mode. (dired-toggle-read-only): New function. (dired-recursive-deletes): Remove obsolete comments about old default value. (dired-do-flagged-delete, dired-do-delete): Refill docstring.
2007-07-29 09:18:15 +00:00
(interactive)
* lisp/ibuffer.el (ibuffer-do-toggle-read-only): * lisp/dired.el (dired-toggle-read-only): * lisp/buff-menu.el (Buffer-menu-toggle-read-only): * lisp/bindings.el (mode-line-toggle-read-only): * lisp/bs.el (bs-toggle-readonly): Call toggle-read-only interactively.
2012-08-12 17:29:53 +00:00
(if (derived-mode-p 'dired-mode)
(dired-mode-map): Bind C-x C-q to dired-toggle-read-only. Filter out menu item "Edit File Names" `wdired-change-to-wdired-mode' when major-mode is not dired-mode. (dired-toggle-read-only): New function. (dired-recursive-deletes): Remove obsolete comments about old default value. (dired-do-flagged-delete, dired-do-delete): Refill docstring.
2007-07-29 09:18:15 +00:00
(wdired-change-to-wdired-mode)
Convert toggle-read-only calls to read-only-mode. * bindings.el (mode-line-toggle-read-only): * bs.el (bs-toggle-readonly): * buff-menu.el (Buffer-menu-toggle-read-only): * dired.el (dired-toggle-read-only): * ibuffer.el (ibuffer-do-toggle-read-only): Use read-only-mode.
2012-09-23 10:21:34 +00:00
(read-only-mode 'toggle)))
(dired-mode-map): Bind C-x C-q to dired-toggle-read-only. Filter out menu item "Edit File Names" `wdired-change-to-wdired-mode' when major-mode is not dired-mode. (dired-toggle-read-only): New function. (dired-recursive-deletes): Remove obsolete comments about old default value. (dired-do-flagged-delete, dired-do-delete): Refill docstring.
2007-07-29 09:18:15 +00:00
Initial revision
1992-05-30 23:52:26 +00:00
(defun dired-next-line (arg)
"Move down lines then position at filename.
Optional prefix ARG says how many lines to move; default is one line."
Add "^" to the interactive specs of `dired-next/previous-line' * lisp/dired.el (dired-next-line, dired-previous-line): It makes sense to bind these commands to the arrow keys, and that means that they work better with a "^" in the `interactive' declaration so selection works as expected.
2015-11-12 08:07:38 +00:00
(interactive "^p")
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
(let ((line-move-visual)
(goal-column))
(line-move arg t))
;; We never want to move point into an invisible line.
(while (and (invisible-p (point))
(not (if (and arg (< arg 0)) (bobp) (eobp))))
(forward-char (if (and arg (< arg 0)) -1 1)))
Initial revision
1992-05-30 23:52:26 +00:00
(dired-move-to-filename))
(defun dired-previous-line (arg)
"Move up lines then position at filename.
Optional prefix ARG says how many lines to move; default is one line."
Add "^" to the interactive specs of `dired-next/previous-line' * lisp/dired.el (dired-next-line, dired-previous-line): It makes sense to bind these commands to the arrow keys, and that means that they work better with a "^" in the `interactive' declaration so selection works as expected.
2015-11-12 08:07:38 +00:00
(interactive "^p")
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
(dired-next-line (- (or arg 1))))
Initial revision
1992-05-30 23:52:26 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-next-dirline (arg &optional opoint)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Goto ARGth next directory file line."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive "p")
(or opoint (setq opoint (point)))
(if (if (> arg 0)
(re-search-forward dired-re-dir nil t arg)
(beginning-of-line)
(re-search-backward dired-re-dir nil t (- arg)))
(dired-move-to-filename) ; user may type `i' or `f'
(goto-char opoint)
(error "No more subdirectories")))
(defun dired-prev-dirline (arg)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Goto ARGth previous directory file line."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive "p")
(dired-next-dirline (- arg)))
(dired-up-directory): Add optional argument `other-window' to obviate the need to redefine it in dired-x.el.
1995-09-12 23:20:42 +00:00
(defun dired-up-directory (&optional other-window)
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
"Run Dired on parent directory of current directory.
*** empty log message ***
1992-06-24 02:13:56 +00:00
Find the parent directory either in this buffer or another buffer.
(dired-up-directory): Doc fix (bug#14848).
2014-02-08 06:20:17 +00:00
Creates a buffer if necessary.
If OTHER-WINDOW (the optional prefix arg), display the parent
directory in another window."
(dired-up-directory): Add optional argument `other-window' to obviate the need to redefine it in dired-x.el.
1995-09-12 23:20:42 +00:00
(interactive "P")
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let* ((dir (dired-current-directory))
(up (file-name-directory (directory-file-name dir))))
(or (dired-goto-file (directory-file-name dir))
entered into RCS
1992-09-19 19:40:38 +00:00
;; Only try dired-goto-subdir if buffer has more than one dir.
(and (cdr dired-subdir-alist)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-goto-subdir up))
(progn
(dired-up-directory): Add optional argument `other-window' to obviate the need to redefine it in dired-x.el.
1995-09-12 23:20:42 +00:00
(if other-window
(dired-other-window up)
(dired up))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-goto-file dir)))))
Initial revision
1992-05-30 23:52:26 +00:00
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
(defun dired-get-file-for-visit ()
"Get the current line's file name, with an error if file does not exist."
(dired-find-file): Likewise.
1997-05-28 03:35:42 +00:00
(interactive)
(dired-get-filename): Err for . and .. in usual case. (dired-get-file-for-visit): Specify no-error to dired-get-filename, and check for real errors here. (dired-unmark-all-files): Specify no-error to dired-get-filename.
2003-06-04 09:02:55 +00:00
;; We pass t for second arg so that we don't get error for `.' and `..'.
(let ((raw (dired-get-filename nil t))
file-name)
(if (null raw)
* lisp/vc/log-view.el: Better error handling (bug#33295). * lisp/vc/log-view.el (log-view-find-revision) (log-view-annotate-version): Add condition to signal an error when log-view-vc-fileset contains a directory. Use user-error instead of error. * lisp/dired.el (dired-get-file-for-visit): * lisp/locate.el (locate-do-setup): Use user-error instead of error.
2018-11-07 22:42:28 +00:00
(user-error "No file on this line"))
(dired-get-filename): Err for . and .. in usual case. (dired-get-file-for-visit): Specify no-error to dired-get-filename, and check for real errors here. (dired-unmark-all-files): Specify no-error to dired-get-filename.
2003-06-04 09:02:55 +00:00
(setq file-name (file-name-sans-versions raw t))
(dired-find-file): Error if line's file does not exist.
1996-10-31 20:51:44 +00:00
(if (file-exists-p file-name)
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
file-name
(dired-find-file): Better error message for symlink to nonexistent target.
1997-07-16 20:55:50 +00:00
(if (file-symlink-p file-name)
(error "File is a symlink to a nonexistent target")
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(error "File no longer exists; type `g' to update Dired buffer")))))
Initial revision
1992-05-30 23:52:26 +00:00
Comment.
2009-01-27 03:53:07 +00:00
;; Force C-m keybinding rather than `f' or `e' in the mode doc:
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(define-obsolete-function-alias 'dired-advertised-find-file
#'dired-find-file "23.2")
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
(defun dired-find-file ()
"In Dired, visit the file or directory named on this line."
(interactive)
(dired-get-filename): Don't err for . and .. for calls from dired-add-entry.
2003-06-05 22:00:13 +00:00
;; Bind `find-file-run-dired' so that the command works on directories
(dired-find-file): Bind find-file-run-dired around the call to find-file.
2003-05-05 21:22:13 +00:00
;; too, independent of the user's setting.
Preserve point in Dired windows under 'dired-auto-revert-buffer' * lisp/dired.el (dired-find-file): When dired-auto-revert-buffer is non-nil, bind switch-to-buffer-preserve-window-point to nil while calling find-file. (Bug#27243)
2017-06-10 08:22:50 +00:00
(let ((find-file-run-dired t)
;; This binding prevents problems with preserving point in
;; windows displaying Dired buffers, because reverting a Dired
;; buffer empties it, which changes the places where the
;; markers used by switch-to-buffer-preserve-window-point
;; point.
(switch-to-buffer-preserve-window-point
(if dired-auto-revert-buffer
nil
switch-to-buffer-preserve-window-point)))
(dired-find-file): Bind find-file-run-dired around the call to find-file.
2003-05-05 21:22:13 +00:00
(find-file (dired-get-file-for-visit))))
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
(dired-find-alternate-file): New function. (dired-mode-map): Bind `a' to dired-find-alternate-file. (toplevel): Require dired-aux when compiling. (dired-buffers): Move defvar within file to avoid compiler warning.
2000-07-07 13:00:21 +00:00
(defun dired-find-alternate-file ()
* lisp/dired.el (dired-find-alternate-file): Doc fix. (Bug#28963)
2017-10-27 14:57:58 +00:00
"In Dired, visit file or directory on current line via `find-alternate-file'.
This kills the Dired buffer, then visits the current line's file or directory."
(dired-find-alternate-file): New function. (dired-mode-map): Bind `a' to dired-find-alternate-file. (toplevel): Require dired-aux when compiling. (dired-buffers): Move defvar within file to avoid compiler warning.
2000-07-07 13:00:21 +00:00
(interactive)
(set-buffer-modified-p nil)
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
(find-alternate-file (dired-get-file-for-visit)))
Add comment for last change.
2002-08-02 22:21:43 +00:00
;; Don't override the setting from .emacs.
Hide disabling of dired-find-alternate-file behind autoload-cookie.
2002-07-31 12:08:06 +00:00
;;;###autoload (put 'dired-find-alternate-file 'disabled t)
(dired-find-alternate-file): New function. (dired-mode-map): Bind `a' to dired-find-alternate-file. (toplevel): Require dired-aux when compiling. (dired-buffers): Move defvar within file to avoid compiler warning.
2000-07-07 13:00:21 +00:00
Make mouse clicks in Dired more customizable * lisp/dired.el (dired-mouse-find-file): Allow callers to specify functions to visit file/directory. (dired-mouse-find-file-other-window) (dired-mouse-find-file-other-frame): New functions to visit files in another window/frame. (Bug#27435)
2017-09-08 08:52:47 +00:00
(defun dired-mouse-find-file (event &optional find-file-func find-dir-func)
"In Dired, visit the file or directory name you click on.
The optional arguments FIND-FILE-FUNC and FIND-DIR-FUNC specify
functions to visit the file and directory, respectively. If
omitted or nil, these arguments default to `find-file' and `dired',
respectively."
(dired-mouse-find-file-other-window): New command. (dired-mode-map): Bind mouse-2.
1994-03-30 17:22:59 +00:00
(interactive "e")
Make mouse clicks in Dired more customizable * lisp/dired.el (dired-mouse-find-file): Allow callers to specify functions to visit file/directory. (dired-mouse-find-file-other-window) (dired-mouse-find-file-other-frame): New functions to visit files in another window/frame. (Bug#27435)
2017-09-08 08:52:47 +00:00
(or find-file-func (setq find-file-func 'find-file))
(or find-dir-func (setq find-dir-func 'dired))
(dired-mouse-find-file-other-window): Handle events that move out of the window.
2002-04-23 03:14:48 +00:00
(let (window pos file)
(dired-mouse-find-file-other-window): New command. (dired-mode-map): Bind mouse-2.
1994-03-30 17:22:59 +00:00
(save-excursion
(dired-mouse-find-file-other-window): Handle events that move out of the window.
2002-04-23 03:14:48 +00:00
(setq window (posn-window (event-end event))
pos (posn-point (event-end event)))
(if (not (windowp window))
(error "No file chosen"))
(set-buffer (window-buffer window))
(goto-char pos)
(setq file (dired-get-file-for-visit)))
(dired-mouse-find-file-other-window): Use dired-view-command-alist here, as in dired-view-file. (dired-view-command-alist): Use %s to substitute file name. Handle .ps_pages, .eps, .jpg, .gif, .png.
2003-08-29 16:10:45 +00:00
(if (file-directory-p file)
(or (and (cdr dired-subdir-alist)
(dired-goto-subdir file))
(progn
(select-window window)
Make mouse clicks in Dired more customizable * lisp/dired.el (dired-mouse-find-file): Allow callers to specify functions to visit file/directory. (dired-mouse-find-file-other-window) (dired-mouse-find-file-other-frame): New functions to visit files in another window/frame. (Bug#27435)
2017-09-08 08:52:47 +00:00
(funcall find-dir-func file)))
(dired-view-command-alist): Variable deleted. (dired-view-file, dired-mouse-find-file-other-window): Delete the code to use it.
2005-01-01 14:20:10 +00:00
(select-window window)
Make mouse clicks in Dired more customizable * lisp/dired.el (dired-mouse-find-file): Allow callers to specify functions to visit file/directory. (dired-mouse-find-file-other-window) (dired-mouse-find-file-other-frame): New functions to visit files in another window/frame. (Bug#27435)
2017-09-08 08:52:47 +00:00
(funcall find-file-func (file-name-sans-versions file t)))))
(defun dired-mouse-find-file-other-window (event)
"In Dired, visit the file or directory name you click on in another window."
(interactive "e")
(dired-mouse-find-file event 'find-file-other-window 'dired-other-window))
(defun dired-mouse-find-file-other-frame (event)
"In Dired, visit the file or directory name you click on in another frame."
(interactive "e")
(dired-mouse-find-file event 'find-file-other-frame 'dired-other-frame))
(dired-view-command-alist): New variable. (dired-view-file): Use external viewers for some files names.
2002-04-10 15:15:23 +00:00
Initial revision
1992-05-30 23:52:26 +00:00
(defun dired-view-file ()
(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.
2005-07-20 14:08:39 +00:00
"In Dired, examine a file in view mode, returning to Dired when done.
(dired-view-command-alist): New variable. (dired-view-file): Use external viewers for some files names.
2002-04-10 15:15:23 +00:00
When file is a directory, show it in this buffer if it is inserted.
(dired-view-command-alist): Variable deleted. (dired-view-file, dired-mouse-find-file-other-window): Delete the code to use it.
2005-01-01 14:20:10 +00:00
Otherwise, display it in another buffer."
Initial revision
1992-05-30 23:52:26 +00:00
(interactive)
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
(let ((file (dired-get-file-for-visit)))
(if (file-directory-p file)
(or (and (cdr dired-subdir-alist)
(dired-goto-subdir file))
(dired file))
(dired-view-command-alist): Variable deleted. (dired-view-file, dired-mouse-find-file-other-window): Delete the code to use it.
2005-01-01 14:20:10 +00:00
(view-file file))))
Initial revision
1992-05-30 23:52:26 +00:00
(defun dired-find-file-other-window ()
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
"In Dired, visit this file or directory in another window."
Initial revision
1992-05-30 23:52:26 +00:00
(interactive)
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
(find-file-other-window (dired-get-file-for-visit)))
*** empty log message ***
1992-07-27 02:56:28 +00:00
(defun dired-display-file ()
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
"In Dired, display this file or directory in another window."
*** empty log message ***
1992-07-27 02:56:28 +00:00
(interactive)
Ensure dired-display-file displays it in other window. * dired.el (dired-display-file): Force use of other window.
2014-03-18 12:07:01 +00:00
(display-buffer (find-file-noselect (dired-get-file-for-visit))
t))
Revert last change.
2001-01-26 13:14:11 +00:00
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
;;; Functions for extracting and manipulating file names in Dired buffers.
Initial revision
1992-05-30 23:52:26 +00:00
(defun dired-get-filename (&optional localp no-error-if-not-filep)
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
"In Dired, return name of file mentioned on this line.
Initial revision
1992-05-30 23:52:26 +00:00
Value returned normally includes the directory name.
*** empty log message ***
1992-06-24 02:13:56 +00:00
Optional arg LOCALP with value `no-dir' means don't include directory
(dired-re-dot): Make it handle trailing /. (dired-get-filename): Update documentation string. Revert previous change and fix typo in earlier version.
2003-06-10 04:03:03 +00:00
name in result. A value of `verbatim' means to return the name exactly as
it occurs in the buffer, and a value of t means construct name relative to
`default-directory', which still may contain slashes if in a subdirectory.
Optional arg NO-ERROR-IF-NOT-FILEP means treat `.' and `..' as
regular filenames and return nil if no filename on this line.
Otherwise, an error occurs in these cases."
* ls-lisp.el (ls-lisp-insert-directory): Print an explicit message if one of the files specified cannot be accessed by file-attributes. Do not strip any leading directories from the file names, to behave more like `ls' does. * dired.el (dired-get-filename): Handle absolute file names. (dired-readin-insert): If argument is a cons, don't print "wildcard" on the ``total'' line.
1999-12-16 09:43:32 +00:00
(let (case-fold-search file p1 p2 already-absolute)
Initial revision
1992-05-30 23:52:26 +00:00
(save-excursion
*** empty log message ***
1992-06-24 02:13:56 +00:00
(if (setq p1 (dired-move-to-filename (not no-error-if-not-filep)))
(setq p2 (dired-move-to-end-of-filename no-error-if-not-filep))))
;; nil if no file on this line, but no-error-if-not-filep is t:
(dired-insert-directory): Quote certain chars with \. (dired-get-filename): Always unquote \ quoting.
1994-12-07 10:57:12 +00:00
(if (setq file (and p1 p2 (buffer-substring p1 p2)))
(progn
;; Get rid of the mouse-face property that file names have.
(set-text-properties 0 (length file) nil file)
;; Unquote names quoted by ls or by dired-insert-directory.
* dired.el (dired-get-filename): Always pass filename through `read' to ensure unquoting is performed (Bug#2862).
2009-04-02 22:16:17 +00:00
;; This code was written using `read' to unquote, because
;; it's faster than substituting \007 (4 chars) -> ^G (1
;; char) etc. in a lisp loop. Unfortunately, this decision
;; has necessitated hacks such as dealing with filenames
;; with quotation marks in their names.
(while (string-match "\\(?:[^\\]\\|\\`\\)\\(\"\\)" file)
(setq file (replace-match "\\\"" nil t file 1)))
dired fix for `ls -b' quoting of spaces (bug#10469) * lisp/dired.el (dired-switches-escape-p): New function. (dired-insert-directory): Use dired-switches-escape-p. (dired-get-filename): Undo "\ " quoting if needed.
2012-01-13 23:09:28 +00:00
;; Unescape any spaces escaped by ls -b (bug#10469).
;; Other -b quotes, eg \t, \n, work transparently.
(if (dired-switches-escape-p dired-actual-switches)
* lisp/dired.el (dired-get-filename): Fix 'verbatim case of previous change.
2012-01-14 02:07:49 +00:00
(let ((start 0)
(rep "")
(shift -1))
(if (eq localp 'verbatim)
(setq rep "\\\\"
shift +1))
dired fix for `ls -b' quoting of spaces (bug#10469) * lisp/dired.el (dired-switches-escape-p): New function. (dired-insert-directory): Use dired-switches-escape-p. (dired-get-filename): Undo "\ " quoting if needed.
2012-01-13 23:09:28 +00:00
(while (string-match "\\(\\\\\\) " file start)
* lisp/dired.el (dired-get-filename): Fix 'verbatim case of previous change.
2012-01-14 02:07:49 +00:00
(setq file (replace-match rep nil t file 1)
start (+ shift (match-end 0))))))
Fix bug #7308 with `locate' on MS-Windows. dired.el (dired-get-filename): Replace backslashes with slashes in file names on MS-Windows, needed by `locate'. locate.el (locate-default-make-command-line): Don't consider drive letter and root directory part of `directory-listing-before-filename-regexp'. (locate-post-command-hook, locate-post-command-hook): New defcustoms.
2010-11-27 09:56:49 +00:00
(when (eq system-type 'windows-nt)
(save-match-data
(let ((start 0))
(while (string-match "\\\\" file start)
(aset file (match-beginning 0) ?/)
(setq start (match-end 0))))))
dired fix for `ls -b' quoting of spaces (bug#10469) * lisp/dired.el (dired-switches-escape-p): New function. (dired-insert-directory): Use dired-switches-escape-p. (dired-get-filename): Undo "\ " quoting if needed.
2012-01-13 23:09:28 +00:00
;; Hence we don't need to worry about converting `\\' back to `\'.
* lisp/dired.el (dired-get-filename): Don't string-to-multibyte We don't need to convert manually to multibyte now that Emacs doesn't silently convert (uni)bytes into latin-N chars depending on locale any more.
2018-02-27 21:18:30 +00:00
(setq file (read (concat "\"" file "\"")))))
Do not munge contents of local symbolic links This lets Emacs deal with arbitrary local symlinks without mishandling their contents (Bug#28156). For example, (progn (shell-command "ln -fs '~' 'x'") (rename-file "x" "/tmp/x")) now consistently creates a symbolic link from '/tmp/x' to '~'. Formerly, it did that only if the working directory was on the same filesystem as /tmp; otherwise, it expanded the '~' to the user's home directory. * lisp/dired.el (dired-get-filename): Use files--name-absolute-system-p instead of rolling our own code. * lisp/files.el (files--name-absolute-system-p): New function. (file-truename, file-chase-links): Use it to avoid mishandling symlink contents that begin with ~. (copy-directory, move-file-to-trash): Use concat rather than expand-file-name, to avoid mishandling symlink contents that begin with ~. * src/fileio.c (Fmake_symbolic_link): Do not expand leading "~" in the target unless interactive. Strip leading "/:" if interactive. (emacs_readlinkat): Do not prepend "/:" to the link target if it starts with "/" and contains ":" before NUL. * test/src/fileio-tests.el (try-link): Rename from try-char, and accept a string instead of a char. All uses changed. (fileio-tests--symlink-failure): Also test leading ~, and "/:", to test the new behavior.
2017-08-27 01:36:38 +00:00
(and file (files--name-absolute-system-p file)
* ls-lisp.el (ls-lisp-insert-directory): Print an explicit message if one of the files specified cannot be accessed by file-attributes. Do not strip any leading directories from the file names, to behave more like `ls' does. * dired.el (dired-get-filename): Handle absolute file names. (dired-readin-insert): If argument is a cons, don't print "wildcard" on the ``total'' line.
1999-12-16 09:43:32 +00:00
(setq already-absolute t))
(cond
(dired-get-filename): Add /: when appropriate to avoid taking a local name as remote.
2002-02-06 15:30:40 +00:00
((null file)
nil)
(dired-get-filename): Don't err for . and .. for calls from dired-add-entry.
2003-06-05 22:00:13 +00:00
((eq localp 'verbatim)
file)
(dired-get-filename): Err for . and .. in usual case. (dired-get-file-for-visit): Specify no-error to dired-get-filename, and check for real errors here. (dired-unmark-all-files): Specify no-error to dired-get-filename.
2003-06-04 09:02:55 +00:00
((and (not no-error-if-not-filep)
(dired-get-filename): Don't use dired-re-dot.
2004-05-30 18:24:08 +00:00
(member file '("." "..")))
(dired-get-filename): Err for . and .. in usual case. (dired-get-file-for-visit): Specify no-error to dired-get-filename, and check for real errors here. (dired-unmark-all-files): Specify no-error to dired-get-filename.
2003-06-04 09:02:55 +00:00
(error "Cannot operate on `.' or `..'"))
* ls-lisp.el (ls-lisp-insert-directory): Print an explicit message if one of the files specified cannot be accessed by file-attributes. Do not strip any leading directories from the file names, to behave more like `ls' does. * dired.el (dired-get-filename): Handle absolute file names. (dired-readin-insert): If argument is a cons, don't print "wildcard" on the ``total'' line.
1999-12-16 09:43:32 +00:00
((and (eq localp 'no-dir) already-absolute)
(file-name-nondirectory file))
(dired-get-filename): Add /: when appropriate to avoid taking a local name as remote.
2002-02-06 15:30:40 +00:00
(already-absolute
(defgroup dired): Use `files' as parent. (dired-get-filename): Ignore handler if it has safe-magic prop.
2002-09-01 13:27:47 +00:00
(let ((handler (find-file-name-handler file nil)))
;; check for safe-magic property so that we won't
;; put /: for names that don't really need them.
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
;; For instance, .gz files when auto-compression-mode is on.
(defgroup dired): Use `files' as parent. (dired-get-filename): Ignore handler if it has safe-magic prop.
2002-09-01 13:27:47 +00:00
(if (and handler (not (get handler 'safe-magic)))
(concat "/:" file)
file)))
(dired-get-filename): Add /: when appropriate to avoid taking a local name as remote.
2002-02-06 15:30:40 +00:00
((eq localp 'no-dir)
* ls-lisp.el (ls-lisp-insert-directory): Print an explicit message if one of the files specified cannot be accessed by file-attributes. Do not strip any leading directories from the file names, to behave more like `ls' does. * dired.el (dired-get-filename): Handle absolute file names. (dired-readin-insert): If argument is a cons, don't print "wildcard" on the ``total'' line.
1999-12-16 09:43:32 +00:00
file)
(dired-get-filename): Add /: when appropriate to avoid taking a local name as remote.
2002-02-06 15:30:40 +00:00
((equal (dired-current-directory) "/")
(setq file (concat (dired-current-directory localp) file))
(defgroup dired): Use `files' as parent. (dired-get-filename): Ignore handler if it has safe-magic prop.
2002-09-01 13:27:47 +00:00
(let ((handler (find-file-name-handler file nil)))
;; check for safe-magic property so that we won't
;; put /: for names that don't really need them.
;; For instance, .gz files when auto-compression-mode is on.
(if (and handler (not (get handler 'safe-magic)))
(concat "/:" file)
file)))
* ls-lisp.el (ls-lisp-insert-directory): Print an explicit message if one of the files specified cannot be accessed by file-attributes. Do not strip any leading directories from the file names, to behave more like `ls' does. * dired.el (dired-get-filename): Handle absolute file names. (dired-readin-insert): If argument is a cons, don't print "wildcard" on the ``total'' line.
1999-12-16 09:43:32 +00:00
(t
(dired-get-filename): Add /: when appropriate to avoid taking a local name as remote.
2002-02-06 15:30:40 +00:00
(concat (dired-current-directory localp) file)))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-string-replace-match): Function moved here.
1994-12-22 04:17:30 +00:00
(defun dired-string-replace-match (regexp string newtext
(dired-get-filename): Don't err for . and .. for calls from dired-add-entry.
2003-06-05 22:00:13 +00:00
&optional literal global)
(dired-string-replace-match): Function moved here.
1994-12-22 04:17:30 +00:00
"Replace first match of REGEXP in STRING with NEWTEXT.
If it does not match, nil is returned instead of the new string.
Optional arg LITERAL means to take NEWTEXT literally.
Optional arg GLOBAL means to replace all matches."
(if global
(dired-string-replace-match): Return `nil' when no match found with global search.
1999-08-28 18:23:14 +00:00
(let ((start 0) ret)
(dired-string-replace-match): Simplify using replace-match.
1995-08-21 01:15:25 +00:00
(while (string-match regexp string start)
(let ((from-end (- (length string) (match-end 0))))
(dired-string-replace-match): Return `nil' when no match found with global search.
1999-08-28 18:23:14 +00:00
(setq ret (setq string (replace-match newtext t literal string)))
(dired-string-replace-match): Simplify using replace-match.
1995-08-21 01:15:25 +00:00
(setq start (- (length string) from-end))))
(dired-string-replace-match): Return `nil' when no match found with global search.
1999-08-28 18:23:14 +00:00
ret)
(dired-string-replace-match): Function moved here.
1994-12-22 04:17:30 +00:00
(if (not (string-match regexp string 0))
nil
(dired-string-replace-match): Simplify using replace-match.
1995-08-21 01:15:25 +00:00
(replace-match newtext t literal string))))
(dired-string-replace-match): Function moved here.
1994-12-22 04:17:30 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-make-absolute (file &optional dir)
Doc fixes.
2003-01-14 23:11:19 +00:00
;;"Convert FILE (a file name relative to DIR) to an absolute file name."
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; We can't always use expand-file-name as this would get rid of `.'
;; or expand in / instead default-directory if DIR=="".
* bitmaps/README: * xfns.c: * termcap.c: * term.c: * syswait.h: * systty.h: * systime.h: * syssignal.h: * sysdep.c: * process.h: * process.c: * print.c: * ndir.h: * lread.c: * keyboard.c: * getpagesize.h: * floatfns.c: * fileio.c: * emacs.c: * doc.c: * dispnew.c: * dired.c: * data.c: * callproc.c: * buffer.c: * README: * Makefile.in: * s/template.h: * s/msdos.h: * m/vax.h: Remove VMS support. * s/vms.h: * vlimit.h: * uaf.h: * temacs.opt: * param.h: * ioctl.h: Remove file. * descrip.mms: * compile.com: Remove file. * Create.c: Remove VMS support. * message.el (Module): * gnus-start.el (Module): * gnus-registry.el (Module): * textmodes/texinfmt.el: * nxml/nxml-enc.el: * mail/feedmail.el: * international/mule.el: * international/latexenc.el: * emulation/viper-util.el: * emulation/viper-init.el: * emulation/viper-ex.el: * emacs-lisp/bytecomp.el: * version.el: * subr.el: * startup.el: * sort.el: * shadowfile.el: * recentf.el: * printing.el: * paths.el: * minibuffer.el: * ls-lisp.el: * loadup.el: * hippie-exp.el: * finder.el: * files.el: * ediff-util.el: * ediff-ptch.el: * ediff-init.el: * ediff-diff.el: * dired.el: * dired-aux.el: * cus-edit.el: * bindings.el: * arc-mode.el: * add-log.el: Remove VMS support. * obsolete/vmsproc.el: * obsolete/vms-pmail.el: * obsolete/vms-patch.el: Remove file. * etags.c: * emacsclient.c: Remove VMS support. * termcap.src: Remove file. * README: * PROBLEMS: * MACHINES: Remove VMS info. * ediff.texi: Remove VMS support. * os.texi: * intro.texi: * files.texi: Remove VMS support. * emacs.texi: Remove VMS support. * make-dist: * README: Remove VMS support. * vms: Remove directory.
2008-07-31 05:33:56 +00:00
;; This should be good enough for ange-ftp.
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; It should be reasonably fast, though, as it is called in
;; dired-get-filename.
(concat (or dir default-directory) file))
Misc doc fixes for Dired. * dired-aux.el (dired-do-create-files): Doc fix (Bug#11327). (dired-create-files): Doc fix (Bug#11329). (dired-do-copy): Doc fix (Bug#11334). (dired-mark-read-string): Doc fix (Bug#11553). * dired.el (dired-recursive-copies, dired-recursive-deletes): Doc fix (Bug#11326). (dired-make-relative): Doc fix (Bug#11332). Remove unused arg. (dired-dwim-target): Doc fix. * wdired.el (wdired-mode): Doc fix.
2012-06-22 07:30:33 +00:00
(defun dired-make-relative (file &optional dir)
(dired-make-relative): Ignore the third argument; never signal an error just bbcause FILE is not in DIR's tree.
1996-12-31 18:29:49 +00:00
"Convert FILE (an absolute file name) to a name relative to DIR.
Misc doc fixes for Dired. * dired-aux.el (dired-do-create-files): Doc fix (Bug#11327). (dired-create-files): Doc fix (Bug#11329). (dired-do-copy): Doc fix (Bug#11334). (dired-mark-read-string): Doc fix (Bug#11553). * dired.el (dired-recursive-copies, dired-recursive-deletes): Doc fix (Bug#11326). (dired-make-relative): Doc fix (Bug#11332). Remove unused arg. (dired-dwim-target): Doc fix. * wdired.el (wdired-mode): Doc fix.
2012-06-22 07:30:33 +00:00
If DIR is omitted or nil, it defaults to `default-directory'.
If FILE is not in the directory tree of DIR, return FILE
unchanged."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(or dir (setq dir default-directory))
(dired-chown-program): Check for irix, not silicon-graphic-unix.
1993-11-14 00:06:23 +00:00
;; This case comes into play if default-directory is set to
;; use ~.
(if (and (> (length dir) 0) (= (aref dir 0) ?~))
(setq dir (expand-file-name dir)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(if (string-match (concat "^" (regexp-quote dir)) file)
(substring file (match-end 0))
(dired-make-relative): Ignore the third argument; never signal an error just bbcause FILE is not in DIR's tree.
1996-12-31 18:29:49 +00:00
file))
Revert last change.
2001-01-26 13:14:11 +00:00
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
(define-minor-mode dired-hide-details-mode
Small doc updates for CUA and dired * doc/emacs/dired.texi (Misc Dired Features): Copyedits for hide-details. * lisp/dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines) (dired-hide-details-mode): Doc fixes. * lisp/emulation/cua-base.el (cua-mode): Doc fix. * etc/NEWS: Related edits. * lisp/ChangeLog: Comment changes do not need ChangeLog entries.
2014-01-27 21:26:48 +00:00
"Toggle visibility of detailed information in current Dired buffer.
When this minor mode is enabled, details such as file ownership and
permissions are hidden from view.
See options: `dired-hide-details-hide-symlink-targets' and
`dired-hide-details-hide-information-lines'."
Add dired-hide-details-mode. (Bug#6799) * locate.el (locate-mode): Set parent mode property to dired-mode. * find-dired.el (find-dired): Call dired-insert-set-properties on initial information line. Set process mark on end of buffer. (find-dired-sentinel): Call dired-insert-set-properties on summary. * dired.el (dired-hide-details-hide-symlink-targets) (dired-hide-details-hide-information-lines): New options. (dired-insert-directory): Set properties after final treatment of output. (dired-insert-set-properties): Set dired-hide-details-* properties. (dired-mode-map): Bind dired-hide-details-mode. (dired-mode): Set buffer-invisibility-spec to a list. (dired-next-line): Skip hidden lines. (dired-previous-line): Use dired-next-line. (dired-hide-details-mode): New minor mode. (dired-hide-details-update-invisibility-spec): New function.
2013-02-13 09:42:31 +00:00
:group 'dired
(unless (derived-mode-p 'dired-mode)
(error "Not a Dired buffer"))
(dired-hide-details-update-invisibility-spec)
(if dired-hide-details-mode
(add-hook 'wdired-mode-hook
'dired-hide-details-update-invisibility-spec
nil
t)
(remove-hook 'wdired-mode-hook
'dired-hide-details-update-invisibility-spec
t)))
(defun dired-hide-details-update-invisibility-spec ()
(funcall (if dired-hide-details-mode
'add-to-invisibility-spec
'remove-from-invisibility-spec)
'dired-hide-details-detail)
(funcall (if (and dired-hide-details-mode
dired-hide-details-hide-information-lines)
'add-to-invisibility-spec
'remove-from-invisibility-spec)
'dired-hide-details-information)
(funcall (if (and dired-hide-details-mode
dired-hide-details-hide-symlink-targets
(not (derived-mode-p 'wdired-mode)))
'add-to-invisibility-spec
'remove-from-invisibility-spec)
'dired-hide-details-link))
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
;;; Functions to hide/unhide text
(defun dired--find-hidden-pos (start end)
(text-property-any start end 'invisible 'dired))
(defun dired--hidden-p (&optional pos)
(eq (get-char-property (or pos (point)) 'invisible) 'dired))
(defun dired--hide (start end)
;; The old code used selective-display which only works at
;; a line-granularity, so it used start and end positions that where
;; approximate ("anywhere on the line is fine").
(save-excursion
(put-text-property (progn (goto-char start) (line-end-position))
(progn (goto-char end) (line-end-position))
'invisible 'dired)))
(defun dired--unhide (start end)
;; The old code used selective-display which only works at
;; a line-granularity, so it used start and end positions that where
;; approximate ("anywhere on the line is fine").
;; FIXME: This also removes other invisible properties!
(save-excursion
Fix usage of remove-text-properties * lisp/allout-widgets.el (allout-decorate-item-icon): * lisp/emacs-lisp/chart.el (chart-goto-xy): * lisp/forms.el (forms--make-format) (forms--make-format-elt-using-text-properties): * lisp/htmlfontify.el (hfy-unmark-trailing-whitespace): * lisp/net/newst-plainview.el (newsticker-hide-entry) (newsticker-show-entry): * lisp/nxml/nxml-mode.el (nxml-cleanup): * lisp/obsolete/longlines.el (longlines-unshow-hard-newlines) (longlines-encode-region): * lisp/org/ob-exp.el (org-babel-exp-process-buffer): * lisp/org/org-agenda.el (org-agenda-show-new-time): * lisp/progmodes/cc-defs.el (c-clear-char-property-with-value-function) (c-clear-char-property-with-value-on-char-function): * lisp/progmodes/ebrowse.el (ebrowse--hide): * lisp/progmodes/gdb-mi.el (gdb-send): * lisp/progmodes/idlw-shell.el (idlwave-retrieve-expression-from-level): * lisp/progmodes/make-mode.el (makefile-fill-paragraph): * lisp/progmodes/prog-mode.el (prettify-symbols--post-command-hook): * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize): * lisp/tmm.el (tmm-remove-inactive-mouse-face): Always pass an explicit plist to remove-text-properties. * lisp/dired.el (dired--unhide): * lisp/facemenu.el (facemenu-add-face): * lisp/htmlfontify.el (hfy-fontify-buffer): * lisp/iimage.el (iimage-mode-buffer): * lisp/image-file.el (image-file-yank-handler): * lisp/progmodes/prog-mode.el (prettify-symbols--compose-symbol): * lisp/textmodes/tex-mode.el (latex-env-before-change): * test/src/undo-tests.el (undo-test0): Use remove-list-of-text-properties in place of remove-text-properties where appropriate.
2019-08-01 12:59:46 +00:00
(remove-list-of-text-properties
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(progn (goto-char start) (line-end-position))
(progn (goto-char end) (line-end-position))
'(invisible))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;;; Functions for finding the file name in a dired buffer line.
(dired-permission-flags-regexp): New variable. (dired-move-to-end-of-filename): Use it instead of a constant.
1996-12-30 04:57:17 +00:00
(defvar dired-permission-flags-regexp
"\\([^ ]\\)[-r][-w]\\([^ ]\\)[-r][-w]\\([^ ]\\)[-r][-w]\\([^ ]\\)"
"Regular expression to match the permission flags in `ls -l'.")
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Move to first char of filename on this line.
;; Returns position (point) or nil if no filename on this line."
(defun dired-move-to-filename (&optional raise-error eol)
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
"Move to the beginning of the filename on the current line.
dired-move-to-filename doc string fix * lisp/dired.el (dired-move-to-filename): Document the parameters (bug#17566).
2019-10-07 17:44:17 +00:00
Return the position of the beginning of the filename, or nil if none found.
If RAISE-ERROR, signal an error if we can't find the filename on
the current line.
If EOL, it should be an position to use instead of
`line-end-position' as the end of the line."
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; This is the UNIX version.
(dired-font-lock-keywords): Use regexp-opt. (dired-move-to-filename): Better message when we fail to find the file. (dired-sort-toggle): Minor optimization.
2002-09-16 17:13:16 +00:00
(or eol (setq eol (line-end-position)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(beginning-of-line)
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
;; First try assuming `ls --dired' was used.
(dired-font-lock-keywords): Use regexp-opt. (dired-move-to-filename): Better message when we fail to find the file. (dired-sort-toggle): Minor optimization.
2002-09-16 17:13:16 +00:00
(let ((change (next-single-property-change (point) 'dired-filename nil eol)))
(cond
((and change (< change eol))
(goto-char change))
* files.el (directory-listing-before-filename-regexp): New defvar. Replaces `dired-move-to-filename-regexp' from dired.el. * dired.el (dired-move-to-filename-regexp): Removed. All occurences replaced by `directory-listing-before-filename-regexp'. * dired-x.el, locate.el, vc.el: Replace `dired-move-to-filename-regexp' by `directory-listing-before-filename-regexp'. In vc.el it is overwritten locally; maybe this can be handled in files.el too. * net/ange-ftp.el (ange-ftp-date-regexp): Removed. All occurences replaced by `directory-listing-before-filename-regexp'. * faq.texi (Bugs and problems): Replace `dired-move-to-filename-regexp' by `directory-listing-before-filename-regexp'.
2005-10-23 12:17:28 +00:00
((re-search-forward directory-listing-before-filename-regexp eol t)
(dired-font-lock-keywords): Use regexp-opt. (dired-move-to-filename): Better message when we fail to find the file. (dired-sort-toggle): Minor optimization.
2002-09-16 17:13:16 +00:00
(goto-char (match-end 0)))
((re-search-forward dired-permission-flags-regexp eol t)
;; Ha! There *is* a file. Our regexp-from-hell just failed to find it.
(dired-move-to-filename): Don't output a message if raise-error is non-nil. Fix return position and value.
2004-09-25 18:35:53 +00:00
(if raise-error
* files.el (directory-listing-before-filename-regexp): New defvar. Replaces `dired-move-to-filename-regexp' from dired.el. * dired.el (dired-move-to-filename-regexp): Removed. All occurences replaced by `directory-listing-before-filename-regexp'. * dired-x.el, locate.el, vc.el: Replace `dired-move-to-filename-regexp' by `directory-listing-before-filename-regexp'. In vc.el it is overwritten locally; maybe this can be handled in files.el too. * net/ange-ftp.el (ange-ftp-date-regexp): Removed. All occurences replaced by `directory-listing-before-filename-regexp'. * faq.texi (Bugs and problems): Replace `dired-move-to-filename-regexp' by `directory-listing-before-filename-regexp'.
2005-10-23 12:17:28 +00:00
(error "Unrecognized line! Check directory-listing-before-filename-regexp"))
(dired-move-to-filename): Don't output a message if raise-error is non-nil. Fix return position and value.
2004-09-25 18:35:53 +00:00
(beginning-of-line)
nil)
(dired-font-lock-keywords): Use regexp-opt. (dired-move-to-filename): Better message when we fail to find the file. (dired-sort-toggle): Minor optimization.
2002-09-16 17:13:16 +00:00
(raise-error
(error "No file on this line")))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-move-to-end-of-filename (&optional no-error)
;; Assumes point is at beginning of filename,
;; thus the rwx bit re-search-backward below will succeed in *this*
;; line if at all. So, it should be called only after
;; (dired-move-to-filename t).
;; On failure, signals an error (with non-nil NO-ERROR just returns nil).
;; This is the UNIX version.
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(if (get-text-property (point) 'dired-filename)
(goto-char (next-single-property-change (point) 'dired-filename))
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(let ((opoint (point))
(used-F (dired-check-switches dired-actual-switches "F" "classify"))
(eol (line-end-position))
(hidden (dired--hidden-p))
file-type executable symlink)
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(if hidden
nil
(save-excursion ;; Find out what kind of file this is:
;; Restrict perm bits to be non-blank,
;; otherwise this matches one char to early (looking backward):
;; "l---------" (some systems make symlinks that way)
;; "----------" (plain file with zero perms)
(if (re-search-backward
dired-permission-flags-regexp nil t)
(setq file-type (char-after (match-beginning 1))
symlink (eq file-type ?l)
;; Only with -F we need to know whether it's an executable
executable (and
used-F
(string-match
"[xst]" ;; execute bit set anywhere?
(concat
(dired-mode): Use run-mode-hooks. (dired-move-to-end-of-filename): Use match-string.
2004-03-26 15:17:50 +00:00
(match-string 2)
(match-string 3)
(match-string 4)))))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(or no-error (error "No file on this line"))))
;; Move point to end of name:
(if symlink
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
(if (search-forward " -> " eol t)
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(progn
(dired-view-command-alist): Use more efficient regexps. Remove dubious args. (dired-align-file): New function. (dired-insert-directory): Use it. (dired-move-to-end-of-filename): Make the " -> " search more specific. (dired-buffers-for-dir): Remove unused var `pattern'.
2004-09-29 03:14:30 +00:00
(forward-char -4)
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(and used-F
dired-ls-F-marks-symlinks
(eq (preceding-char) ?@) ;; did ls really mark the link?
(forward-char -1))))
(goto-char eol) ;; else not a symbolic link
(dired-move-to-end-of-filename): Handle fifo as rendered by "ls -lF": Don't include trailing "|".
2005-08-18 11:30:44 +00:00
;; ls -lF marks dirs, sockets, fifos and executables with exactly
;; one trailing character. (Executable bits on symlinks ain't mean
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
;; a thing, even to ls, but we know it's not a symlink.)
(and used-F
(dired-move-to-end-of-filename): Handle fifo as rendered by "ls -lF": Don't include trailing "|".
2005-08-18 11:30:44 +00:00
(or (memq file-type '(?d ?s ?p))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
executable)
(forward-char -1))))
(or no-error
(not (eq opoint (point)))
Fix buggy calls to `error'.
2007-12-06 17:56:42 +00:00
(error "%s" (if hidden
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(substitute-command-keys
"File line is hidden, type \\[dired-hide-subdir] to unhide")
"No file on this line")))
(if (eq opoint (point))
nil
(point)))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-copy-filename-as-kill): Moved from dired-x.el. (dired-mode-map): Bind w to dired-copy-filename-as-kill.
2001-12-17 01:58:05 +00:00
;;; COPY NAMES OF MARKED FILES INTO KILL-RING.
(defun dired-copy-filename-as-kill (&optional arg)
"Copy names of marked (or next ARG) files into the kill ring.
The names are separated by a space.
Doc fixes.
2003-01-14 23:11:19 +00:00
With a zero prefix arg, use the absolute file name of each marked file.
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
With \\[universal-argument], use the file name relative to the Dired buffer's
(dired-copy-filename-as-kill): Make `-' arg behave like `-1'. Doc fix.
2005-04-04 23:58:11 +00:00
`default-directory'. (This still may contain slashes if in a subdirectory.)
(dired-copy-filename-as-kill): Moved from dired-x.el. (dired-mode-map): Bind w to dired-copy-filename-as-kill.
2001-12-17 01:58:05 +00:00
(dired-copy-filename-as-kill): Make `-' arg behave like `-1'. Doc fix.
2005-04-04 23:58:11 +00:00
If on a subdir headerline, use absolute subdirname instead;
prefix arg and marked files are ignored in this case.
(dired-copy-filename-as-kill): Moved from dired-x.el. (dired-mode-map): Bind w to dired-copy-filename-as-kill.
2001-12-17 01:58:05 +00:00
You can then feed the file name(s) to other commands with \\[yank]."
(interactive "P")
(let ((string
(or (dired-get-subdir)
Use #' instead of (function ...) * lisp/dired-aux.el (dired-do-chxxx, dired-clean-directory) (dired-mark-confirm, dired-query, dired-byte-compile) (dired-load, dired-update-file-line, dired-after-subdir-garbage) (dired-relist-file, dired-rename-subdir, dired-do-create-files) (dired-mark-read-file-name, dired-do-copy, dired-do-symlink) (dired-do-hardlink, dired-do-rename, dired-do-rename-regexp) (dired-do-copy-regexp, dired-do-hardlink-regexp) (dired-do-symlink-regexp, dired-create-files-non-directory) (dired-upcase, dired-downcase) * lisp/dired.el (dired-mode, dired-copy-filename-as-kill) (dired-internal-do-deletions, dired-internal-do-deletions): Prefer #' instead of (function ...).
2017-06-26 05:22:34 +00:00
(mapconcat #'identity
(dired-copy-filename-as-kill): Moved from dired-x.el. (dired-mode-map): Bind w to dired-copy-filename-as-kill.
2001-12-17 01:58:05 +00:00
(if arg
(cond ((zerop (prefix-numeric-value arg))
(dired-get-marked-files))
(dired-copy-filename-as-kill): Make `-' arg behave like `-1'. Doc fix.
2005-04-04 23:58:11 +00:00
((consp arg)
(dired-get-marked-files t))
(t
(dired-get-marked-files
'no-dir (prefix-numeric-value arg))))
(dired-copy-filename-as-kill): Moved from dired-x.el. (dired-mode-map): Bind w to dired-copy-filename-as-kill.
2001-12-17 01:58:05 +00:00
(dired-get-marked-files 'no-dir))
" "))))
Copy just non-empty strings to kill-ring * lisp/dired.el (dired-copy-filename-as-kill): Do not change the kill ring when the string is empty (Bug#24103).
2016-07-30 08:26:19 +00:00
(unless (string= string "")
(if (eq last-command 'kill-region)
(kill-append string nil)
(kill-new string))
(message "%s" string))))
(dired-copy-filename-as-kill): Moved from dired-x.el. (dired-mode-map): Bind w to dired-copy-filename-as-kill.
2001-12-17 01:58:05 +00:00
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Keeping Dired buffers in sync with the filesystem and with each other
(dired-glob-regexp): New function. (dired-buffers-for-dir): New arg FILE; if non-nil, check that it matches the wildcard pattern.
1997-03-22 03:40:55 +00:00
(defun dired-buffers-for-dir (dir &optional file)
* lisp/dired.el (dired-buffers-for-dir): Handle list values of dired-directory (Bug#6636).
2010-07-17 21:25:32 +00:00
;; Return a list of buffers for DIR (top level or in-situ subdir).
(dired-glob-regexp): New function. (dired-buffers-for-dir): New arg FILE; if non-nil, check that it matches the wildcard pattern.
1997-03-22 03:40:55 +00:00
;; If FILE is non-nil, include only those whose wildcard pattern (if any)
;; matches FILE.
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; The list is in reverse order of buffer creation, most recent last.
;; As a side effect, killed dired buffers for DIR are removed from
;; dired-buffers.
(setq dir (file-name-as-directory dir))
* lisp/dired.el (dired-buffers-for-dir): Handle list values of dired-directory (Bug#6636).
2010-07-17 21:25:32 +00:00
(let (result buf)
(dolist (elt dired-buffers)
(setq buf (cdr elt))
(cond
((null (buffer-name buf))
;; Buffer is killed - clean up:
(dired-buffers-for-dir): Assume dirs are preexpanded. (dired-in-this-tree): Likewise. (dired-advertise, dired-unadvertise): Expand default-directory.
1994-09-16 21:34:27 +00:00
(setq dired-buffers (delq elt dired-buffers)))
End predicate `dired-in-this-tree' with '-p' * lisp/dired.el(dired-in-this-tree-p): Rename from `dired-in-this-tree'. Add docstring. (dired-in-this-tree): Define an alias to `dired-in-this-tree-p'. (dired-buffers-for-dir) * lisp/dired-aux.el (dired-tree-down, dired-kill-tree) (dired-insert-subdir, dired-rename-subdir): Update all callers (bug#32892).
2019-07-13 02:03:50 +00:00
((dired-in-this-tree-p dir (car elt))
* lisp/dired.el (dired-buffers-for-dir): Handle list values of dired-directory (Bug#6636).
2010-07-17 21:25:32 +00:00
(with-current-buffer buf
(and (assoc dir dired-subdir-alist)
(or (null file)
(if (stringp dired-directory)
(let ((wildcards (file-name-nondirectory
dired-directory)))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(or (zerop (length wildcards))
(string-match-p (dired-glob-regexp wildcards)
file)))
* lisp/dired.el (dired-buffers-for-dir): Handle list values of dired-directory (Bug#6636).
2010-07-17 21:25:32 +00:00
(member (expand-file-name file dir)
(cdr dired-directory))))
(setq result (cons buf result)))))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
result))
(dired-glob-regexp): New function. (dired-buffers-for-dir): New arg FILE; if non-nil, check that it matches the wildcard pattern.
1997-03-22 03:40:55 +00:00
(defun dired-glob-regexp (pattern)
"Convert glob-pattern PATTERN to a regular expression."
(let ((matched-in-pattern 0) ;; How many chars of PATTERN we've handled.
regexp)
(while (string-match "[[?*]" pattern matched-in-pattern)
(let ((op-end (match-end 0))
(next-op (aref pattern (match-beginning 0))))
(setq regexp (concat regexp
(regexp-quote
(substring pattern matched-in-pattern
(match-beginning 0)))))
(cond ((= next-op ??)
(setq regexp (concat regexp "."))
(setq matched-in-pattern op-end))
((= next-op ?\[)
;; Fails to handle ^ yet ????
(let* ((set-start (match-beginning 0))
(set-cont
(if (= (aref pattern (1+ set-start)) ?^)
(+ 3 set-start)
(+ 2 set-start)))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(set-end (string-match-p "]" pattern set-cont))
(dired-glob-regexp): New function. (dired-buffers-for-dir): New arg FILE; if non-nil, check that it matches the wildcard pattern.
1997-03-22 03:40:55 +00:00
(set (substring pattern set-start (1+ set-end))))
(setq regexp (concat regexp set))
(setq matched-in-pattern (1+ set-end))))
((= next-op ?*)
(setq regexp (concat regexp ".*"))
(setq matched-in-pattern op-end)))))
(concat "\\`"
regexp
(regexp-quote
(substring pattern matched-in-pattern))
"\\'")))
Cygwin support patch.
2003-01-31 15:24:20 +00:00
(dired-glob-regexp): New function. (dired-buffers-for-dir): New arg FILE; if non-nil, check that it matches the wildcard pattern.
1997-03-22 03:40:55 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-advertise ()
;;"Advertise in variable `dired-buffers' that we dired `default-directory'."
;; With wildcards we actually advertise too much.
(dired-buffers-for-dir): Assume dirs are preexpanded. (dired-in-this-tree): Likewise. (dired-advertise, dired-unadvertise): Expand default-directory.
1994-09-16 21:34:27 +00:00
(let ((expanded-default (expand-file-name default-directory)))
(if (memq (current-buffer) (dired-buffers-for-dir expanded-default))
t ; we have already advertised ourselves
(setq dired-buffers
(cons (cons expanded-default (current-buffer))
dired-buffers)))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-unadvertise (dir)
;; Remove DIR from the buffer alist in variable dired-buffers.
;; This has the effect of removing any buffer whose main directory is DIR.
;; It does not affect buffers in which DIR is a subdir.
;; Removing is also done as a side-effect in dired-buffer-for-dir.
(setq dired-buffers
(dired-buffers-for-dir): Assume dirs are preexpanded. (dired-in-this-tree): Likewise. (dired-advertise, dired-unadvertise): Expand default-directory.
1994-09-16 21:34:27 +00:00
(delq (assoc (expand-file-name dir) dired-buffers) dired-buffers)))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Tree Dired
;;; utility functions
End predicate `dired-in-this-tree' with '-p' * lisp/dired.el(dired-in-this-tree-p): Rename from `dired-in-this-tree'. Add docstring. (dired-in-this-tree): Define an alias to `dired-in-this-tree-p'. (dired-buffers-for-dir) * lisp/dired-aux.el (dired-tree-down, dired-kill-tree) (dired-insert-subdir, dired-rename-subdir): Update all callers (bug#32892).
2019-07-13 02:03:50 +00:00
(defun dired-in-this-tree-p (file dir)
*** empty log message ***
1992-06-24 02:13:56 +00:00
;;"Is FILE part of the directory tree starting at DIR?"
(let (case-fold-search)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(string-match-p (concat "^" (regexp-quote dir)) file)))
End predicate `dired-in-this-tree' with '-p' * lisp/dired.el(dired-in-this-tree-p): Rename from `dired-in-this-tree'. Add docstring. (dired-in-this-tree): Define an alias to `dired-in-this-tree-p'. (dired-buffers-for-dir) * lisp/dired-aux.el (dired-tree-down, dired-kill-tree) (dired-insert-subdir, dired-rename-subdir): Update all callers (bug#32892).
2019-07-13 02:03:50 +00:00
(define-obsolete-function-alias 'dired-in-this-tree
'dired-in-this-tree-p "27.1")
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-normalize-subdir (dir)
Doc fixes.
2003-01-14 23:11:19 +00:00
;; Prepend default-directory to DIR if relative file name.
;; dired-get-filename must be able to make a valid file name from a
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; file and its directory DIR.
(file-name-as-directory
(if (file-name-absolute-p dir)
dir
(expand-file-name dir default-directory))))
(defun dired-get-subdir ()
;;"Return the subdir name on this line, or nil if not on a headerline."
;; Look up in the alist whether this is a headerline.
(save-excursion
(let ((cur-dir (dired-current-directory)))
(beginning-of-line) ; alist stores b-o-l positions
(and (zerop (- (point)
(dired-get-subdir-min (assoc cur-dir
dired-subdir-alist))))
cur-dir))))
;; can't use macro, must be redefinable for other alist format in dired-nstd.
Changed fsets to defaliases.
1993-04-26 04:19:48 +00:00
(defalias 'dired-get-subdir-min 'cdr)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-get-subdir-max (elt)
Initial revision
1992-05-30 23:52:26 +00:00
(save-excursion
*** empty log message ***
1992-06-24 02:13:56 +00:00
(goto-char (dired-get-subdir-min elt))
(dired-subdir-max)))
(defun dired-clear-alist ()
(while dired-subdir-alist
(set-marker (dired-get-subdir-min (car dired-subdir-alist)) nil)
(setq dired-subdir-alist (cdr dired-subdir-alist))))
*** empty log message ***
1992-09-11 09:04:24 +00:00
(defun dired-subdir-index (dir)
;; Return an index into alist for use with nth
;; for the sake of subdir moving commands.
(let (found (index 0) (alist dired-subdir-alist))
(while alist
(if (string= dir (car (car alist)))
(setq alist nil found t)
(setq alist (cdr alist) index (1+ index))))
(if found index nil)))
(defun dired-next-subdir (arg &optional no-error-if-not-found no-skip)
"Go to next subdirectory, regardless of level."
;; Use 0 arg to go to this directory's header line.
;; NO-SKIP prevents moving to end of header line, returning whatever
;; position was found in dired-subdir-alist.
(interactive "p")
(let ((this-dir (dired-current-directory))
pos index)
;; nth with negative arg does not return nil but the first element
(setq index (- (dired-subdir-index this-dir) arg))
(setq pos (if (>= index 0)
(dired-get-subdir-min (nth index dired-subdir-alist))))
(if pos
(progn
(goto-char pos)
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(or no-skip (end-of-line))
*** empty log message ***
1992-09-11 09:04:24 +00:00
(point))
(if no-error-if-not-found
nil ; return nil if not found
(error "%s directory" (if (> arg 0) "Last" "First"))))))
(dired-build-subdir-alist): Accept optional arg SWITCHES.
2001-09-21 16:41:58 +00:00
(defun dired-build-subdir-alist (&optional switches)
*** empty log message ***
1992-06-24 02:13:56 +00:00
"Build `dired-subdir-alist' by parsing the buffer.
(dired-build-subdir-alist): Accept optional arg SWITCHES.
2001-09-21 16:41:58 +00:00
Returns the new value of the alist.
If optional arg SWITCHES is non-nil, use its value
instead of `dired-actual-switches'."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive)
(dired-clear-alist)
(save-excursion
(dired-build-subdir-alist): Accept optional arg SWITCHES.
2001-09-21 16:41:58 +00:00
(let* ((count 0)
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(inhibit-read-only t)
(dired-build-subdir-alist): Bind buffer-undo-list to t.
2005-02-16 09:39:06 +00:00
(buffer-undo-list t)
(dired-build-subdir-alist): Accept optional arg SWITCHES.
2001-09-21 16:41:58 +00:00
(switches (or switches dired-actual-switches))
new-dir-name
(R-ftp-base-dir-regex
;; Used to expand subdirectory names correctly in recursive
;; ange-ftp listings.
* lisp/dired.el (dired-check-switches, dired-switches-recursive-p): New functions. (dired-switches-escape-p, dired-move-to-end-of-filename): Use `dired-check-switches'. (dired-insert-old-subdirs, dired-build-subdir-alist) (dired-sort-R-check): Use `dired-switches-recursive-p'. Fixes: debbugs:17218
2014-05-03 09:22:59 +00:00
(and (dired-switches-recursive-p switches)
(dired-build-subdir-alist): Accept optional arg SWITCHES.
2001-09-21 16:41:58 +00:00
(string-match "\\`/.*:\\(/.*\\)" default-directory)
(concat "\\`" (match-string 1 default-directory)))))
Initial revision
1992-05-30 23:52:26 +00:00
(goto-char (point-min))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(setq dired-subdir-alist nil)
(dired-build-subdir-alist): When file ends in colon, don't exit the loop, just disregard that file.
2006-09-24 20:37:13 +00:00
(while (re-search-forward dired-subdir-regexp nil t)
;; Avoid taking a file name ending in a colon
;; as a subdir name.
(unless (save-excursion
(goto-char (match-beginning 0))
(beginning-of-line)
(forward-char 2)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(looking-at-p dired-re-perms))
(dired-build-subdir-alist): When file ends in colon, don't exit the loop, just disregard that file.
2006-09-24 20:37:13 +00:00
(save-excursion
(goto-char (match-beginning 1))
(setq new-dir-name
(buffer-substring-no-properties (point) (match-end 1))
new-dir-name
(save-match-data
(if (and R-ftp-base-dir-regex
(not (string= new-dir-name default-directory))
(string-match R-ftp-base-dir-regex new-dir-name))
(concat default-directory
(substring new-dir-name (match-end 0)))
(expand-file-name new-dir-name))))
(delete-region (point) (match-end 1))
(dired-build-subdir-alist): Fix previous change.
2006-10-02 03:08:47 +00:00
(insert new-dir-name))
(setq count (1+ count))
Dired fixes for newlines in directory names. * lisp/dired.el (dired-insert-directory): Handle newlines in directory name. (dired-build-subdir-alist): Unescape newlines in directory name.
2012-01-17 22:27:46 +00:00
;; Undo any escaping of newlines and \ by dired-insert-directory.
;; Convert "n" preceded by odd number of \ to newline, and \\ to \.
* lisp/dired.el (dired-build-subdir-alist): Restrict previous change. (to only file names containing "\"s)
2012-01-18 00:08:05 +00:00
(when (and (dired-switches-escape-p switches)
* dired.el (dired-build-subdir-alist): Use string-match-p in previous change.
2012-01-18 00:10:56 +00:00
(string-match-p "\\\\" new-dir-name))
Dired fixes for newlines in directory names. * lisp/dired.el (dired-insert-directory): Handle newlines in directory name. (dired-build-subdir-alist): Unescape newlines in directory name.
2012-01-17 22:27:46 +00:00
(let (temp res)
(mapc (lambda (char)
(cond ((equal char ?\\)
(if temp
(setq res (concat res "\\")
temp nil)
(setq temp "\\")))
((and temp (equal char ?n))
(setq res (concat res "\n")
temp nil))
(t
(setq res (concat res temp (char-to-string char))
temp nil))))
new-dir-name)
(setq new-dir-name res)))
(dired-build-subdir-alist): Fix previous change.
2006-10-02 03:08:47 +00:00
(dired-alist-add-1 new-dir-name
Dired fixes for newlines in directory names. * lisp/dired.el (dired-insert-directory): Handle newlines in directory name. (dired-build-subdir-alist): Unescape newlines in directory name.
2012-01-17 22:27:46 +00:00
;; Place a sub directory boundary between lines.
(save-excursion
(goto-char (match-beginning 0))
(beginning-of-line)
(point-marker)))))
Use `called-interactively-p' instead of `interactive-p'.
2009-10-02 03:48:36 +00:00
(if (and (> count 1) (called-interactively-p 'interactive))
(dired-build-subdir-alist): When file ends in colon, don't exit the loop, just disregard that file.
2006-09-24 20:37:13 +00:00
(message "Buffer includes %d directories" count)))
;; We don't need to sort it because it is in buffer order per
Undo a bad spelling fix. I did not realize the comment was in Latin.
2011-11-15 17:46:34 +00:00
;; constructionem. Return new alist:
(dired-build-subdir-alist): When file ends in colon, don't exit the loop, just disregard that file.
2006-09-24 20:37:13 +00:00
dired-subdir-alist))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-alist-add-1 (dir new-marker)
;; Add new DIR at NEW-MARKER. Don't sort.
(setq dired-subdir-alist
(cons (cons (dired-normalize-subdir dir) new-marker)
dired-subdir-alist)))
(defun dired-goto-next-nontrivial-file ()
;; Position point on first nontrivial file after point.
(dired-goto-next-file);; so there is a file to compare with
(if (stringp dired-trivial-filenames)
(while (and (not (eobp))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(string-match-p dired-trivial-filenames
(file-name-nondirectory
(or (dired-get-filename nil t) ""))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(forward-line 1)
(dired-move-to-filename))))
(defun dired-goto-next-file ()
(let ((max (1- (dired-subdir-max))))
(while (and (not (dired-move-to-filename)) (< (point) max))
(forward-line 1))))
(defun dired-goto-file (file)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Go to line describing file FILE in this Dired buffer."
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Return value of point on success, else nil.
Doc fixes.
2003-01-14 23:11:19 +00:00
;; FILE must be an absolute file name.
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Loses if FILE contains control chars like "\007" for which ls
;; either inserts "?" or "\\007" into the buffer, so we won't find
;; it in the buffer.
(interactive
(prog1 ; let push-mark display its message
(list (expand-file-name
(read-file-name "Goto file: "
(dired-current-directory))))
(push-mark)))
* dired.el (dired-goto-file): Recognize absolute file name listings. (dired-goto-file-1): New helper function. (dired-toggle-read-only): Inhibit warnings. Fixes: debbugs:7126
2012-03-10 05:20:58 +00:00
(unless (file-name-absolute-p file)
(error "File name `%s' is not absolute" file))
(setq file (directory-file-name file)) ; does no harm if not a directory
(let* ((case-fold-search nil)
(dir (file-name-directory file))
(found (or
;; First, look for a listing under the absolute name.
(save-excursion
(goto-char (point-min))
(dired-goto-file-1 file file (point-max)))
Fix 'dired-goto-file' in Dired buffers produced by find-dired * lisp/dired.el (dired-goto-file): Try looking for the file as a relative name with leading sub-directories, before looking for the basename alone. (Bug#23089)
2016-03-25 14:18:21 +00:00
;; Next, look for it as a relative name with leading
;; subdirectories. (This happens in Dired buffers
;; created by find-dired, for example.)
(save-excursion
(goto-char (point-min))
(dired-goto-file-1 (file-relative-name file
default-directory)
file (point-max)))
;; Otherwise, look for it as a relative name, a base
;; name only. The hair is to get the result of
;; `dired-goto-subdir' without calling it if we don't
;; have any subdirs.
* dired.el (dired-goto-file): Recognize absolute file name listings. (dired-goto-file-1): New helper function. (dired-toggle-read-only): Inhibit warnings. Fixes: debbugs:7126
2012-03-10 05:20:58 +00:00
(save-excursion
(when (if (string= dir (expand-file-name default-directory))
(goto-char (point-min))
(and (cdr dired-subdir-alist)
(dired-goto-subdir dir)))
(dired-goto-file-1 (file-name-nondirectory file)
file
(dired-subdir-max)))))))
;; Return buffer position, if found.
(if found
(goto-char found))))
(defun dired-goto-file-1 (file full-name limit)
"Advance to the Dired listing labeled by FILE; return its position.
Return nil if the listing is not found. If FILE contains
characters that would not appear in a Dired buffer, search using
the quoted forms of those characters.
FULL-NAME specifies the actual file name the listing must have,
as returned by `dired-get-filename'. LIMIT is the search limit."
(let (str)
(setq str (replace-regexp-in-string "\^m" "\\^m" file nil t))
(setq str (replace-regexp-in-string "\\\\" "\\\\" str nil t))
(and (dired-switches-escape-p dired-actual-switches)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(string-match-p "[ \t\n]" str)
* dired.el (dired-goto-file): Recognize absolute file name listings. (dired-goto-file-1): New helper function. (dired-toggle-read-only): Inhibit warnings. Fixes: debbugs:7126
2012-03-10 05:20:58 +00:00
;; FIXME: to fix this for embedded control characters etc, we
;; should escape everything that `ls -b' does.
(setq str (replace-regexp-in-string " " "\\ " str nil t)
str (replace-regexp-in-string "\t" "\\t" str nil t)
str (replace-regexp-in-string "\n" "\\n" str nil t)))
(let ((found nil)
;; filenames are preceded by SPC, this makes the search faster
;; (e.g. for the filename "-").
(search-string (concat " " str)))
(while (and (not found)
(search-forward search-string limit 'move))
;; Check that we are in the right place. Match could have
;; BASE just as initial substring or in permission bits etc.
(if (equal full-name (dired-get-filename nil t))
(setq found (dired-move-to-filename))
(forward-line 1)))
found)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
Merge dired-x's redefinition of dired-initial-position into the main version. * lisp/dired-x.el (dired-initial-position): Merge into dired.el's version. * lisp/dired.el (dired-initial-position): Merge dired-x's version here. (dired-find-subdir): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefines dired-initial-position.
2011-02-19 04:12:23 +00:00
(defvar dired-find-subdir)
;; FIXME document whatever dired-x is doing.
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-initial-position (dirname)
Merge dired-x's redefinition of dired-initial-position into the main version. * lisp/dired-x.el (dired-initial-position): Merge into dired.el's version. * lisp/dired.el (dired-initial-position): Merge dired-x's version here. (dired-find-subdir): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefines dired-initial-position.
2011-02-19 04:12:23 +00:00
"Where point should go in a new listing of DIRNAME.
Minor fixes for dired.el doc strings. lisp/dired.el (dired-initial-position-hook, dired-initial-position): Doc string fixes.
2014-04-30 16:59:03 +00:00
Point is assumed to be at the beginning of new subdir line.
Add support for dired in saveplace.
2013-06-14 09:32:01 +00:00
It runs the hook `dired-initial-position-hook'."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(end-of-line)
Merge dired-x's redefinition of dired-initial-position into the main version. * lisp/dired-x.el (dired-initial-position): Merge into dired.el's version. * lisp/dired.el (dired-initial-position): Merge dired-x's version here. (dired-find-subdir): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefines dired-initial-position.
2011-02-19 04:12:23 +00:00
(and (featurep 'dired-x) dired-find-subdir
(dired-goto-subdir dirname))
Add support for dired in saveplace.
2013-06-14 09:32:01 +00:00
(if dired-trivial-filenames (dired-goto-next-nontrivial-file))
* lisp/saveplace.el (save-place-to-alist): Add `dired-filename' as a position when `dired-directory' is non-nil. Check integer positions with `integerp'. (toggle-save-place, save-places-to-alist): Add check for `dired-directory'. (save-place-find-file-hook): Check integer positions with `integerp'. (save-place-dired-hook): Use `dired-goto-file' when `dired-filename' is found in the assoc list. Check integer positions with `integerp'. (dired-initial-position-hook): Rename from `dired-initial-point-hook'. * lisp/dired.el (dired-initial-position-hook): Rename back from `dired-initial-point-hook'. (dired-initial-position): Rename `dired-initial-point-hook' to `dired-initial-position-hook'. (dired-file-name-at-point): Doc fix. Fixes: debbugs:15329
2013-12-20 20:20:39 +00:00
(run-hooks 'dired-initial-position-hook))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; These are hooks which make tree dired work.
;; They are in this file because other parts of dired need to call them.
;; But they don't call the rest of tree dired unless there are subdirs loaded.
;; This function is called for each retrieved filename.
;; It could stand to be faster, though it's mostly function call
;; overhead. Avoiding the function call seems to save about 10% in
;; dired-get-filename. Make it a defsubst?
(defun dired-current-directory (&optional localp)
"Return the name of the subdirectory to which this line belongs.
This returns a string with trailing slash, like `default-directory'.
Clarify doc string of 'dired-current-directory' * lisp/dired.el (dired-current-directory): Doc fix: clarify that the return value might not end in a slash when called with the optional argument non-nil. (Bug#6273)
2016-01-08 10:40:14 +00:00
Optional argument means return a file name relative to `default-directory',
in which case the value could be an empty string if `default-directory'
is the directory where the file on this line resides."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let ((here (point))
(alist (or dired-subdir-alist
;; probably because called in a non-dired buffer
(error "No subdir-alist in %s" (current-buffer))))
elt dir)
(while alist
(setq elt (car alist)
dir (car elt)
;; use `<=' (not `<') as subdir line is part of subdir
alist (if (<= (dired-get-subdir-min elt) here)
nil ; found
(cdr alist))))
(if localp
(dired-make-relative dir default-directory)
dir)))
;; Subdirs start at the beginning of their header lines and end just
;; before the beginning of the next header line (or end of buffer).
(defun dired-subdir-max ()
(save-excursion
entered into RCS
1992-09-19 19:40:38 +00:00
(if (or (null (cdr dired-subdir-alist)) (not (dired-next-subdir 1 t t)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(point-max)
(point))))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Deleting files
(dired-mode-map): Bind C-x C-q to dired-toggle-read-only. Filter out menu item "Edit File Names" `wdired-change-to-wdired-mode' when major-mode is not dired-mode. (dired-toggle-read-only): New function. (dired-recursive-deletes): Remove obsolete comments about old default value. (dired-do-flagged-delete, dired-do-delete): Refill docstring.
2007-07-29 09:18:15 +00:00
(defcustom dired-recursive-deletes 'top
Misc doc fixes for Dired. * dired-aux.el (dired-do-create-files): Doc fix (Bug#11327). (dired-create-files): Doc fix (Bug#11329). (dired-do-copy): Doc fix (Bug#11334). (dired-mark-read-string): Doc fix (Bug#11553). * dired.el (dired-recursive-copies, dired-recursive-deletes): Doc fix (Bug#11326). (dired-make-relative): Doc fix (Bug#11332). Remove unused arg. (dired-dwim-target): Doc fix. * wdired.el (wdired-mode): Doc fix.
2012-06-22 07:30:33 +00:00
"Whether Dired deletes directories recursively.
If nil, Dired will not delete non-empty directories.
`always' means to delete non-empty directories recursively,
without asking. This is dangerous!
`top' means to ask for each top-level directory specified by the
Dired deletion command, and delete its subdirectories without
asking.
Any other value means to ask for each directory."
(dired-recursive-deletes): Fix custom type.
2003-01-06 01:20:35 +00:00
:type '(choice :tag "Delete non-empty directories"
(const :tag "Yes" always)
(const :tag "No--only delete empty directories" nil)
(const :tag "Confirm for each directory" t)
(const :tag "Confirm for each top directory only" top))
(dired-recursive-deletes): New custom variable. (dired-re-no-dot): New variable. (dired-delete-file): New function deletes files and directories recursively. (dired-internal-do-deletions): Use `dired-delete-file' to delete files.
1999-09-15 23:29:16 +00:00
:group 'dired)
Cygwin support patch.
2003-01-31 15:24:20 +00:00
;; Match anything but `.' and `..'.
(dired-recursive-deletes): New custom variable. (dired-re-no-dot): New variable. (dired-delete-file): New function deletes files and directories recursively. (dired-internal-do-deletions): Use `dired-delete-file' to delete files.
1999-09-15 23:29:16 +00:00
(defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")
;; Delete file, possibly delete a directory and all its files.
Fix typos.
2011-12-06 01:30:54 +00:00
;; This function is useful outside of dired. One could change its name
(dired-recursive-deletes): New custom variable. (dired-re-no-dot): New variable. (dired-delete-file): New function deletes files and directories recursively. (dired-internal-do-deletions): Use `dired-delete-file' to delete files.
1999-09-15 23:29:16 +00:00
;; to e.g. recursive-delete-file and put it somewhere else.
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
(defun dired-delete-file (file &optional recursive trash) "\
(dired-recursive-deletes): New custom variable. (dired-re-no-dot): New variable. (dired-delete-file): New function deletes files and directories recursively. (dired-internal-do-deletions): Use `dired-delete-file' to delete files.
1999-09-15 23:29:16 +00:00
Delete FILE or directory (possibly recursively if optional RECURSIVE is true.)
lisp/dired.el (dired-delete-file): Doc fix. (Bug#20021)
2015-03-07 09:55:58 +00:00
RECURSIVE determines what to do with a non-empty directory. The effect of
its possible values is:
nil -- do not delete.
`always' -- delete recursively without asking.
`top' -- ask for each directory at top level.
Anything else -- ask for each sub-directory.
TRASH non-nil means to trash the file instead of deleting, provided
`delete-by-moving-to-trash' (which see) is non-nil."
dired-do-delete: Allow to delete dirs recursively without prompts * lisp/dired.el (dired-delete-file): Accept 2 additional answers: 'all', to delete all directories recursively and no prompt anymore. 'quit', to cancel directory deletions (Bug#27940). Show help message when user inputs 'help'. (dired-do-flagged-delete): Bind locally dired-recursive-deletes so that we can overwrite its global value. Wrapp the loop within a catch '--delete-cancel to catch when the user abort the directtry deletion. * doc/emacs/dired.texi (Dired Deletion): Update manual. * etc/NEWS (Changes in Specialized Modes and Packages in Emacs 26.1): Announce this change.
2017-08-06 04:46:51 +00:00
;; This test is equivalent to
;; (and (file-directory-p fn) (not (file-symlink-p fn)))
;; but more efficient
(if (not (eq t (car (file-attributes file))))
(delete-file file trash)
dired-delete-file: Dont't ask for empty dirs * lisp/dired.el (dired--yes-no-all-quit-help): New defun. (dired-delete-file): Use it. Dont't ask for empty dirs (Bug#27940). * test/lisp/dired-tests.el (dired-test-with-temp-dirs): New auxiliar macro. (dired-test-bug27940): Add new test.
2017-08-09 05:47:15 +00:00
(let* ((empty-dir-p (null (directory-files file t dired-re-no-dot))))
(if (and recursive (not empty-dir-p))
(unless (eq recursive 'always)
(let ((prompt
(format "Recursively %s %s? "
(if (and trash delete-by-moving-to-trash)
"trash"
"delete")
(dired-make-relative file))))
New function read-answer (bug#30073) * lisp/emacs-lisp/map-ynp.el (read-answer): New function. (read-answer-short): New defcustom. * lisp/dired.el (dired-delete-file): Use read-answer. (dired--yes-no-all-quit-help): Remove function. (dired-delete-help): Remove defconst. * lisp/subr.el (assoc-delete-all): New function.
2018-01-21 21:45:43 +00:00
(pcase (read-answer
prompt
'(("yes" ?y "delete recursively the current directory")
("no" ?n "skip to next")
("all" ?! "delete all remaining directories with no more questions")
("quit" ?q "exit")))
Don't quote self-quoting pcase patterns * admin/bzrmerge.el: * lisp/char-fold.el: * lisp/dired.el: * lisp/emacs-lisp/derived.el: * lisp/emacs-lisp/easy-mmode.el: * lisp/emacs-lisp/easymenu.el: * lisp/emacs-lisp/eieio-core.el: * lisp/emacs-lisp/package.el: * lisp/emacs-lisp/smie.el: * lisp/faces.el: * lisp/filesets.el: * lisp/progmodes/modula2.el: * lisp/progmodes/octave.el: * lisp/progmodes/opascal.el: * lisp/progmodes/perl-mode.el: * lisp/progmodes/prolog.el: * lisp/progmodes/ruby-mode.el: * lisp/progmodes/sh-script.el: * lisp/server.el: * lisp/subr.el: * lisp/textmodes/css-mode.el: * test/lisp/emacs-lisp/pcase-tests.el: Don't quote self-quoting 'pcase' patterns.
2018-10-26 23:48:35 +00:00
("all" (setq recursive 'always dired-recursive-deletes recursive))
("yes" (if (eq recursive 'top) (setq recursive 'always)))
("no" (setq recursive nil))
("quit" (keyboard-quit))
New function read-answer (bug#30073) * lisp/emacs-lisp/map-ynp.el (read-answer): New function. (read-answer-short): New defcustom. * lisp/dired.el (dired-delete-file): Use read-answer. (dired--yes-no-all-quit-help): Remove function. (dired-delete-help): Remove defconst. * lisp/subr.el (assoc-delete-all): New function.
2018-01-21 21:45:43 +00:00
(_ (keyboard-quit))))) ; catch all unknown answers
dired-delete-file: Dont't ask for empty dirs * lisp/dired.el (dired--yes-no-all-quit-help): New defun. (dired-delete-file): Use it. Dont't ask for empty dirs (Bug#27940). * test/lisp/dired-tests.el (dired-test-with-temp-dirs): New auxiliar macro. (dired-test-bug27940): Add new test.
2017-08-09 05:47:15 +00:00
(setq recursive nil)) ; Empty dir or recursive is nil.
dired-do-delete: Allow to delete dirs recursively without prompts * lisp/dired.el (dired-delete-file): Accept 2 additional answers: 'all', to delete all directories recursively and no prompt anymore. 'quit', to cancel directory deletions (Bug#27940). Show help message when user inputs 'help'. (dired-do-flagged-delete): Bind locally dired-recursive-deletes so that we can overwrite its global value. Wrapp the loop within a catch '--delete-cancel to catch when the user abort the directtry deletion. * doc/emacs/dired.texi (Dired Deletion): Update manual. * etc/NEWS (Changes in Specialized Modes and Packages in Emacs 26.1): Announce this change.
2017-08-06 04:46:51 +00:00
(delete-directory file recursive trash))))
(dired-recursive-deletes): New custom variable. (dired-re-no-dot): New variable. (dired-delete-file): New function deletes files and directories recursively. (dired-internal-do-deletions): Use `dired-delete-file' to delete files.
1999-09-15 23:29:16 +00:00
(dired-insert-set-properties): Catch errors. (dired-do-flagged-delete): New arg nomessage.
1995-07-31 23:13:54 +00:00
(defun dired-do-flagged-delete (&optional nomessage)
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
"In Dired, delete the files flagged for deletion.
(dired-insert-set-properties): Catch errors. (dired-do-flagged-delete): New arg nomessage.
1995-07-31 23:13:54 +00:00
If NOMESSAGE is non-nil, we don't display any message
(dired-do-flagged-delete, dired-do-delete): Doc fix.
2007-05-31 21:10:49 +00:00
if there are no flagged files.
(dired-mode-map): Bind C-x C-q to dired-toggle-read-only. Filter out menu item "Edit File Names" `wdired-change-to-wdired-mode' when major-mode is not dired-mode. (dired-toggle-read-only): New function. (dired-recursive-deletes): Remove obsolete comments about old default value. (dired-do-flagged-delete, dired-do-delete): Refill docstring.
2007-07-29 09:18:15 +00:00
`dired-recursive-deletes' controls whether deletion of
non-empty directories is allowed."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive)
(let* ((dired-marker-char dired-del-marker)
(regexp (dired-marker-regexp))
case-fold-search)
(if (save-excursion (goto-char (point-min))
(re-search-forward regexp nil t))
(dired-internal-do-deletions
Ask files for deletion in buffer order: top first, botton later * lisp/dired.el (dired-do-flagged-delete, dired-do-delete): Call `nreverse' t invert the output of `dired-map-over-marks'.
2017-08-09 05:37:21 +00:00
(nreverse
;; this can't move point since ARG is nil
(dired-map-over-marks (cons (dired-get-filename) (point))
nil))
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
nil t)
(dired-insert-set-properties): Catch errors. (dired-do-flagged-delete): New arg nomessage.
1995-07-31 23:13:54 +00:00
(or nomessage
(message "(No deletions requested)")))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-do-delete (&optional arg)
(dired-do-flagged-delete, dired-do-delete): Doc fix.
2007-05-31 21:10:49 +00:00
"Delete all marked (or next ARG) files.
(dired-mode-map): Bind C-x C-q to dired-toggle-read-only. Filter out menu item "Edit File Names" `wdired-change-to-wdired-mode' when major-mode is not dired-mode. (dired-toggle-read-only): New function. (dired-recursive-deletes): Remove obsolete comments about old default value. (dired-do-flagged-delete, dired-do-delete): Refill docstring.
2007-07-29 09:18:15 +00:00
`dired-recursive-deletes' controls whether deletion of
non-empty directories is allowed."
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; This is more consistent with the file marking feature than
;; dired-do-flagged-delete.
(interactive "P")
(dired-internal-do-deletions
Ask files for deletion in buffer order: top first, botton later * lisp/dired.el (dired-do-flagged-delete, dired-do-delete): Call `nreverse' t invert the output of `dired-map-over-marks'.
2017-08-09 05:37:21 +00:00
(nreverse
;; this may move point if ARG is an integer
(dired-map-over-marks (cons (dired-get-filename) (point))
arg))
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
arg t))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defvar dired-deletion-confirmer 'yes-or-no-p) ; or y-or-n-p?
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
(defun dired-internal-do-deletions (l arg &optional trash)
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; L is an alist of files to delete, with their buffer positions.
;; ARG is the prefix arg.
* bitmaps/README: * xfns.c: * termcap.c: * term.c: * syswait.h: * systty.h: * systime.h: * syssignal.h: * sysdep.c: * process.h: * process.c: * print.c: * ndir.h: * lread.c: * keyboard.c: * getpagesize.h: * floatfns.c: * fileio.c: * emacs.c: * doc.c: * dispnew.c: * dired.c: * data.c: * callproc.c: * buffer.c: * README: * Makefile.in: * s/template.h: * s/msdos.h: * m/vax.h: Remove VMS support. * s/vms.h: * vlimit.h: * uaf.h: * temacs.opt: * param.h: * ioctl.h: Remove file. * descrip.mms: * compile.com: Remove file. * Create.c: Remove VMS support. * message.el (Module): * gnus-start.el (Module): * gnus-registry.el (Module): * textmodes/texinfmt.el: * nxml/nxml-enc.el: * mail/feedmail.el: * international/mule.el: * international/latexenc.el: * emulation/viper-util.el: * emulation/viper-init.el: * emulation/viper-ex.el: * emacs-lisp/bytecomp.el: * version.el: * subr.el: * startup.el: * sort.el: * shadowfile.el: * recentf.el: * printing.el: * paths.el: * minibuffer.el: * ls-lisp.el: * loadup.el: * hippie-exp.el: * finder.el: * files.el: * ediff-util.el: * ediff-ptch.el: * ediff-init.el: * ediff-diff.el: * dired.el: * dired-aux.el: * cus-edit.el: * bindings.el: * arc-mode.el: * add-log.el: Remove VMS support. * obsolete/vmsproc.el: * obsolete/vms-pmail.el: * obsolete/vms-patch.el: Remove file. * etags.c: * emacsclient.c: Remove VMS support. * termcap.src: Remove file. * README: * PROBLEMS: * MACHINES: Remove VMS info. * ediff.texi: Remove VMS support. * os.texi: * intro.texi: * files.texi: Remove VMS support. * emacs.texi: Remove VMS support. * make-dist: * README: Remove VMS support. * vms: Remove directory.
2008-07-31 05:33:56 +00:00
;; Filenames are absolute.
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; (car L) *must* be the *last* (bottommost) file in the dired buffer.
;; That way as changes are made in the buffer they do not shift the
;; lines still to be changed, so the (point) values in L stay valid.
;; Also, for subdirs in natural order, a subdir's files are deleted
;; before the subdir itself - the other way around would not work.
Use #' instead of (function ...) * lisp/dired-aux.el (dired-do-chxxx, dired-clean-directory) (dired-mark-confirm, dired-query, dired-byte-compile) (dired-load, dired-update-file-line, dired-after-subdir-garbage) (dired-relist-file, dired-rename-subdir, dired-do-create-files) (dired-mark-read-file-name, dired-do-copy, dired-do-symlink) (dired-do-hardlink, dired-do-rename, dired-do-rename-regexp) (dired-do-copy-regexp, dired-do-hardlink-regexp) (dired-do-symlink-regexp, dired-create-files-non-directory) (dired-upcase, dired-downcase) * lisp/dired.el (dired-mode, dired-copy-filename-as-kill) (dired-internal-do-deletions, dired-internal-do-deletions): Prefer #' instead of (function ...).
2017-06-26 05:22:34 +00:00
(let* ((files (mapcar #'car l))
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
(count (length l))
(succ 0)
dired-do-delete: Allow to delete dirs recursively without prompts * lisp/dired.el (dired-delete-file): Accept 2 additional answers: 'all', to delete all directories recursively and no prompt anymore. 'quit', to cancel directory deletions (Bug#27940). Show help message when user inputs 'help'. (dired-do-flagged-delete): Bind locally dired-recursive-deletes so that we can overwrite its global value. Wrapp the loop within a catch '--delete-cancel to catch when the user abort the directtry deletion. * doc/emacs/dired.texi (Dired Deletion): Update manual. * etc/NEWS (Changes in Specialized Modes and Packages in Emacs 26.1): Announce this change.
2017-08-06 04:46:51 +00:00
;; Bind `dired-recursive-deletes' so that we can change it
;; locally according with the user answer within `dired-delete-file'.
(dired-recursive-deletes dired-recursive-deletes)
* dired.el (dired-internal-do-deletions) messaging fixup * dired.el (dired-internal-do-deletions): Don't say "Deleting..." before we actually start to delete things. Fixes: debbugs:16331
2014-02-09 02:19:15 +00:00
(trashing (and trash delete-by-moving-to-trash)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; canonicalize file list for pop up
* lisp/dired.el (dired-internal-do-deletions): Remove nreverse to compensate the changes that added nreverse to dired-do-delete and dired-do-flagged-delete in 9ecbdee (bug#30162)
2018-01-24 21:44:09 +00:00
(setq files (mapcar #'dired-make-relative files))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(if (dired-mark-pop-up
" *Deletions*" 'delete files dired-deletion-confirmer
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
(format "%s %s "
(if trashing "Trash" "Delete")
(dired-mark-prompt arg files)))
Initial revision
1992-05-30 23:52:26 +00:00
(save-excursion
dired-do-delete: Allow to delete dirs recursively without prompts * lisp/dired.el (dired-delete-file): Accept 2 additional answers: 'all', to delete all directories recursively and no prompt anymore. 'quit', to cancel directory deletions (Bug#27940). Show help message when user inputs 'help'. (dired-do-flagged-delete): Bind locally dired-recursive-deletes so that we can overwrite its global value. Wrapp the loop within a catch '--delete-cancel to catch when the user abort the directtry deletion. * doc/emacs/dired.texi (Dired Deletion): Update manual. * etc/NEWS (Changes in Specialized Modes and Packages in Emacs 26.1): Announce this change.
2017-08-06 04:46:51 +00:00
(catch '--delete-cancel
* dired.el (dired-internal-do-deletions) messaging fixup * dired.el (dired-internal-do-deletions): Don't say "Deleting..." before we actually start to delete things. Fixes: debbugs:16331
2014-02-09 02:19:15 +00:00
(let ((progress-reporter
(make-progress-reporter
(if trashing "Trashing..." "Deleting...")
succ count))
failures) ;; files better be in reverse order for this loop!
*** empty log message ***
1992-06-24 02:13:56 +00:00
(while l
(goto-char (cdr (car l)))
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(let ((inhibit-read-only t))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(condition-case err
(let ((fn (car (car l))))
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
(dired-delete-file fn dired-recursive-deletes trash)
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; if we get here, removing worked
(setq succ (1+ succ))
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
(progress-reporter-update progress-reporter succ)
(dired-readin): Clear out undo list. (dired-fun-in-all-buffers): Definition moved from dired-aux.el. (dired-delete-entry): New function. (dired-internal-do-deletions): Use dired-fun-in-all-buffers and dired-delete-entry, to update this buffer (and others).
2002-03-14 08:55:20 +00:00
(dired-fun-in-all-buffers
(file-name-directory fn) (file-name-nondirectory fn)
Use #' instead of (function ...) * lisp/dired-aux.el (dired-do-chxxx, dired-clean-directory) (dired-mark-confirm, dired-query, dired-byte-compile) (dired-load, dired-update-file-line, dired-after-subdir-garbage) (dired-relist-file, dired-rename-subdir, dired-do-create-files) (dired-mark-read-file-name, dired-do-copy, dired-do-symlink) (dired-do-hardlink, dired-do-rename, dired-do-rename-regexp) (dired-do-copy-regexp, dired-do-hardlink-regexp) (dired-do-symlink-regexp, dired-create-files-non-directory) (dired-upcase, dired-downcase) * lisp/dired.el (dired-mode, dired-copy-filename-as-kill) (dired-internal-do-deletions, dired-internal-do-deletions): Prefer #' instead of (function ...).
2017-06-26 05:22:34 +00:00
#'dired-delete-entry fn))
dired-do-delete: Allow to delete dirs recursively without prompts * lisp/dired.el (dired-delete-file): Accept 2 additional answers: 'all', to delete all directories recursively and no prompt anymore. 'quit', to cancel directory deletions (Bug#27940). Show help message when user inputs 'help'. (dired-do-flagged-delete): Bind locally dired-recursive-deletes so that we can overwrite its global value. Wrapp the loop within a catch '--delete-cancel to catch when the user abort the directtry deletion. * doc/emacs/dired.texi (Dired Deletion): Update manual. * etc/NEWS (Changes in Specialized Modes and Packages in Emacs 26.1): Announce this change.
2017-08-06 04:46:51 +00:00
(quit (throw '--delete-cancel (message "OK, canceled")))
* dired.el (dired-internal-do-deletions) messaging fixup * dired.el (dired-internal-do-deletions): Don't say "Deleting..." before we actually start to delete things. Fixes: debbugs:16331
2014-02-09 02:19:15 +00:00
(error ;; catch errors from failed deletions
Improve dired deletion error handling (Bug#28797) * lisp/dired.el (dired-internal-do-deletions): Use `error-message-string' to produce a human readable error message.
2017-10-13 03:12:00 +00:00
(dired-log "%s: %s\n" (car err) (error-message-string err))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(setq failures (cons (car (car l)) failures)))))
(setq l (cdr l)))
(if (not failures)
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean whether to trash. (internal_delete_file, Frename_file): Callers changed. (delete_by_moving_to_trash): Doc fix. (Fdelete_directory_internal): Don't move to trash. * src/callproc.c (delete_temp_file): * src/buffer.c (Fkill_buffer): Callers changed. * src/lisp.h: Update prototype. * lisp/diff.el (diff-sentinel): * lisp/epg.el (epg--make-temp-file, epg-decrypt-string) (epg-verify-string, epg-sign-string, epg-encrypt-string): * lisp/jka-compr.el (jka-compr-partial-uncompress) (jka-compr-call-process, jka-compr-write-region): * lisp/server.el (server-sentinel): Remove optional arg from delete-file, reverting 2010-05-03 change. * lisp/dired.el (dired-delete-file): New arg TRASH. (dired-internal-do-deletions): New arg TRASH. Use progress reporter. (dired-do-flagged-delete, dired-do-delete): Use trash. * lisp/files.el (delete-directory): New arg TRASH. * lisp/speedbar.el (speedbar-item-delete): Allow trashing. * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file) (ange-ftp-rename-remote-to-remote) (ange-ftp-rename-local-to-remote) (ange-ftp-rename-remote-to-local, ange-ftp-load) (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from `delete-file'. (ange-ftp-delete-directory): Add optional arg to `delete-file', to allow trashing. * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory) (tramp-fish-handle-delete-file) (tramp-fish-handle-make-symbolic-link) (tramp-fish-handle-process-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg. (tramp-gvfs-handle-write-region): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg. (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in `tramp-compat-delete-file' call. * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region): Use null TRASH arg in tramp-compat-delete-file call. (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file. (tramp-smb-handle-delete-file): Rename arg. * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH. (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-process-file, tramp-handle-call-process-region) (tramp-handle-shell-command, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-delete-temp-file-function): Use null TRASH arg in tramp-compat-delete-file call.
2010-05-27 23:30:11 +00:00
(progress-reporter-done progress-reporter)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-log-summary
Use ngettext instead of dired-plural-s in Dired (bug#35287) * lisp/dired-aux.el (dired-map-over-marks-check): Use ngettext instead of dired-plural-s. (dired-create-files): Also add colon after operation name. (dired-compare-directories): Use ngettext and format-message. (dired-do-compress-to): Use ngettext. * lisp/dired.el (dired-internal-do-deletions) (dired-clean-up-after-deletion): Use ngettext instead of dired-plural-s.
2019-05-05 19:43:27 +00:00
(format (ngettext "%d of %d deletion failed"
"%d of %d deletions failed"
count)
(length failures) count)
dired-do-delete: Allow to delete dirs recursively without prompts * lisp/dired.el (dired-delete-file): Accept 2 additional answers: 'all', to delete all directories recursively and no prompt anymore. 'quit', to cancel directory deletions (Bug#27940). Show help message when user inputs 'help'. (dired-do-flagged-delete): Bind locally dired-recursive-deletes so that we can overwrite its global value. Wrapp the loop within a catch '--delete-cancel to catch when the user abort the directtry deletion. * doc/emacs/dired.texi (Dired Deletion): Update manual. * etc/NEWS (Changes in Specialized Modes and Packages in Emacs 26.1): Announce this change.
2017-08-06 04:46:51 +00:00
failures)))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(message "(No deletions performed)")))
(dired-move-to-filename))
(dired-readin): Clear out undo list. (dired-fun-in-all-buffers): Definition moved from dired-aux.el. (dired-delete-entry): New function. (dired-internal-do-deletions): Use dired-fun-in-all-buffers and dired-delete-entry, to update this buffer (and others).
2002-03-14 08:55:20 +00:00
(defun dired-fun-in-all-buffers (directory file fun &rest args)
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
"In all buffers dired'ing DIRECTORY, run FUN with ARGS.
If the buffer has a wildcard pattern, check that it matches FILE.
(FILE does not include a directory component.)
FILE may be nil, in which case ignore it.
Return list of buffers where FUN succeeded (i.e., returned non-nil)."
(dired-readin): Clear out undo list. (dired-fun-in-all-buffers): Definition moved from dired-aux.el. (dired-delete-entry): New function. (dired-internal-do-deletions): Use dired-fun-in-all-buffers and dired-delete-entry, to update this buffer (and others).
2002-03-14 08:55:20 +00:00
(let (success-list)
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(dolist (buf (dired-buffers-for-dir (expand-file-name directory) file))
(dired-readin): Clear out undo list. (dired-fun-in-all-buffers): Definition moved from dired-aux.el. (dired-delete-entry): New function. (dired-internal-do-deletions): Use dired-fun-in-all-buffers and dired-delete-entry, to update this buffer (and others).
2002-03-14 08:55:20 +00:00
(with-current-buffer buf
(if (apply fun args)
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(push buf success-list))))
;; FIXME: AFAICT, this return value is not used by any of the callers!
(dired-readin): Clear out undo list. (dired-fun-in-all-buffers): Definition moved from dired-aux.el. (dired-delete-entry): New function. (dired-internal-do-deletions): Use dired-fun-in-all-buffers and dired-delete-entry, to update this buffer (and others).
2002-03-14 08:55:20 +00:00
success-list))
Cygwin support patch.
2003-01-31 15:24:20 +00:00
;; Delete the entry for FILE from
(dired-readin): Clear out undo list. (dired-fun-in-all-buffers): Definition moved from dired-aux.el. (dired-delete-entry): New function. (dired-internal-do-deletions): Use dired-fun-in-all-buffers and dired-delete-entry, to update this buffer (and others).
2002-03-14 08:55:20 +00:00
(defun dired-delete-entry (file)
(save-excursion
(and (dired-goto-file file)
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(let ((inhibit-read-only t))
(dired-readin): Clear out undo list. (dired-fun-in-all-buffers): Definition moved from dired-aux.el. (dired-delete-entry): New function. (dired-internal-do-deletions): Use dired-fun-in-all-buffers and dired-delete-entry, to update this buffer (and others).
2002-03-14 08:55:20 +00:00
(delete-region (progn (beginning-of-line) (point))
(save-excursion (forward-line 1) (point))))))
(dired-clean-up-after-deletion file))
Merge dired-x's dired-clean-up-after-deletion into dired's version. * lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el. * lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version. (dired-clean-up-buffers-too): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefine dired-clean-up-after-deletion.
2011-02-19 18:55:15 +00:00
(defvar dired-clean-up-buffers-too)
New variable 'dired-confirm-killing-deleted-buffers' * lisp/dired-x.el (dired-clean-confirm-killing-deleted-buffers): New variable. * lisp/dired.el (dired-clean-up-after-deletion): Kill buffers visiting deleted files without confirming if dired-clean-confirm-killing-deleted-buffers is nil. (Bug#28373) * etc/NEWS: Document the change. Copyright-paperwork-exempt: yes
2017-09-08 09:36:59 +00:00
(defvar dired-clean-confirm-killing-deleted-buffers)
Merge dired-x's dired-clean-up-after-deletion into dired's version. * lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el. * lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version. (dired-clean-up-buffers-too): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefine dired-clean-up-after-deletion.
2011-02-19 18:55:15 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-clean-up-after-deletion (fn)
Merge dired-x's dired-clean-up-after-deletion into dired's version. * lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el. * lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version. (dired-clean-up-buffers-too): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefine dired-clean-up-after-deletion.
2011-02-19 18:55:15 +00:00
"Clean up after a deleted file or directory FN.
New variable 'dired-confirm-killing-deleted-buffers' * lisp/dired-x.el (dired-clean-confirm-killing-deleted-buffers): New variable. * lisp/dired.el (dired-clean-up-after-deletion): Kill buffers visiting deleted files without confirming if dired-clean-confirm-killing-deleted-buffers is nil. (Bug#28373) * etc/NEWS: Document the change. Copyright-paperwork-exempt: yes
2017-09-08 09:36:59 +00:00
Removes any expanded subdirectory of deleted directory. If
`dired-x' is loaded and `dired-clean-up-buffers-too' is non-nil,
kill any buffers visiting those files, prompting for
confirmation. To disable the confirmation, see
`dired-clean-confirm-killing-deleted-buffers'."
entered into RCS
1992-09-19 19:40:38 +00:00
(save-excursion (and (cdr dired-subdir-alist)
(dired-goto-subdir fn)
Merge dired-x's dired-clean-up-after-deletion into dired's version. * lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el. * lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version. (dired-clean-up-buffers-too): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefine dired-clean-up-after-deletion.
2011-02-19 18:55:15 +00:00
(dired-kill-subdir)))
;; Offer to kill buffer of deleted file FN.
(when (and (featurep 'dired-x) dired-clean-up-buffers-too)
(let ((buf (get-file-buffer fn)))
(and buf
New variable 'dired-confirm-killing-deleted-buffers' * lisp/dired-x.el (dired-clean-confirm-killing-deleted-buffers): New variable. * lisp/dired.el (dired-clean-up-after-deletion): Kill buffers visiting deleted files without confirming if dired-clean-confirm-killing-deleted-buffers is nil. (Bug#28373) * etc/NEWS: Document the change. Copyright-paperwork-exempt: yes
2017-09-08 09:36:59 +00:00
(and dired-clean-confirm-killing-deleted-buffers
(funcall #'y-or-n-p
(format "Kill buffer of %s, too? "
(file-name-nondirectory fn))))
Merge dired-x's dired-clean-up-after-deletion into dired's version. * lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el. * lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version. (dired-clean-up-buffers-too): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefine dired-clean-up-after-deletion.
2011-02-19 18:55:15 +00:00
(kill-buffer buf)))
(let ((buf-list (dired-buffers-for-dir (expand-file-name fn))))
(and buf-list
New variable 'dired-confirm-killing-deleted-buffers' * lisp/dired-x.el (dired-clean-confirm-killing-deleted-buffers): New variable. * lisp/dired.el (dired-clean-up-after-deletion): Kill buffers visiting deleted files without confirming if dired-clean-confirm-killing-deleted-buffers is nil. (Bug#28373) * etc/NEWS: Document the change. Copyright-paperwork-exempt: yes
2017-09-08 09:36:59 +00:00
(and dired-clean-confirm-killing-deleted-buffers
Use ngettext instead of dired-plural-s in Dired (bug#35287) * lisp/dired-aux.el (dired-map-over-marks-check): Use ngettext instead of dired-plural-s. (dired-create-files): Also add colon after operation name. (dired-compare-directories): Use ngettext and format-message. (dired-do-compress-to): Use ngettext. * lisp/dired.el (dired-internal-do-deletions) (dired-clean-up-after-deletion): Use ngettext instead of dired-plural-s.
2019-05-05 19:43:27 +00:00
(y-or-n-p (format (ngettext "Kill Dired buffer of %s, too? "
"Kill Dired buffers of %s, too? "
(length buf-list))
New variable 'dired-confirm-killing-deleted-buffers' * lisp/dired-x.el (dired-clean-confirm-killing-deleted-buffers): New variable. * lisp/dired.el (dired-clean-up-after-deletion): Kill buffers visiting deleted files without confirming if dired-clean-confirm-killing-deleted-buffers is nil. (Bug#28373) * etc/NEWS: Document the change. Copyright-paperwork-exempt: yes
2017-09-08 09:36:59 +00:00
(file-name-nondirectory fn))))
Merge dired-x's dired-clean-up-after-deletion into dired's version. * lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el. * lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version. (dired-clean-up-buffers-too): Declare. * doc/misc/dired-x.texi (Technical Details): No longer redefine dired-clean-up-after-deletion.
2011-02-19 18:55:15 +00:00
(dolist (buf buf-list)
(kill-buffer buf))))))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Confirmation
(defun dired-marker-regexp ()
(concat "^" (regexp-quote (char-to-string dired-marker-char))))
(defun dired-plural-s (count)
(if (= 1 count) "" "s"))
(defun dired-mark-prompt (arg files)
Minor Dired doc fixes. * lisp/dired.el (dired-mark-prompt): * lisp/dired-aux.el (dired-read-shell-command): Doc fix.
2011-07-12 02:54:26 +00:00
"Return a string suitable for use in a Dired prompt.
ARG is normally the prefix argument for the calling command.
FILES should be a list of file names.
The return value has a form like \"foo.txt\", \"[next 3 files]\",
or \"* [3 files]\"."
(dired-mark-prompt): Don't count/display the t element. Reported by Carsten Blaauw <it-media.blaauw@daimler.com>.
2008-02-22 18:47:26 +00:00
;; distinguish-one-marked can cause the first element to be just t.
(if (eq (car files) t) (setq files (cdr files)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let ((count (length files)))
(if (= count 1)
(car files)
;; more than 1 file:
(if (integerp arg)
;; abs(arg) = count
;; Perhaps this is nicer, but it also takes more screen space:
;;(format "[%s %d files]" (if (> arg 0) "next" "previous")
;; count)
(format "[next %d files]" arg)
(format "%c [%d files]" dired-marker-char count)))))
(defun dired-pop-to-buffer (buf)
(dired-pop-to-buffer): Don't split windows horizontally. (Bug#1806)
2009-01-07 09:58:23 +00:00
"Pop up buffer BUF in a way suitable for Dired."
Re-fix dired-pop-to-buffer obsoletion reference * lisp/dired.el (dired-pop-to-buffer): Re-fix obsoletion reference (bug#26243).
2019-07-30 11:34:53 +00:00
(declare (obsolete pop-to-buffer "24.3"))
(dired-pop-to-buffer): Try to make this behave the Emacs 22 way (Bug#1806).
2009-05-15 15:00:32 +00:00
(let ((split-window-preferred-function
(lambda (window)
(dired-pop-to-buffer): Fix last fix.
2009-05-15 18:14:03 +00:00
(or (and (let ((split-height-threshold 0))
(window-splittable-p (selected-window)))
(dired-pop-to-buffer): Try to make this behave the Emacs 22 way (Bug#1806).
2009-05-15 15:00:32 +00:00
;; Try to split the selected window vertically if
;; that's possible. (Bug#1806)
Rename split-window-{above-each-other|split-window-side-by-side} to split-window-below and split-window-right. * lisp/window.el (split-window-below, split-window-right): Rename from split-window-above-each-other and split-window-side-by-side respectively. All callers changed. (split-window-sensibly, split-window-sensibly): Use them. (split-window-keep-point): Doc fix. * lisp/isearch.el: Add isearch-scroll property to split-window-below and split-window-right. * lisp/follow.el (follow-mode): * lisp/vc/pcvs-util.el (cvs-pop-to-buffer-same-frame): * lisp/progmodes/ada-xref.el (ada-gdb-application): * lisp/emulation/vip.el (vip-buffer-in-two-windows): * lisp/image-dired.el (image-dired-dired-with-window-configuration): * lisp/dired-x.el (dired-do-find-marked-files): * lisp/dired.el (dired-pop-to-buffer): * lisp/bs.el (bs--show-with-configuration): * lisp/vc/emerge.el (emerge-setup-windows): * lisp/textmodes/two-column.el (2C-two-columns): * lisp/textmodes/reftex-toc.el (reftex-toc): * lisp/progmodes/gdb-mi.el (gdb-setup-windows): * lisp/progmodes/fortran.el (fortran-window-create): * lisp/net/newst-treeview.el (newsticker--treeview-window-init): * lisp/emulation/ws-mode.el (wordstar-C-o-map, wordstar-mode): * lisp/emulation/tpu-edt.el (tpu-gold-map): * lisp/emulation/crisp.el (crisp-mode-map): * lisp/calendar/calendar.el (calendar-basic-setup): Callers changed.
2011-10-30 01:56:03 +00:00
(split-window-below))
(dired-pop-to-buffer): Try to make this behave the Emacs 22 way (Bug#1806).
2009-05-15 15:00:32 +00:00
;; Otherwise, try to split WINDOW sensibly.
* dired.el (dired-pop-to-buffer): Bind pop-up-frames to nil (Bug#7533).
2010-12-04 22:43:51 +00:00
(split-window-sensibly window))))
pop-up-frames)
(dired-pop-to-buffer): Don't split windows horizontally. (Bug#1806)
2009-01-07 09:58:23 +00:00
(pop-to-buffer (get-buffer-create buf)))
In dired-pop-to-buffer make window start at beginning of buffer (Bug#12281). * dired.el (dired-pop-to-buffer): Make window start at beginning of buffer (Bug#12281).
2012-08-27 09:05:55 +00:00
;; See Bug#12281.
(set-window-start nil (point-min))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; If dired-shrink-to-fit is t, make its window fit its contents.
(dired-pop-to-buffer): Use fit-window-to-buffer when dired-shrink-to-fit is non-nil. (Bug#1488)
2008-12-11 09:48:08 +00:00
(when dired-shrink-to-fit
(dired-pop-to-buffer): Call with min-height arg 1 to make sure that small buffers get shown.
2008-12-11 17:20:45 +00:00
;; Try to not delete window when we want to display less than
;; `window-min-height' lines.
Add code for "preserving" window sizes. * frame.c (frame_windows_min_size): New argument IGNORE. (adjust_frame_size): When called from change_frame_size call frame_windows_min_size with IGNORE Qt so we can ignore size restrictions. * dired.el (dired-pop-to-buffer): Call fit-window-to-buffer with `preserve-size' t. (dired-mark-pop-up): Preserve size of window showing marked files. * electric.el (Electric-pop-up-window): * help.el (resize-temp-buffer-window): Call fit-window-to-buffer with `preserve-size' t. * minibuffer.el (minibuffer-completion-help): Use `resize-temp-buffer-window' instead of `fit-window-to-buffer' (Bug#19355). Preserve size of completions window. * register.el (register-preview): Preserve size of register preview window. * tmm.el (tmm-add-prompt): Call fit-window-to-buffer with `preserve-size' t (Bug#1291). * window.el (with-displayed-buffer-window): Add calls to `window-preserve-size'. (window-min-pixel-size, window--preservable-size) (window-preserve-size, window-preserved-size) (window--preserve-size, window--min-size-ignore-p): New functions. (window-min-size, window-min-delta, window--resizable) (window--resize-this-window, split-window-below) (split-window-right): Amend doc-string. (adjust-window-trailing-edge): Handle preserving window sizes. Signal user-error instead of an error when there's no window above or below. (window--min-size-1, window-sizable, window--size-fixed-1) (window-size-fixed-p, window--min-delta-1) (frame-windows-min-size, window--max-delta-1, window-resize) (window--resize-child-windows, window--resize-siblings) (enlarge-window, shrink-window, split-window): Handle preserving window sizes. (window--state-put-2): Handle horizontal scroll bars. (window--display-buffer): Call `preserve-size' if asked for. (display-buffer): Mention `preserve-size' alist member in doc-string. (fit-window-to-buffer): New argument PRESERVE-SIZE.
2014-12-18 17:12:24 +00:00
(fit-window-to-buffer (get-buffer-window buf) nil 1 nil nil t)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-move-to-filename-regexp): Define as alias. (dired-no-confirm): Use defcustom. (dired-subdir-alist-pre-R): Put defvar at top level.
2006-01-19 17:50:15 +00:00
(defcustom dired-no-confirm nil
* dired.el (dired-no-confirm): Document value t and fix defcustom (bug#6597).
2010-07-22 12:15:31 +00:00
"A list of symbols for commands Dired should not confirm, or t.
Doc dired-no-confirm and allow t value.
1997-03-20 12:37:06 +00:00
Command symbols are `byte-compile', `chgrp', `chmod', `chown', `compress',
Add autoload for `dired-do-touch'. (dired-touch-program): New var. (dired-mode-map): Bind `dired-do-touch' to T and add menu-item. (dired-no-confirm): Add `touch' to docstring.
2004-03-31 16:29:46 +00:00
`copy', `delete', `hardlink', `load', `move', `print', `shell', `symlink',
* dired.el (dired-no-confirm): Document value t and fix defcustom (bug#6597).
2010-07-22 12:15:31 +00:00
`touch' and `uncompress'.
If t, confirmation is never needed."
(dired-move-to-filename-regexp): Define as alias. (dired-no-confirm): Use defcustom. (dired-subdir-alist-pre-R): Put defvar at top level.
2006-01-19 17:50:15 +00:00
:group 'dired
* dired.el (dired-no-confirm): Document value t and fix defcustom (bug#6597).
2010-07-22 12:15:31 +00:00
:type '(choice (const :tag "Confirmation never needed" t)
(set (const byte-compile) (const chgrp)
(const chmod) (const chown) (const compress)
(const copy) (const delete) (const hardlink)
(const load) (const move) (const print)
(const shell) (const symlink) (const touch)
(const uncompress))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
New macro with-temp-buffer-window and related fixes. * buffer.c (Fdelete_all_overlays): New function. * window.el (temp-buffer-window-setup-hook) (temp-buffer-window-show-hook): New hooks. (temp-buffer-window-setup, temp-buffer-window-show) (with-temp-buffer-window): New functions. (fit-window-to-buffer): Remove unused optional argument OVERRIDE. (special-display-popup-frame): Make sure the window used shows BUFFER. * help.el (temp-buffer-resize-mode): Fix doc-string. (resize-temp-buffer-window): New optional argument WINDOW. * files.el (recover-file, save-buffers-kill-emacs): * dired.el (dired-mark-pop-up): Use with-temp-buffer-window.
2012-09-03 08:54:25 +00:00
(defun dired-mark-pop-up (buffer-or-name op-symbol files function &rest args)
(dired-mark-pop-up): Doc fix.
2002-09-19 01:03:43 +00:00
"Return FUNCTION's result on ARGS after showing which files are marked.
New macro with-temp-buffer-window and related fixes. * buffer.c (Fdelete_all_overlays): New function. * window.el (temp-buffer-window-setup-hook) (temp-buffer-window-show-hook): New hooks. (temp-buffer-window-setup, temp-buffer-window-show) (with-temp-buffer-window): New functions. (fit-window-to-buffer): Remove unused optional argument OVERRIDE. (special-display-popup-frame): Make sure the window used shows BUFFER. * help.el (temp-buffer-resize-mode): Fix doc-string. (resize-temp-buffer-window): New optional argument WINDOW. * files.el (recover-file, save-buffers-kill-emacs): * dired.el (dired-mark-pop-up): Use with-temp-buffer-window.
2012-09-03 08:54:25 +00:00
Displays the file names in a window showing a buffer named
BUFFER-OR-NAME; the default name being \" *Marked Files*\". The
window is not shown if there is just one file, `dired-no-confirm'
is t, or OP-SYMBOL is a member of the list in `dired-no-confirm'.
* lisp/dired.el (dired-shrink-to-fit): Declare obsolete. (dired-pop-to-buffer): Declare obsolete. (dired-mark-pop-up): Doc fix. Fixes: debbugs:1806
2012-10-04 18:30:08 +00:00
By default, Dired shrinks the display buffer to fit the marked files.
To disable this, use the Customization interface to add a new rule
to `display-buffer-alist' where condition regexp is \"^ \\*Marked Files\\*$\",
action argument symbol is `window-height' and its value is nil.
(dired-map-over-marks): New arg distinguish-one-marked. (dired-get-marked-files): New arg distinguish-one-marked. (dired-mark-pop-up): Handle FILES = (t FILE) specially.
2005-05-15 21:33:25 +00:00
FILES is the list of marked files. It can also be (t FILENAME)
in the case of one marked file, to distinguish that from using
New macro with-temp-buffer-window and related fixes. * buffer.c (Fdelete_all_overlays): New function. * window.el (temp-buffer-window-setup-hook) (temp-buffer-window-show-hook): New hooks. (temp-buffer-window-setup, temp-buffer-window-show) (with-temp-buffer-window): New functions. (fit-window-to-buffer): Remove unused optional argument OVERRIDE. (special-display-popup-frame): Make sure the window used shows BUFFER. * help.el (temp-buffer-resize-mode): Fix doc-string. (resize-temp-buffer-window): New optional argument WINDOW. * files.el (recover-file, save-buffers-kill-emacs): * dired.el (dired-mark-pop-up): Use with-temp-buffer-window.
2012-09-03 08:54:25 +00:00
just the current file.
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
FUNCTION should not manipulate files, just read input (an
New macro with-temp-buffer-window and related fixes. * buffer.c (Fdelete_all_overlays): New function. * window.el (temp-buffer-window-setup-hook) (temp-buffer-window-show-hook): New hooks. (temp-buffer-window-setup, temp-buffer-window-show) (with-temp-buffer-window): New functions. (fit-window-to-buffer): Remove unused optional argument OVERRIDE. (special-display-popup-frame): Make sure the window used shows BUFFER. * help.el (temp-buffer-resize-mode): Fix doc-string. (resize-temp-buffer-window): New optional argument WINDOW. * files.el (recover-file, save-buffers-kill-emacs): * dired.el (dired-mark-pop-up): Use with-temp-buffer-window.
2012-09-03 08:54:25 +00:00
argument or confirmation)."
Doc dired-no-confirm and allow t value.
1997-03-20 12:37:06 +00:00
(if (or (eq dired-no-confirm t)
(memq op-symbol dired-no-confirm)
(dired-map-over-marks): New arg distinguish-one-marked. (dired-get-marked-files): New arg distinguish-one-marked. (dired-mark-pop-up): Handle FILES = (t FILE) specially.
2005-05-15 21:33:25 +00:00
;; If FILES defaulted to the current line's file.
*** empty log message ***
1992-06-24 02:13:56 +00:00
(= (length files) 1))
(apply function args)
* lisp/dired.el (dired-mark-pop-up): Let-bind display-buffer-mark-dedicated to `soft'. Fixes: debbugs:17554
2014-06-18 07:57:27 +00:00
(let ((buffer (get-buffer-create (or buffer-or-name " *Marked Files*")))
;; Mark *Marked Files* window as softly-dedicated, to prevent
;; other buffers e.g. *Completions* from reusing it (bug#17554).
(display-buffer-mark-dedicated 'soft))
* lisp/window.el (with-displayed-buffer-window): New macro. (with-temp-buffer-window, with-current-buffer-window): Use `macroexp-let2' to evaluate and bind variables in the same order as macro arguments. (display-buffer--action-function-custom-type): Add `display-buffer-below-selected' and `display-buffer-at-bottom'. * lisp/minibuffer.el (minibuffer-completion-help): Replace `with-output-to-temp-buffer' with `with-displayed-buffer-window' with actions that display *Completions* at-bottom when called from the minibuffer, or below-selected in a normal buffer. Associate `window-height' with `fit-window-to-buffer'. Let-bind `pop-up-windows' to nil. * lisp/dired.el (dired-mark-pop-up): Use `with-displayed-buffer-window' instead of `with-current-buffer-window'. Fixes: debbugs:17809
2014-07-08 08:02:50 +00:00
(with-displayed-buffer-window
buffer
(cons 'display-buffer-below-selected
Add code for "preserving" window sizes. * frame.c (frame_windows_min_size): New argument IGNORE. (adjust_frame_size): When called from change_frame_size call frame_windows_min_size with IGNORE Qt so we can ignore size restrictions. * dired.el (dired-pop-to-buffer): Call fit-window-to-buffer with `preserve-size' t. (dired-mark-pop-up): Preserve size of window showing marked files. * electric.el (Electric-pop-up-window): * help.el (resize-temp-buffer-window): Call fit-window-to-buffer with `preserve-size' t. * minibuffer.el (minibuffer-completion-help): Use `resize-temp-buffer-window' instead of `fit-window-to-buffer' (Bug#19355). Preserve size of completions window. * register.el (register-preview): Preserve size of register preview window. * tmm.el (tmm-add-prompt): Call fit-window-to-buffer with `preserve-size' t (Bug#1291). * window.el (with-displayed-buffer-window): Add calls to `window-preserve-size'. (window-min-pixel-size, window--preservable-size) (window-preserve-size, window-preserved-size) (window--preserve-size, window--min-size-ignore-p): New functions. (window-min-size, window-min-delta, window--resizable) (window--resize-this-window, split-window-below) (split-window-right): Amend doc-string. (adjust-window-trailing-edge): Handle preserving window sizes. Signal user-error instead of an error when there's no window above or below. (window--min-size-1, window-sizable, window--size-fixed-1) (window-size-fixed-p, window--min-delta-1) (frame-windows-min-size, window--max-delta-1, window-resize) (window--resize-child-windows, window--resize-siblings) (enlarge-window, shrink-window, split-window): Handle preserving window sizes. (window--state-put-2): Handle horizontal scroll bars. (window--display-buffer): Call `preserve-size' if asked for. (display-buffer): Mention `preserve-size' alist member in doc-string. (fit-window-to-buffer): New argument PRESERVE-SIZE.
2014-12-18 17:12:24 +00:00
'((window-height . fit-window-to-buffer)
(preserve-size . (nil . t))))
* lisp/window.el (with-displayed-buffer-window): New macro. (with-temp-buffer-window, with-current-buffer-window): Use `macroexp-let2' to evaluate and bind variables in the same order as macro arguments. (display-buffer--action-function-custom-type): Add `display-buffer-below-selected' and `display-buffer-at-bottom'. * lisp/minibuffer.el (minibuffer-completion-help): Replace `with-output-to-temp-buffer' with `with-displayed-buffer-window' with actions that display *Completions* at-bottom when called from the minibuffer, or below-selected in a normal buffer. Associate `window-height' with `fit-window-to-buffer'. Let-bind `pop-up-windows' to nil. * lisp/dired.el (dired-mark-pop-up): Use `with-displayed-buffer-window' instead of `with-current-buffer-window'. Fixes: debbugs:17809
2014-07-08 08:02:50 +00:00
#'(lambda (window _value)
(with-selected-window window
(unwind-protect
(apply function args)
(when (window-live-p window)
(quit-restore-window window 'kill)))))
;; Handle (t FILE) just like (FILE), here. That value is
;; used (only in some cases), to mean just one file that was
;; marked, rather than the current line file.
(with-current-buffer buffer
Remove no more needed bindings of split-height-threshold. * dired.el (dired-mark-pop-up): * register.el (register-preview): Don't bind split-height-threshold here since it's now done in display-buffer-below-selected.
2013-12-17 17:29:11 +00:00
(dired-format-columns-of-files
(if (eq (car files) t) (cdr files) files))
(remove-text-properties (point-min) (point-max)
'(mouse-face nil help-echo nil)))))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-format-columns-of-files (files)
(dired-format-columns-of-files): Use completion--insert-strings.
2008-05-02 17:39:02 +00:00
(let ((beg (point)))
(completion--insert-strings files)
(put-text-property beg (point) 'mouse-face nil)))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Commands to mark or flag file(s) at or near current line.
(defun dired-repeat-over-lines (arg function)
;; This version skips non-file lines.
(dired-repeat-over-lines): Going fwd, skip new lines that FUNCTION inserts after the current line. Going backwd, no need for dired-move-to-filename each time.
1993-06-15 07:59:07 +00:00
(let ((pos (make-marker)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(beginning-of-line)
(dired-repeat-over-lines): Going fwd, skip new lines that FUNCTION inserts after the current line. Going backwd, no need for dired-move-to-filename each time.
1993-06-15 07:59:07 +00:00
(while (and (> arg 0) (not (eobp)))
(setq arg (1- arg))
(beginning-of-line)
(while (and (not (eobp)) (dired-between-files)) (forward-line 1))
(save-excursion
(forward-line 1)
(move-marker pos (1+ (point))))
(save-excursion (funcall function))
;; Advance to the next line--actually, to the line that *was* next.
;; (If FUNCTION inserted some new lines in between, skip them.)
(goto-char pos))
(while (and (< arg 0) (not (bobp)))
(setq arg (1+ arg))
(forward-line -1)
(while (and (not (bobp)) (dired-between-files)) (forward-line -1))
(beginning-of-line)
(save-excursion (funcall function)))
(move-marker pos nil)
(dired-move-to-filename)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-between-files ()
Revision: miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-135 Make dired more robust for non-english locales. lisp/dired.el (dired-between-files): Always use dired-move-to-filename, which is more robust in non-english locales.
2003-12-24 23:18:55 +00:00
;; This used to be a regexp match of the `total ...' line output by
;; ls, which is slightly faster, but that is not very robust; notably,
;; it fails for non-english locales.
(save-excursion (not (dired-move-to-filename))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-next-marked-file (arg &optional wrap opoint)
Improve documentation of dired-next/prev-marked-file * lisp/dired.el (dired-next-marked-file, dired-prev-marked-file): Doc fixes. (Bug#29340)
2017-11-18 09:42:06 +00:00
"Move to the ARGth next marked file.
ARG is the numeric prefix argument and defaults to 1.
If WRAP is non-nil, which happens interactively, wrap around
to the beginning of the buffer and search from there, if no
marked file is found after this line.
Optional argument OPOINT specifies the buffer position to
return to if no ARGth marked file is found; it defaults to
the position where this command was invoked."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive "p\np")
(or opoint (setq opoint (point)));; return to where interactively started
(if (if (> arg 0)
(re-search-forward dired-re-mark nil t arg)
(beginning-of-line)
(re-search-backward dired-re-mark nil t (- arg)))
(dired-move-to-filename)
(if (null wrap)
(progn
(goto-char opoint)
(error "No next marked file"))
(message "(Wraparound for next marked file)")
(goto-char (if (> arg 0) (point-min) (point-max)))
(dired-next-marked-file arg nil opoint))))
(defun dired-prev-marked-file (arg &optional wrap)
Improve documentation of dired-next/prev-marked-file * lisp/dired.el (dired-next-marked-file, dired-prev-marked-file): Doc fixes. (Bug#29340)
2017-11-18 09:42:06 +00:00
"Move to the ARGth previous marked file.
ARG is the numeric prefix argument and defaults to 1.
If WRAP is non-nil, which happens interactively, wrap around
to the end of the buffer and search backwards from there, if
no ARGth marked file is found before this line."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive "p\np")
(dired-next-marked-file (- arg) wrap))
(defun dired-file-marker (file)
;; Return FILE's marker, or nil if unmarked.
(save-excursion
(and (dired-goto-file file)
(progn
(beginning-of-line)
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(if (not (equal ?\s (following-char)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(following-char))))))
(defun dired-mark-files-in-region (start end)
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(let ((inhibit-read-only t))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(if (> start end)
(error "start > end"))
(goto-char start) ; assumed at beginning of line
(while (< (point) end)
;; Skip subdir line and following garbage like the `total' line:
(while (and (< (point) end) (dired-between-files))
(forward-line 1))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(if (and (not (looking-at-p dired-re-dot))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-get-filename nil t))
(progn
(delete-char 1)
(insert dired-marker-char)))
(forward-line 1))))
* lisp/dired.el (dired-mark): Add optional arg `interactive'. Check for `use-region-p' if `interactive' is non-nil. (dired-unmark, dired-flag-file-deletion): Add optional arg `interactive'. Call `dired-mark' with the arg `interactive'. Fixes: debbugs:10624
2012-11-23 07:59:43 +00:00
(defun dired-mark (arg &optional interactive)
Document some Emacs 24.3 changes. * doc/emacs/dired.texi (Dired Deletion, Marks vs Flags): Document Emacs 24.3 changes to the mark and unmark commands. (Comparison in Dired): Document chages to dired-diff. Remove M-=, which is no longer bound to dired-backup-diff. * doc/emacs/mule.texi (Text Coding): set-buffer-file-coding-system can now be invoked from the mode line. * lisp/dired.el (dired-mark, dired-unmark, dired-flag-file-deletion): Doc fix.
2012-10-24 14:38:49 +00:00
"Mark the file at point in the Dired buffer.
If the region is active, mark all files in the region.
Otherwise, with a prefix arg, mark files on the next ARG lines.
*** empty log message ***
1992-06-24 02:13:56 +00:00
If on a subdir headerline, mark all its files except `.' and `..'.
Use \\[dired-unmark-all-files] to remove all marks
and \\[dired-unmark] on a subdir to remove the marks in
this subdir."
* lisp/dired.el (dired-mark): Add optional arg `interactive'. Check for `use-region-p' if `interactive' is non-nil. (dired-unmark, dired-flag-file-deletion): Add optional arg `interactive'. Call `dired-mark' with the arg `interactive'. Fixes: debbugs:10624
2012-11-23 07:59:43 +00:00
(interactive (list current-prefix-arg t))
* lisp/dired.el (dired-mark): If the region is active in Transient Mark mode, mark all files in the active region. Doc fix. (dired-unmark, dired-flag-file-deletion, dired-unmark-backward): Doc fix. Fixes: debbugs:10624
2012-09-18 23:18:06 +00:00
(cond
;; Mark files in the active region.
* lisp/dired.el (dired-mark): Add optional arg `interactive'. Check for `use-region-p' if `interactive' is non-nil. (dired-unmark, dired-flag-file-deletion): Add optional arg `interactive'. Call `dired-mark' with the arg `interactive'. Fixes: debbugs:10624
2012-11-23 07:59:43 +00:00
((and interactive (use-region-p))
* lisp/dired.el (dired-mark): If the region is active in Transient Mark mode, mark all files in the active region. Doc fix. (dired-unmark, dired-flag-file-deletion, dired-unmark-backward): Doc fix. Fixes: debbugs:10624
2012-09-18 23:18:06 +00:00
(save-excursion
(let ((beg (region-beginning))
(end (region-end)))
(dired-mark-files-in-region
(progn (goto-char beg) (line-beginning-position))
(progn (goto-char end) (line-beginning-position))))))
;; Mark subdir files from the subdir headerline.
((dired-get-subdir)
(save-excursion (dired-mark-subdir-files)))
;; Mark the current (or next ARG) files.
(t
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(let ((inhibit-read-only t))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-repeat-over-lines
*** empty log message ***
1992-07-21 22:40:10 +00:00
(prefix-numeric-value arg)
Don't quote lambda forms * lisp/dired.el (dired-re-maybe-mark, dired-map-over-marks) (dired-mark, dired-desktop-buffer-misc-data) * lisp/dired-aux.el (dired-do-create-files, dired-do-create-files-regexp) (dired-create-files-non-directory, dired-insert-subdir-validate) (dired-alist-sort, dired-do-shell-command): Don't quote lambda forms.
2017-06-26 05:22:27 +00:00
(lambda () (delete-char 1) (insert dired-marker-char)))))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
* lisp/dired.el (dired-mark): Add optional arg `interactive'. Check for `use-region-p' if `interactive' is non-nil. (dired-unmark, dired-flag-file-deletion): Add optional arg `interactive'. Call `dired-mark' with the arg `interactive'. Fixes: debbugs:10624
2012-11-23 07:59:43 +00:00
(defun dired-unmark (arg &optional interactive)
Document some Emacs 24.3 changes. * doc/emacs/dired.texi (Dired Deletion, Marks vs Flags): Document Emacs 24.3 changes to the mark and unmark commands. (Comparison in Dired): Document chages to dired-diff. Remove M-=, which is no longer bound to dired-backup-diff. * doc/emacs/mule.texi (Text Coding): set-buffer-file-coding-system can now be invoked from the mode line. * lisp/dired.el (dired-mark, dired-unmark, dired-flag-file-deletion): Doc fix.
2012-10-24 14:38:49 +00:00
"Unmark the file at point in the Dired buffer.
If the region is active, unmark all files in the region.
Otherwise, with a prefix arg, unmark files on the next ARG lines.
* lisp/dired.el (dired-mark): If the region is active in Transient Mark mode, mark all files in the active region. Doc fix. (dired-unmark, dired-flag-file-deletion, dired-unmark-backward): Doc fix. Fixes: debbugs:10624
2012-09-18 23:18:06 +00:00
If looking at a subdir, unmark all its files except `.' and `..'.
If the region is active in Transient Mark mode, unmark all files
in the active region."
* lisp/dired.el (dired-mark): Add optional arg `interactive'. Check for `use-region-p' if `interactive' is non-nil. (dired-unmark, dired-flag-file-deletion): Add optional arg `interactive'. Call `dired-mark' with the arg `interactive'. Fixes: debbugs:10624
2012-11-23 07:59:43 +00:00
(interactive (list current-prefix-arg t))
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(let ((dired-marker-char ?\s))
* lisp/dired.el (dired-mark): Add optional arg `interactive'. Check for `use-region-p' if `interactive' is non-nil. (dired-unmark, dired-flag-file-deletion): Add optional arg `interactive'. Call `dired-mark' with the arg `interactive'. Fixes: debbugs:10624
2012-11-23 07:59:43 +00:00
(dired-mark arg interactive)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
* lisp/dired.el (dired-mark): Add optional arg `interactive'. Check for `use-region-p' if `interactive' is non-nil. (dired-unmark, dired-flag-file-deletion): Add optional arg `interactive'. Call `dired-mark' with the arg `interactive'. Fixes: debbugs:10624
2012-11-23 07:59:43 +00:00
(defun dired-flag-file-deletion (arg &optional interactive)
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
"In Dired, flag the current line's file for deletion.
Document some Emacs 24.3 changes. * doc/emacs/dired.texi (Dired Deletion, Marks vs Flags): Document Emacs 24.3 changes to the mark and unmark commands. (Comparison in Dired): Document chages to dired-diff. Remove M-=, which is no longer bound to dired-backup-diff. * doc/emacs/mule.texi (Text Coding): set-buffer-file-coding-system can now be invoked from the mode line. * lisp/dired.el (dired-mark, dired-unmark, dired-flag-file-deletion): Doc fix.
2012-10-24 14:38:49 +00:00
If the region is active, flag all files in the region.
Otherwise, with a prefix arg, flag files on the next ARG lines.
* lisp/dired.el (dired-mark): If the region is active in Transient Mark mode, mark all files in the active region. Doc fix. (dired-unmark, dired-flag-file-deletion, dired-unmark-backward): Doc fix. Fixes: debbugs:10624
2012-09-18 23:18:06 +00:00
If on a subdir headerline, flag all its files except `.' and `..'.
If the region is active in Transient Mark mode, flag all files
in the active region."
* lisp/dired.el (dired-mark): Add optional arg `interactive'. Check for `use-region-p' if `interactive' is non-nil. (dired-unmark, dired-flag-file-deletion): Add optional arg `interactive'. Call `dired-mark' with the arg `interactive'. Fixes: debbugs:10624
2012-11-23 07:59:43 +00:00
(interactive (list current-prefix-arg t))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let ((dired-marker-char dired-del-marker))
* lisp/dired.el (dired-mark): Add optional arg `interactive'. Check for `use-region-p' if `interactive' is non-nil. (dired-unmark, dired-flag-file-deletion): Add optional arg `interactive'. Call `dired-mark' with the arg `interactive'. Fixes: debbugs:10624
2012-11-23 07:59:43 +00:00
(dired-mark arg interactive)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-unmark-backward (arg)
* dired.el (dired-mode): Clarify "unmark or unflag". (dired-unmark-backward): Ditto. (dired-flag-backup-files): Ditto. * dired-x.el (dired-mark-sexp): Ditto. Fixes: debbugs:8770
2011-07-06 17:10:36 +00:00
"In Dired, move up lines and remove marks or deletion flags there.
Optional prefix ARG says how many lines to unmark/unflag; default
* lisp/dired.el (dired-mark): If the region is active in Transient Mark mode, mark all files in the active region. Doc fix. (dired-unmark, dired-flag-file-deletion, dired-unmark-backward): Doc fix. Fixes: debbugs:10624
2012-09-18 23:18:06 +00:00
is one line.
If the region is active in Transient Mark mode, unmark all files
in the active region."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive "p")
dired-unmark-backward: Unmark the region when is active * lisp/dired.el (dired-unmark-backward): Call 'dired-unmark' with a non-nil second argument (Bug#24986).
2016-12-07 12:27:31 +00:00
(dired-unmark (- arg) t))
(dired-do-toggle): Moved here from dired-x.el. (dired-mode-map): Changed dired-do-toggle from "T" to "t".
1998-02-27 21:45:01 +00:00
(dired-toggle-marks): Renamed from dired-do-toggle. Bindings changed.
2002-03-28 18:32:59 +00:00
(defun dired-toggle-marks ()
"Toggle marks: marked files become unmarked, and vice versa.
(dired-do-toggle): Moved here from dired-x.el. (dired-mode-map): Changed dired-do-toggle from "T" to "t".
1998-02-27 21:45:01 +00:00
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))
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(let ((inhibit-read-only t))
(dired-do-toggle): Moved here from dired-x.el. (dired-mode-map): Changed dired-do-toggle from "T" to "t".
1998-02-27 21:45:01 +00:00
(while (not (eobp))
(or (dired-between-files)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(looking-at-p dired-re-dot)
(dired-do-toggle): Moved here from dired-x.el. (dired-mode-map): Changed dired-do-toggle from "T" to "t".
1998-02-27 21:45:01 +00:00
;; 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
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(apply #'subst-char-in-region
(dired-do-toggle): Moved here from dired-x.el. (dired-mode-map): Changed dired-do-toggle from "T" to "t".
1998-02-27 21:45:01 +00:00
(point) (1+ (point))
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(if (eq ?\s (following-char))
(list ?\s dired-marker-char)
(list dired-marker-char ?\s))))
(dired-do-toggle): Moved here from dired-x.el. (dired-mode-map): Changed dired-do-toggle from "T" to "t".
1998-02-27 21:45:01 +00:00
(forward-line 1)))))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;;; Commands to mark or flag files based on their characteristics or names.
(dired-regexp-history): New history list. (dired-read-regexp): Use that history list. Take just one arg.
1993-01-09 13:53:49 +00:00
(defvar dired-regexp-history nil
"History list of regular expressions used in Dired commands.")
* lisp/replace.el (query-replace-read-from): Use `read-regexp' instead of `read-from-minibuffer' when `regexp-flag' is non-nil. (occur-read-primary-args): Use `read-regexp' instead of `read-string'. (multi-occur-in-matching-buffers): Use `read-regexp' instead of `read-from-minibuffer'. * lisp/isearch.el (isearch-occur): Use `read-regexp' instead of `read-string'. * lisp/dired.el (dired-read-regexp): Use `read-regexp' instead of `read-from-minibuffer'. * lisp/progmodes/grep.el (grep-read-regexp): Use `read-regexp' instead of `read-string'. Fixes: debbugs:7567
2012-09-20 21:57:13 +00:00
(defun dired-read-regexp (prompt &optional default history)
Mention read-regexp in doc of functions that use it * lisp/dired.el (dired-read-regexp): * lisp/faces.el (list-faces-display): * lisp/misearch.el (multi-isearch-read-matching-buffers) (multi-isearch-read-matching-files): * lisp/play/cookie1.el (cookie-apropos): * lisp/progmodes/grep.el (grep-read-regexp): Doc fixes.
2014-02-14 06:59:24 +00:00
"Read a regexp using `read-regexp'."
Make dired-read-regexp obsolete It's not worth having such a trivial wrapper for read-regexp. * lisp/dired.el (dired-read-regexp): Make obsolete. (dired-mark-files-regexp, dired-mark-files-containing-regexp) (dired-flag-files-regexp): * lisp/dired-aux.el (dired-mark-read-regexp): * lisp/dired-x.el (dired-mark-unmarked-files): Use read-regexp directly.
2014-03-22 23:56:19 +00:00
(declare (obsolete read-regexp "24.5"))
* lisp/replace.el (query-replace-read-from): Use `read-regexp' instead of `read-from-minibuffer' when `regexp-flag' is non-nil. (occur-read-primary-args): Use `read-regexp' instead of `read-string'. (multi-occur-in-matching-buffers): Use `read-regexp' instead of `read-from-minibuffer'. * lisp/isearch.el (isearch-occur): Use `read-regexp' instead of `read-string'. * lisp/dired.el (dired-read-regexp): Use `read-regexp' instead of `read-from-minibuffer'. * lisp/progmodes/grep.el (grep-read-regexp): Use `read-regexp' instead of `read-string'. Fixes: debbugs:7567
2012-09-20 21:57:13 +00:00
(read-regexp prompt default (or history 'dired-regexp-history)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-mark-files-regexp (regexp &optional marker-char)
"Mark all files matching REGEXP for use in later commands.
A prefix argument means to unmark them instead.
`.' and `..' are never marked.
REGEXP is an Emacs regexp, not a shell wildcard. Thus, use `\\.o$' for
object files--just `.o' will mark more than you might think."
(interactive
Make dired-read-regexp obsolete It's not worth having such a trivial wrapper for read-regexp. * lisp/dired.el (dired-read-regexp): Make obsolete. (dired-mark-files-regexp, dired-mark-files-containing-regexp) (dired-flag-files-regexp): * lisp/dired-aux.el (dired-mark-read-regexp): * lisp/dired-x.el (dired-mark-unmarked-files): Use read-regexp directly.
2014-03-22 23:56:19 +00:00
(list (read-regexp (concat (if current-prefix-arg "Unmark" "Mark")
" files (regexp): ")
Add file name and its extension to suggestions in dired-mark-files-regexp * lisp/dired.el (dired-mark-files-regexp): Add file name and its extension to the list of suggested defaults. (Bug#25578)
2017-02-27 22:45:21 +00:00
;; Add more suggestions into the default list
(cons nil (list (dired-get-filename t t)
(and (dired-get-filename nil t)
(concat (regexp-quote
(file-name-extension
(dired-get-filename nil t) t))
"\\'"))))
'dired-regexp-history)
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(if current-prefix-arg ?\s)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let ((dired-marker-char (or marker-char dired-marker-char)))
(dired-mark-if
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(and (not (looking-at-p dired-re-dot))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(not (eolp)) ; empty line
* dired.el (dired-mark-files-regexp): Include any subdirectory components. Fixes: debbugs:10445
2012-01-27 21:40:44 +00:00
(let ((fn (dired-get-filename t t)))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(and fn (string-match-p regexp fn))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
"matching file")))
Add a new command to report the number and size of the marked files 2019-06-25 Constantino Calancha <f92capac@gmail.com> * lisp/dired.el (dired-mode-map): New keystroke and menu binding (bug#22829). 2019-06-25 Lars Ingebrigtsen <larsi@gnus.org> * doc/emacs/dired.texi (Marks vs Flags): Document it. * lisp/dired.el (dired-number-of-marked-files): New command.
2019-06-25 14:29:03 +00:00
(defun dired-number-of-marked-files ()
"Display the number and total size of the marked files."
(interactive)
(let* ((files (dired-get-marked-files nil nil nil t))
(nmarked
(cond ((null (cdr files))
0)
((and (= (length files) 2)
(eq (car files) t))
1)
(t
(length files))))
(size (cl-loop for file in files
when (stringp file)
sum (file-attribute-size (file-attributes file)))))
(if (zerop nmarked)
(message "No marked files"))
Clean up file-size-function It is now called `byte-count-to-string-function', and used instead of calling `file-size-human-readable' directly where appropriate. * lisp/files.el (file-size-human-readable-iec): New. (file-size-function): Rename to byte-count-to-string-function. Better default value. Eliminate lambda. Better default for custom choice. Put in group `files'. More descriptive doc string. Move. (out-of-memory-warning-percentage, warn-maybe-out-of-memory) (get-free-disk-space): * lisp/dired.el (dired-number-of-marked-files): * lisp/url/url-http.el (url-http-simple-after-change-function) (url-http-content-length-after-change-function): Use byte-count-to-string-function. * test/lisp/files-test.el (files-test-file-size-human-readable): Test file-size-human-readable-iec.
2019-07-22 15:10:37 +00:00
(message "%d marked file%s (%s total size)"
Add a new command to report the number and size of the marked files 2019-06-25 Constantino Calancha <f92capac@gmail.com> * lisp/dired.el (dired-mode-map): New keystroke and menu binding (bug#22829). 2019-06-25 Lars Ingebrigtsen <larsi@gnus.org> * doc/emacs/dired.texi (Marks vs Flags): Document it. * lisp/dired.el (dired-number-of-marked-files): New command.
2019-06-25 14:29:03 +00:00
nmarked
(if (= nmarked 1)
""
"s")
Clean up file-size-function It is now called `byte-count-to-string-function', and used instead of calling `file-size-human-readable' directly where appropriate. * lisp/files.el (file-size-human-readable-iec): New. (file-size-function): Rename to byte-count-to-string-function. Better default value. Eliminate lambda. Better default for custom choice. Put in group `files'. More descriptive doc string. Move. (out-of-memory-warning-percentage, warn-maybe-out-of-memory) (get-free-disk-space): * lisp/dired.el (dired-number-of-marked-files): * lisp/url/url-http.el (url-http-simple-after-change-function) (url-http-content-length-after-change-function): Use byte-count-to-string-function. * test/lisp/files-test.el (files-test-file-size-human-readable): Test file-size-human-readable-iec.
2019-07-22 15:10:37 +00:00
(funcall byte-count-to-string-function size))))
Add a new command to report the number and size of the marked files 2019-06-25 Constantino Calancha <f92capac@gmail.com> * lisp/dired.el (dired-mode-map): New keystroke and menu binding (bug#22829). 2019-06-25 Lars Ingebrigtsen <larsi@gnus.org> * doc/emacs/dired.texi (Marks vs Flags): Document it. * lisp/dired.el (dired-number-of-marked-files): New command.
2019-06-25 14:29:03 +00:00
(dired-mark-files-containing-regexp): New command. (dired-mode-map): Bind it to %g and in menu bar.
1998-05-24 00:55:39 +00:00
(defun dired-mark-files-containing-regexp (regexp &optional marker-char)
"Mark all files with contents containing REGEXP for use in later commands.
A prefix argument means to unmark them instead.
Clarify documentation of 'dired-mark-files-containing-regexp' * doc/emacs/dired.texi (Marks vs Flags): Clarify that for files visited in buffers, 'dired-mark-files-containing-regexp' searches the buffer rather than the file on disk. (Bug#22694) * lisp/dired.el (dired-mark-files-containing-regexp): Clarify that for files visited in buffers, 'dired-mark-files-containing-regexp' searches the buffer rather than the file on disk. (Bug#22694)
2016-04-20 14:52:25 +00:00
`.' and `..' are never marked.
Dired always read file system * dired.el (dired-always-read-filesystem): Add new option. (dired-mark-files-containing-regexp): Use it (Bug#22694). * doc/emacs/dired.texi: Mention it in the manual. * test/lisp/dired-tests.el (dired-test-bug22694): Add test. ;* etc/NEWS: Add entry for this change.
2016-07-11 05:34:49 +00:00
Note that if a file is visited in an Emacs buffer, and
`dired-always-read-filesystem' is nil, this command will
Clarify documentation of 'dired-mark-files-containing-regexp' * doc/emacs/dired.texi (Marks vs Flags): Clarify that for files visited in buffers, 'dired-mark-files-containing-regexp' searches the buffer rather than the file on disk. (Bug#22694) * lisp/dired.el (dired-mark-files-containing-regexp): Clarify that for files visited in buffers, 'dired-mark-files-containing-regexp' searches the buffer rather than the file on disk. (Bug#22694)
2016-04-20 14:52:25 +00:00
look in the buffer without revisiting the file, so the results might
be inconsistent with the file on disk if its contents has changed
since it was last visited."
(dired-mark-files-containing-regexp): New command. (dired-mode-map): Bind it to %g and in menu bar.
1998-05-24 00:55:39 +00:00
(interactive
Make dired-read-regexp obsolete It's not worth having such a trivial wrapper for read-regexp. * lisp/dired.el (dired-read-regexp): Make obsolete. (dired-mark-files-regexp, dired-mark-files-containing-regexp) (dired-flag-files-regexp): * lisp/dired-aux.el (dired-mark-read-regexp): * lisp/dired-x.el (dired-mark-unmarked-files): Use read-regexp directly.
2014-03-22 23:56:19 +00:00
(list (read-regexp (concat (if current-prefix-arg "Unmark" "Mark")
" files containing (regexp): ")
nil 'dired-regexp-history)
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(if current-prefix-arg ?\s)))
(dired-mark-files-containing-regexp): New command. (dired-mode-map): Bind it to %g and in menu bar.
1998-05-24 00:55:39 +00:00
(let ((dired-marker-char (or marker-char dired-marker-char)))
(dired-mark-if
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(and (not (looking-at-p dired-re-dot))
(dired-mark-files-containing-regexp): New command. (dired-mode-map): Bind it to %g and in menu bar.
1998-05-24 00:55:39 +00:00
(not (eolp)) ; empty line
(let ((fn (dired-get-filename nil t)))
(dired-mark-files-containing-regexp): Don't scan directories. Ignore non-readable files.
1998-09-10 16:00:20 +00:00
(when (and fn (file-readable-p fn)
(not (file-directory-p fn)))
(let ((prebuf (get-file-buffer fn)))
(message "Checking %s" fn)
;; For now we do it inside emacs
;; Grep might be better if there are a lot of files
Dired always read file system * dired.el (dired-always-read-filesystem): Add new option. (dired-mark-files-containing-regexp): Use it (Bug#22694). * doc/emacs/dired.texi: Mention it in the manual. * test/lisp/dired-tests.el (dired-test-bug22694): Add test. ;* etc/NEWS: Add entry for this change.
2016-07-11 05:34:49 +00:00
(if (and prebuf (not dired-always-read-filesystem))
(dired-mark-files-containing-regexp): Don't scan directories. Ignore non-readable files.
1998-09-10 16:00:20 +00:00
(with-current-buffer prebuf
(save-excursion
(goto-char (point-min))
(re-search-forward regexp nil t)))
(with-temp-buffer
(insert-file-contents fn)
(goto-char (point-min))
(re-search-forward regexp nil t))))
(dired-mark-files-containing-regexp): Don't use find-file; instead, insert the file in a temp buffer.
1998-09-04 20:43:09 +00:00
)))
(dired-mark-files-containing-regexp): New command. (dired-mode-map): Bind it to %g and in menu bar.
1998-05-24 00:55:39 +00:00
"matching file")))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-flag-files-regexp (regexp)
Many trivial doc fixes. (dired-get-file-for-visit): New function. (dired-find-alternate-file, dired-mouse-find-file-other-window): (dired-view-file, dired-find-file-other-window, dired-display-file): (dired-find-file): Use dired-get-file-for-visit.
2001-11-12 17:05:13 +00:00
"In Dired, flag all files containing the specified REGEXP for deletion.
*** empty log message ***
1992-06-24 02:13:56 +00:00
The match is against the non-directory part of the filename. Use `^'
and `$' to anchor matches. Exclude subdirs by hiding them.
`.' and `..' are never flagged."
Make dired-read-regexp obsolete It's not worth having such a trivial wrapper for read-regexp. * lisp/dired.el (dired-read-regexp): Make obsolete. (dired-mark-files-regexp, dired-mark-files-containing-regexp) (dired-flag-files-regexp): * lisp/dired-aux.el (dired-mark-read-regexp): * lisp/dired-x.el (dired-mark-unmarked-files): Use read-regexp directly.
2014-03-22 23:56:19 +00:00
(interactive (list (read-regexp "Flag for deletion (regexp): "
nil 'dired-regexp-history)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-mark-files-regexp regexp dired-del-marker))
(defun dired-mark-symlinks (unflag-p)
"Mark all symbolic links.
* dired.el (dired-mode): Clarify "unmark or unflag". (dired-unmark-backward): Ditto. (dired-flag-backup-files): Ditto. * dired-x.el (dired-mark-sexp): Ditto. Fixes: debbugs:8770
2011-07-06 17:10:36 +00:00
With prefix argument, unmark or unflag all those files."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive "P")
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(let ((dired-marker-char (if unflag-p ?\s dired-marker-char)))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(dired-mark-if (looking-at-p dired-re-sym) "symbolic link")))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-mark-directories (unflag-p)
"Mark all directory file lines except `.' and `..'.
* dired.el (dired-mode): Clarify "unmark or unflag". (dired-unmark-backward): Ditto. (dired-flag-backup-files): Ditto. * dired-x.el (dired-mark-sexp): Ditto. Fixes: debbugs:8770
2011-07-06 17:10:36 +00:00
With prefix argument, unmark or unflag all those files."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive "P")
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(let ((dired-marker-char (if unflag-p ?\s dired-marker-char)))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(dired-mark-if (and (looking-at-p dired-re-dir)
(not (looking-at-p dired-re-dot)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
"directory file")))
(defun dired-mark-executables (unflag-p)
"Mark all executable files.
* dired.el (dired-mode): Clarify "unmark or unflag". (dired-unmark-backward): Ditto. (dired-flag-backup-files): Ditto. * dired-x.el (dired-mark-sexp): Ditto. Fixes: debbugs:8770
2011-07-06 17:10:36 +00:00
With prefix argument, unmark or unflag all those files."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive "P")
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(let ((dired-marker-char (if unflag-p ?\s dired-marker-char)))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(dired-mark-if (looking-at-p dired-re-exe) "executable file")))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; dired-x.el has a dired-mark-sexp interactive command: mark
;; files for which PREDICATE returns non-nil.
(defun dired-flag-auto-save-files (&optional unflag-p)
Initial revision
1992-05-30 23:52:26 +00:00
"Flag for deletion files whose names suggest they are auto save files.
* dired.el (dired-mode): Clarify "unmark or unflag". (dired-unmark-backward): Ditto. (dired-flag-backup-files): Ditto. * dired-x.el (dired-mark-sexp): Ditto. Fixes: debbugs:8770
2011-07-06 17:10:36 +00:00
A prefix argument says to unmark or unflag those files instead."
Initial revision
1992-05-30 23:52:26 +00:00
(interactive "P")
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(let ((dired-marker-char (if unflag-p ?\s dired-del-marker)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-mark-if
Comment change.
1993-06-11 05:56:00 +00:00
;; It is less than general to check for # here,
(dired-flag-backup-files): Speedup: check explicitly for ~ at end of line. (dired-flag-auto-save-files): Similar change.
1993-05-24 23:03:04 +00:00
;; but it's the only way this runs fast enough.
(and (save-excursion (end-of-line)
(dired-flag-auto-save-files): Ignore `*' added by ls -F.
1993-06-08 22:54:46 +00:00
(or
(eq (preceding-char) ?#)
;; Handle executables in case of -F option.
;; We need not worry about the other kinds
;; of markings that -F makes, since they won't
;; appear on real auto-save files.
(if (eq (preceding-char) ?*)
(progn
(forward-char -1)
(eq (preceding-char) ?#)))))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(not (looking-at-p dired-re-dir))
(dired-flag-backup-files): Speedup: check explicitly for ~ at end of line. (dired-flag-auto-save-files): Similar change.
1993-05-24 23:03:04 +00:00
(let ((fn (dired-get-filename t t)))
(if fn (auto-save-file-name-p
(file-name-nondirectory fn)))))
"auto save file")))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
(defcustom dired-garbage-files-regexp
Fix comments.
2004-03-25 10:40:59 +00:00
;; `log' here is dubious, since it's typically used for useful log
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
;; files, not just TeX stuff. -- fx
(dired-garbage-files-regexp): Use \\' instead of $ and use regexp-opt for readability.
2003-01-10 16:42:27 +00:00
(concat (regexp-opt
'(".log" ".toc" ".dvi" ".bak" ".orig" ".rej" ".aux"))
Cygwin support patch.
2003-01-31 15:24:20 +00:00
"\\'")
(dired) <defgroup>: Add link to manual. (dired-font-lock-keywords): Ad highlighting on unusual permissions. (dired-revert): Use dolist. (dired-mode-map): Add U binding. (dired-mode): Add font-lock-beginning-of-syntax-function. (dired-garbage-files-regexp): Make it a defcustom.
2004-03-23 21:44:31 +00:00
"Regular expression to match \"garbage\" files for `dired-flag-garbage-files'."
:type 'regexp
:group 'dired)
(dired-garbage-files-regexp): New variable. (dired-flag-garbage-files): New command. (dired-mode-map): Put dired-flag-garbage-files on & and in menu.
1997-01-04 00:10:30 +00:00
(defun dired-flag-garbage-files ()
"Flag for deletion all files that match `dired-garbage-files-regexp'."
(dired-flag-garbage-files): Move interactive flag across doc string.
1997-09-06 22:22:24 +00:00
(interactive)
(dired-garbage-files-regexp): New variable. (dired-flag-garbage-files): New command. (dired-mode-map): Put dired-flag-garbage-files on & and in menu.
1997-01-04 00:10:30 +00:00
(dired-flag-files-regexp dired-garbage-files-regexp))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-flag-backup-files (&optional unflag-p)
"Flag all backup files (names ending with `~') for deletion.
* dired.el (dired-mode): Clarify "unmark or unflag". (dired-unmark-backward): Ditto. (dired-flag-backup-files): Ditto. * dired-x.el (dired-mark-sexp): Ditto. Fixes: debbugs:8770
2011-07-06 17:10:36 +00:00
With prefix argument, unmark or unflag these files."
*** empty log message ***
1992-06-24 02:13:56 +00:00
(interactive "P")
(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.
2005-07-20 14:08:39 +00:00
(let ((dired-marker-char (if unflag-p ?\s dired-del-marker)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-mark-if
(dired-flag-backup-files): Under MS-DOS, search for possible backup files by checking for filenames which end with a `k' (the backup extension is `.bak').
1995-12-13 19:42:33 +00:00
;; 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,
(dired-flag-backup-files): Speedup: check explicitly for ~ at end of line. (dired-flag-auto-save-files): Similar change.
1993-05-24 23:03:04 +00:00
;; but it's the only way this runs fast enough.
(and (save-excursion (end-of-line)
(dired-flag-backup-files): Under MS-DOS, search for possible backup files by checking for filenames which end with a `k' (the backup extension is `.bak').
1995-12-13 19:42:33 +00:00
;; Handle executables in case of -F option.
;; We need not worry about the other kinds
;; of markings that -F makes, since they won't
;; appear on real backup files.
(if (eq (preceding-char) ?*)
(forward-char -1))
(dired-flag-backup-files): Undo previous change.
1995-12-19 21:39:23 +00:00
(eq (preceding-char) ?~))
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(not (looking-at-p dired-re-dir))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let ((fn (dired-get-filename t t)))
(if fn (backup-file-name-p fn))))
"backup file")))
*** empty log message ***
1992-08-03 03:44:51 +00:00
(defun dired-change-marks (&optional old new)
"Change all OLD marks to NEW marks.
OLD and NEW are both characters used to mark files."
(interactive
(let* ((cursor-in-echo-area t)
(old (progn (message "Change (old mark): ") (read-char)))
(new (progn (message "Change %c marks to (new mark): " old)
(read-char))))
(list old new)))
(dired-change-marks): Just ding if one arg is RET. Search for strings, not regexps. Use subst-char-in-region.
1993-06-04 07:25:58 +00:00
(if (or (eq old ?\r) (eq new ?\r))
(ding)
(let ((string (format "\n%c" old))
(dired-read-dir-and-switches): Ignore ., .., and completion-ignored-extension directories if there's something else. (dired-mark-if, dired-map-over-marks, dired-readin, dired-revert) (dired-remember-marks, dired-undo, dired-build-subdir-alist) (dired-internal-do-deletions, dired-mark-files-in-region, dired-mark) (dired-toggle-marks, dired-change-marks, dired-unmark-all-files): buffer-read-only -> inhibit-read-only.
2008-05-13 05:15:57 +00:00
(inhibit-read-only t))
(dired-change-marks): Just ding if one arg is RET. Search for strings, not regexps. Use subst-char-in-region.
1993-06-04 07:25:58 +00:00
(save-excursion
(goto-char (point-min))
(while (search-forward string nil t)
(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.
2005-07-20 14:08:39 +00:00
(if (if (= old ?\s)
(dired-change-marks): If OLD is a space, don't act on non-file lines.
1995-06-14 11:46:56 +00:00
(save-match-data
(dired-get-filename 'no-dir t))
t)
(subst-char-in-region (match-beginning 0)
(match-end 0) old new)))))))
*** empty log message ***
1992-08-03 03:44:51 +00:00
(dired-unmark-all-marks): Renamed from dired-unmark-all-files-no-query.
1997-06-07 19:31:24 +00:00
(defun dired-unmark-all-marks ()
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Remove all marks from all files in the Dired buffer."
(dired-unmark-all-files-no-query): New command. (dired-mode-map): Use that for the Unmark All item. Fix typo that made the Flag Backup Files item not show up.
1993-07-20 01:11:28 +00:00
(interactive)
(dired-unmark-all-files ?\r))
* lisp/dired.el (dired-unmark-all-files-query): Declare. (dired-unmark-all-files): Let-bind it and use instead of ‘query’. (Bug#21746)
2015-10-30 00:57:38 +00:00
;; Bound in dired-unmark-all-files
(defvar dired-unmark-all-files-query)
(dired-unmark-all-files): Read arg as a string.
1993-05-25 22:59:26 +00:00
(defun dired-unmark-all-files (mark &optional arg)
(dired-unmark-all-files): Read arg as just a character. Use non-regexp search to find a specific mark. Use subst-char-in-region to make the change. Improve the message at the end.
1993-06-06 21:13:16 +00:00
"Remove a specific mark (or any mark) from every file.
Cygwin support patch.
2003-01-31 15:24:20 +00:00
After this command, type the mark character to remove,
(dired-unmark-all-files): Read arg as just a character. Use non-regexp search to find a specific mark. Use subst-char-in-region to make the change. Improve the message at the end.
1993-06-06 21:13:16 +00:00
or type RET to remove all marks.
(dired-unmark-all-files): Read the arg as just a char.
1993-04-05 06:23:05 +00:00
With prefix arg, query for each marked file.
*** empty log message ***
1992-06-24 02:13:56 +00:00
Type \\[help-command] at that time for help."
(dired-unmark-all-files): Read arg as just a character. Use non-regexp search to find a specific mark. Use subst-char-in-region to make the change. Improve the message at the end.
1993-06-06 21:13:16 +00:00
(interactive "cRemove marks (RET means all): \nP")
(save-excursion
(let* ((count 0)
* doc/lispref/variables.texi (Scope): Mention the availability of lexbind. (Lexical Binding): New node. * doc/lispref/eval.texi (Eval): Add `eval's new `lexical' arg. * lisp/emacs-lisp/cconv.el (cconv-liftwhen): Increase threshold. (cconv-closure-convert-rec): Convert interactive spec in empty lexenv. (cconv-analyse-use): Improve unused vars warnings. (cconv-analyse-form): Analyze interactive spec in empty lexenv. * lisp/emacs-lisp/bytecomp.el (byte-compile-lambda): Always byte-compile the interactive spec in lexical-binding mode. (byte-compile-refresh-preloaded): Don't reload byte-compiler files. * lisp/custom.el (custom-initialize-default): Use defvar. (custom-declare-variable): Set the special-variable-p flag. * lisp/help-fns.el (help-make-usage): Drop leading underscores. * lisp/dired.el (dired-revert, dired-make-relative): Mark unused args. (dired-unmark-all-files): Remove unused var `query'. (dired-overwrite-confirmed): Declare. (dired-restore-desktop-buffer): Don't use dynamically scoped arg names. * lisp/mpc.el: Mark unused args. (mpc--faster-toggle): Remove unused var `songnb'. * lisp/server.el (server-kill-buffer-running): Move before first use. * lisp/minibuffer.el: Mark unused args. * src/callint.c (quotify_arg): Simplify the logic. (Fcall_interactively): Use lexical binding when evaluating the interactive spec of a lexically bound function.
2011-03-01 05:03:24 +00:00
(inhibit-read-only t) case-fold-search
* lisp/dired.el (dired-unmark-all-files-query): Declare. (dired-unmark-all-files): Let-bind it and use instead of ‘query’. (Bug#21746)
2015-10-30 00:57:38 +00:00
dired-unmark-all-files-query
(dired-unmark-all-files): Read arg as just a character. Use non-regexp search to find a specific mark. Use subst-char-in-region to make the change. Improve the message at the end.
1993-06-06 21:13:16 +00:00
(string (format "\n%c" mark))
(help-form "\
(dired-unmark-all-files): Read arg as a string.
1993-05-25 22:59:26 +00:00
Type SPC or `y' to unmark one file, DEL or `n' to skip to next,
`!' to unmark all remaining files with no more questions."))
(dired-unmark-all-files): Read arg as just a character. Use non-regexp search to find a specific mark. Use subst-char-in-region to make the change. Improve the message at the end.
1993-06-06 21:13:16 +00:00
(goto-char (point-min))
(while (if (eq mark ?\r)
(re-search-forward dired-re-mark nil t)
(search-forward string nil t))
(if (or (not arg)
(dired-get-filename): Err for . and .. in usual case. (dired-get-file-for-visit): Specify no-error to dired-get-filename, and check for real errors here. (dired-unmark-all-files): Specify no-error to dired-get-filename.
2003-06-04 09:02:55 +00:00
(let ((file (dired-get-filename t t)))
(and file
* lisp/dired.el (dired-unmark-all-files-query): Declare. (dired-unmark-all-files): Let-bind it and use instead of ‘query’. (Bug#21746)
2015-10-30 00:57:38 +00:00
(dired-query 'dired-unmark-all-files-query
"Unmark file `%s'? "
(dired-get-filename): Err for . and .. in usual case. (dired-get-file-for-visit): Specify no-error to dired-get-filename, and check for real errors here. (dired-unmark-all-files): Specify no-error to dired-get-filename.
2003-06-04 09:02:55 +00:00
file))))
(dired-unmark-all-files): Read arg as just a character. Use non-regexp search to find a specific mark. Use subst-char-in-region to make the change. Improve the message at the end.
1993-06-06 21:13:16 +00:00
(progn (subst-char-in-region (1- (point)) (point)
(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.
2005-07-20 14:08:39 +00:00
(preceding-char) ?\s)
(dired-unmark-all-files): Read arg as just a character. Use non-regexp search to find a specific mark. Use subst-char-in-region to make the change. Improve the message at the end.
1993-06-06 21:13:16 +00:00
(setq count (1+ count)))))
(message (if (= count 1) "1 mark removed"
"%d marks removed")
count))))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Logging failures operating on files, and showing the results.
Initial revision
1992-05-30 23:52:26 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defvar dired-log-buffer "*Dired log*")
Initial revision
1992-05-30 23:52:26 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-why ()
"Pop up a buffer with error log output from Dired.
A group of errors from a single command ends with a formfeed.
Thus, use \\[backward-page] to find the beginning of a group of errors."
(interactive)
(if (get-buffer dired-log-buffer)
(let ((owindow (selected-window))
(window (display-buffer (get-buffer dired-log-buffer))))
(unwind-protect
*** empty log message ***
1992-08-03 03:44:51 +00:00
(progn
*** empty log message ***
1992-06-24 02:13:56 +00:00
(select-window window)
(goto-char (point-max))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(forward-line -1)
(backward-page 1)
(recenter 0))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(select-window owindow)))))
(defun dired-log (log &rest args)
;; Log a message or the contents of a buffer.
;; If LOG is a string and there are more args, it is formatted with
;; those ARGS. Usually the LOG string ends with a \n.
Cygwin support patch.
2003-01-31 15:24:20 +00:00
;; End each bunch of errors with (dired-log t):
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
;; this inserts the current time and buffer at the start of the page,
;; and \f (formfeed) at the end.
*** empty log message ***
1992-06-24 02:13:56 +00:00
(let ((obuf (current-buffer)))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(with-current-buffer (get-buffer-create dired-log-buffer)
(goto-char (point-max))
(let ((inhibit-read-only t))
(cond ((stringp log)
(insert (if args
Top-level elisp files respect ‘text-quoting-style’ In top-level elisp files, use format-message in diagnostic formats, so that they follow user preference as per ‘text-quoting-style’ rather than being hard-coded to quote `like this'. * lisp/allout.el (allout-get-configvar-values): * lisp/apropos.el (apropos-symbols-internal): * lisp/dired-aux.el (dired-do-shell-command, dired-create-files) (dired-do-create-files-regexp, dired-create-files-non-directory): * lisp/dired-x.el (dired-do-run-mail): * lisp/dired.el (dired-log, dired-dnd-handle-local-file): * lisp/disp-table.el (standard-display-european): * lisp/find-dired.el (find-dired): * lisp/forms.el (forms-mode): * lisp/ido.el (ido-buffer-internal): * lisp/info.el (Info-index-next): * lisp/outline.el (outline-invent-heading): * lisp/printing.el (pr-ps-outfile-preprint, pr-i-ps-send): * lisp/proced.el (proced-log): * lisp/ps-print.el (ps-print-preprint, ps-get-size): * lisp/recentf.el (recentf-open-files, recentf-save-list): * lisp/savehist.el (savehist-save): * lisp/server.el (server-ensure-safe-dir): * lisp/ses.el (ses-rename-cell): * lisp/simple.el (list-processes--refresh): * lisp/startup.el (command-line): * lisp/strokes.el (strokes-unset-last-stroke) (strokes-execute-stroke): Use format-message so that quotes are restyled. * lisp/cus-edit.el (custom-raised-buttons, customize-browse): Don’t quote ‘raised’. * lisp/descr-text.el (describe-char): * lisp/dirtrack.el (dirtrack-debug-message): * lisp/hexl.el (hexl-insert-multibyte-char): Apply substitute-command-keys to help string. * lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes) (wdired-do-perm-changes): Let dired-log do the formatting.
2015-08-26 08:30:29 +00:00
(apply #'format-message log args)
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
log)))
((bufferp log)
(dired-log): Use `insert-buffer-substring', not `insert-buffer'.
2005-07-18 10:24:58 +00:00
(insert-buffer-substring log))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
((eq t log)
(backward-page 1)
(unless (bolp)
(insert "\n"))
(insert (current-time-string)
Go back to grave quoting in source-code docstrings etc. This reverts almost all my recent changes to use curved quotes in docstrings and/or strings used for error diagnostics. There are a few exceptions, e.g., Bahá’í proper names. * admin/unidata/unidata-gen.el (unidata-gen-table): * lisp/abbrev.el (expand-region-abbrevs): * lisp/align.el (align-region): * lisp/allout.el (allout-mode, allout-solicit-alternate-bullet) (outlineify-sticky): * lisp/apropos.el (apropos-library): * lisp/bookmark.el (bookmark-default-annotation-text): * lisp/button.el (button-category-symbol, button-put) (make-text-button): * lisp/calc/calc-aent.el (math-read-if, math-read-factor): * lisp/calc/calc-embed.el (calc-do-embedded): * lisp/calc/calc-ext.el (calc-user-function-list): * lisp/calc/calc-graph.el (calc-graph-show-dumb): * lisp/calc/calc-help.el (calc-describe-key) (calc-describe-thing, calc-full-help): * lisp/calc/calc-lang.el (calc-c-language) (math-parse-fortran-vector-end, math-parse-tex-sum) (math-parse-eqn-matrix, math-parse-eqn-prime) (calc-yacas-language, calc-maxima-language, calc-giac-language) (math-read-giac-subscr, math-read-math-subscr) (math-read-big-rec, math-read-big-balance): * lisp/calc/calc-misc.el (calc-help, report-calc-bug): * lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes) (calc-auto-recompute): * lisp/calc/calc-prog.el (calc-fix-token-name) (calc-read-parse-table-part, calc-user-define-invocation) (math-do-arg-check): * lisp/calc/calc-store.el (calc-edit-variable): * lisp/calc/calc-units.el (math-build-units-table-buffer): * lisp/calc/calc-vec.el (math-read-brackets): * lisp/calc/calc-yank.el (calc-edit-mode): * lisp/calc/calc.el (calc, calc-do, calc-user-invocation): * lisp/calendar/appt.el (appt-display-message): * lisp/calendar/diary-lib.el (diary-check-diary-file) (diary-mail-entries, diary-from-outlook): * lisp/calendar/icalendar.el (icalendar-export-region) (icalendar--convert-float-to-ical) (icalendar--convert-date-to-ical) (icalendar--convert-ical-to-diary) (icalendar--convert-recurring-to-diary) (icalendar--add-diary-entry): * lisp/calendar/time-date.el (format-seconds): * lisp/calendar/timeclock.el (timeclock-mode-line-display) (timeclock-make-hours-explicit, timeclock-log-data): * lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category) (todo-item-mark, todo-check-format) (todo-insert-item--next-param, todo-edit-item--next-key) (todo-mode): * lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules): * lisp/cedet/mode-local.el (describe-mode-local-overload) (mode-local-print-binding, mode-local-describe-bindings-2): * lisp/cedet/semantic/complete.el (semantic-displayor-show-request): * lisp/cedet/srecode/srt-mode.el (srecode-macro-help): * lisp/cus-start.el (standard): * lisp/cus-theme.el (describe-theme-1): * lisp/custom.el (custom-add-dependencies, custom-check-theme) (custom--sort-vars-1, load-theme): * lisp/descr-text.el (describe-text-properties-1, describe-char): * lisp/dired-x.el (dired-do-run-mail): * lisp/dired.el (dired-log): * lisp/emacs-lisp/advice.el (ad-read-advised-function) (ad-read-advice-class, ad-read-advice-name, ad-enable-advice) (ad-disable-advice, ad-remove-advice, ad-set-argument) (ad-set-arguments, ad--defalias-fset, ad-activate) (ad-deactivate): * lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand) (byte-compile-unfold-lambda, byte-optimize-form-code-walker) (byte-optimize-while, byte-optimize-apply): * lisp/emacs-lisp/byte-run.el (defun, defsubst): * lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode) (byte-compile-log-file, byte-compile-format-warn) (byte-compile-nogroup-warn, byte-compile-arglist-warn) (byte-compile-cl-warn) (byte-compile-warn-about-unresolved-functions) (byte-compile-file, byte-compile--declare-var) (byte-compile-file-form-defmumble, byte-compile-form) (byte-compile-normal-call, byte-compile-check-variable) (byte-compile-variable-ref, byte-compile-variable-set) (byte-compile-subr-wrong-args, byte-compile-setq-default) (byte-compile-negation-optimizer) (byte-compile-condition-case--old) (byte-compile-condition-case--new, byte-compile-save-excursion) (byte-compile-defvar, byte-compile-autoload) (byte-compile-lambda-form) (byte-compile-make-variable-buffer-local, display-call-tree) (batch-byte-compile): * lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use): * lisp/emacs-lisp/chart.el (chart-space-usage): * lisp/emacs-lisp/check-declare.el (check-declare-scan) (check-declare-warn, check-declare-file) (check-declare-directory): * lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine) (checkdoc-message-text-engine): * lisp/emacs-lisp/cl-extra.el (cl-parse-integer) (cl--describe-class): * lisp/emacs-lisp/cl-generic.el (cl-defgeneric) (cl--generic-describe, cl-generic-generalizers): * lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody) (cl-symbol-macrolet): * lisp/emacs-lisp/cl.el (cl-unload-function, flet): * lisp/emacs-lisp/copyright.el (copyright) (copyright-update-directory): * lisp/emacs-lisp/edebug.el (edebug-read-list): * lisp/emacs-lisp/eieio-base.el (eieio-persistent-read): * lisp/emacs-lisp/eieio-core.el (eieio--slot-override) (eieio-oref): * lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor): * lisp/emacs-lisp/eieio-speedbar.el: (eieio-speedbar-child-make-tag-lines) (eieio-speedbar-child-description): * lisp/emacs-lisp/eieio.el (defclass, change-class): * lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms) (elint-init-form, elint-check-defalias-form) (elint-check-let-form): * lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu) (ert-results-pop-to-backtrace-for-test-at-point) (ert-results-pop-to-messages-for-test-at-point) (ert-results-pop-to-should-forms-for-test-at-point) (ert-describe-test): * lisp/emacs-lisp/find-func.el (find-function-search-for-symbol) (find-function-library): * lisp/emacs-lisp/generator.el (iter-yield): * lisp/emacs-lisp/gv.el (gv-define-simple-setter): * lisp/emacs-lisp/lisp-mnt.el (lm-verify): * lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning): * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): * lisp/emacs-lisp/nadvice.el (advice--make-docstring) (advice--make, define-advice): * lisp/emacs-lisp/package-x.el (package-upload-file): * lisp/emacs-lisp/package.el (package-version-join) (package-disabled-p, package-activate-1, package-activate) (package--download-one-archive) (package--download-and-read-archives) (package-compute-transaction, package-install-from-archive) (package-install, package-install-selected-packages) (package-delete, package-autoremove, describe-package-1) (package-install-button-action, package-delete-button-action) (package-menu-hide-package, package-menu--list-to-prompt) (package-menu--perform-transaction) (package-menu--find-and-notify-upgrades): * lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1): * lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode): * lisp/emacs-lisp/ring.el (ring-previous, ring-next): * lisp/emacs-lisp/rx.el (rx-check, rx-anything) (rx-check-any-string, rx-check-any, rx-check-not, rx-=) (rx-repeat, rx-check-backref, rx-syntax, rx-check-category) (rx-form): * lisp/emacs-lisp/smie.el (smie-config-save): * lisp/emacs-lisp/subr-x.el (internal--check-binding): * lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag): * lisp/emacs-lisp/testcover.el (testcover-1value): * lisp/emacs-lisp/timer.el (timer-event-handler): * lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments) (viper-toggle-search-style, viper-kill-buffer) (viper-brac-function): * lisp/emulation/viper-macs.el (viper-record-kbd-macro): * lisp/env.el (setenv): * lisp/erc/erc-button.el (erc-nick-popup): * lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english): * lisp/eshell/em-dirs.el (eshell/cd): * lisp/eshell/em-glob.el (eshell-glob-regexp) (eshell-glob-entries): * lisp/eshell/em-pred.el (eshell-parse-modifiers): * lisp/eshell/esh-opt.el (eshell-show-usage): * lisp/facemenu.el (facemenu-add-new-face) (facemenu-add-new-color): * lisp/faces.el (read-face-name, read-face-font, describe-face) (x-resolve-font-name): * lisp/files-x.el (modify-file-local-variable): * lisp/files.el (locate-user-emacs-file, find-alternate-file) (set-auto-mode, hack-one-local-variable--obsolete) (dir-locals-set-directory-class, write-file, basic-save-buffer) (delete-directory, copy-directory, recover-session) (recover-session-finish, insert-directory) (file-modes-char-to-who, file-modes-symbolic-to-number) (move-file-to-trash): * lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer): * lisp/find-cmd.el (find-generic, find-to-string): * lisp/finder.el (finder-commentary): * lisp/font-lock.el (font-lock-fontify-buffer): * lisp/format.el (format-write-file, format-find-file) (format-insert-file): * lisp/frame.el (get-device-terminal, select-frame-by-name): * lisp/fringe.el (fringe--check-style): * lisp/gnus/nnmairix.el (nnmairix-widget-create-query): * lisp/help-fns.el (help-fns--key-bindings) (help-fns--compiler-macro, help-fns--parent-mode) (help-fns--obsolete, help-fns--interactive-only) (describe-function-1, describe-variable): * lisp/help.el (describe-mode) (describe-minor-mode-from-indicator): * lisp/image.el (image-type): * lisp/international/ccl.el (ccl-dump): * lisp/international/fontset.el (x-must-resolve-font-name): * lisp/international/mule-cmds.el (prefer-coding-system) (select-safe-coding-system-interactively) (select-safe-coding-system, activate-input-method) (toggle-input-method, describe-current-input-method) (describe-language-environment): * lisp/international/mule-conf.el (code-offset): * lisp/international/mule-diag.el (describe-character-set) (list-input-methods-1): * lisp/mail/feedmail.el (feedmail-run-the-queue): * lisp/mouse.el (minor-mode-menu-from-indicator): * lisp/mpc.el (mpc-playlist-rename): * lisp/msb.el (msb--choose-menu): * lisp/net/ange-ftp.el (ange-ftp-shell-command): * lisp/net/imap.el (imap-interactive-login): * lisp/net/mairix.el (mairix-widget-create-query): * lisp/net/newst-backend.el (newsticker--sentinel-work): * lisp/net/newst-treeview.el (newsticker--treeview-load): * lisp/net/rlogin.el (rlogin): * lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer): * lisp/obsolete/otodo-mode.el (todo-more-important-p): * lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region): * lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region): * lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region): * lisp/org/ob-core.el (org-babel-goto-named-src-block) (org-babel-goto-named-result): * lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap): * lisp/org/ob-ref.el (org-babel-ref-resolve): * lisp/org/org-agenda.el (org-agenda-prepare): * lisp/org/org-clock.el (org-clock-notify-once-if-expired) (org-clock-resolve): * lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag): * lisp/org/org-feed.el (org-feed-parse-atom-entry): * lisp/org/org-habit.el (org-habit-parse-todo): * lisp/org/org-mouse.el (org-mouse-popup-global-menu) (org-mouse-context-menu): * lisp/org/org-table.el (org-table-edit-formulas): * lisp/org/ox.el (org-export-async-start): * lisp/proced.el (proced-log): * lisp/progmodes/ada-mode.el (ada-get-indent-case) (ada-check-matching-start, ada-goto-matching-start): * lisp/progmodes/ada-prj.el (ada-prj-display-page): * lisp/progmodes/ada-xref.el (ada-find-executable): * lisp/progmodes/ebrowse.el (ebrowse-tags-apropos): * lisp/progmodes/etags.el (etags-tags-apropos-additional): * lisp/progmodes/flymake.el (flymake-parse-err-lines) (flymake-start-syntax-check-process): * lisp/progmodes/python.el (python-shell-get-process-or-error) (python-define-auxiliary-skeleton): * lisp/progmodes/sql.el (sql-comint): * lisp/progmodes/verilog-mode.el (verilog-load-file-at-point): * lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate): * lisp/recentf.el (recentf-open-files): * lisp/replace.el (query-replace-read-from) (occur-after-change-function, occur-1): * lisp/scroll-bar.el (scroll-bar-columns): * lisp/server.el (server-get-auth-key): * lisp/simple.el (execute-extended-command) (undo-outer-limit-truncate, list-processes--refresh) (compose-mail, set-variable, choose-completion-string) (define-alternatives): * lisp/startup.el (site-run-file, tty-handle-args, command-line) (command-line-1): * lisp/subr.el (noreturn, define-error, add-to-list) (read-char-choice, version-to-list): * lisp/term/common-win.el (x-handle-xrm-switch) (x-handle-name-switch, x-handle-args): * lisp/term/x-win.el (x-handle-parent-id, x-handle-smid): * lisp/textmodes/reftex-ref.el (reftex-label): * lisp/textmodes/reftex-toc.el (reftex-toc-rename-label): * lisp/textmodes/two-column.el (2C-split): * lisp/tutorial.el (tutorial--describe-nonstandard-key) (tutorial--find-changed-keys): * lisp/type-break.el (type-break-noninteractive-query): * lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes) (wdired-do-perm-changes): * lisp/whitespace.el (whitespace-report-region): Prefer grave quoting in source-code strings used to generate help and diagnostics. * lisp/faces.el (face-documentation): No need to convert quotes, since the result is a docstring. * lisp/info.el (Info-virtual-index-find-node) (Info-virtual-index, info-apropos): Simplify by generating only curved quotes, since info files are typically that ways nowadays anyway. * lisp/international/mule-diag.el (list-input-methods): Don’t assume text quoting style is curved. * lisp/org/org-bibtex.el (org-bibtex-fields): Revert my recent changes, going back to the old quoting style.
2015-09-07 15:41:44 +00:00
(format-message "\tBuffer `%s'\n" (buffer-name obuf)))
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(goto-char (point-max))
(insert "\f\n")))))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-log-summary (string failures)
(dired-log-summary): Add doc string.
2006-09-08 11:58:18 +00:00
"State a summary of a command's failures, in echo area and log buffer.
STRING is an overall summary of the failures.
FAILURES is a list of file names that we failed to operate on,
or nil if file names are not applicable."
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(if (= (length failures) 1)
(message "%s"
(with-current-buffer dired-log-buffer
(goto-char (point-max))
(backward-page 1)
(if (eolp) (forward-line 1))
(buffer-substring (point) (point-max))))
(message (if failures "%s--type ? for details (%s)"
"%s--type ? for details")
string failures))
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; Log a summary describing a bunch of errors.
(dired-use-ls-dired): New variable. (dired-directory): Document the rules better. (dired-insert-headerline): Function deleted. (dired-revert): Pass no args to dired-readin. (dired-move-to-filename): First try using dired-filename property. (dired-move-to-end-of-filename): Likewise. (dired-why): Try to show the start of this page of warnings. (dired-log): Insert the buffer name at start of page, not end. (dired-log-summary): If just one failure, explain it in echo area. (dired-internal-noselect): Always set dired-directory, when buffer is not new. Pass dir-or-list, not dirname, to dired-mode. Call dired-readin with no args. Don't call dired-after-readin-hook here. (dired-find-buffer-nocreate): Expand dirname. Expand the dir from dired-directory to compare with dirname. (dired-readin): Take no args. Get the directory from dired-directory. Run dired-before-reading hook inside save-excursion. Run dired-after-readin-hook here. Don't make undo entries at all. Call dired-readin-insert with no args. Don't change indentation here. Don't insert headerline here. (dired-readin-insert): Take no args. Get dir and file-list from dired-directory. Call dired-insert-directory the new way. Don't insert "wildcard" info here. (dired-insert-directory): New arg FILE-LIST. First arg now DIR, always just the directory. This function fully handles setting up the buffer text: update indentation, insert headerline and "wildcard" info. Pass --dired arg if appropriate; put info in dired-filename props. Don't expand file names here.
2002-09-15 01:52:54 +00:00
(dired-log (concat "\n" string "\n"))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-log t))
Revert last change.
2001-01-26 13:14:11 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
;;; Sorting
;; Most ls can only sort by name or by date (with -t), nothing else.
;; GNU ls sorts on size with -S, on extension with -X, and unsorted with -U.
;; So anything that does not contain these is sort "by name".
(defvar dired-ls-sorting-switches "SXU"
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"String of `ls' switches (single letters) except \"t\" that influence sorting.
(dired-ls-sorting-switches): Doc fix.
2003-11-01 17:48:54 +00:00
This indicates to Dired which option switches to watch out for because they
will change the sorting order behavior of `ls'.
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
To change the default sorting order (e.g. add a `-v' option), see the
(dired-ls-sorting-switches): Doc fix.
2003-11-01 17:48:54 +00:00
variable `dired-listing-switches'. To temporarily override the listing
format, use `\\[universal-argument] \\[dired]'.")
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defvar dired-sort-by-date-regexp
Improve ls date switch parsing in Dired (Bug#6987). * dired.el (dired-ls-sorting-switches, dired-sort-by-name-regexp): Improve regexps (Bug#6987). (dired-sort-toggle): Search more robustly for -t flag.
2010-09-05 21:28:50 +00:00
(concat "\\(\\`\\| \\)-[^- ]*t"
;; `dired-ls-sorting-switches' after -t overrides -t.
"[^ " dired-ls-sorting-switches "]*"
"\\(\\(\\`\\| +\\)\\(--[^ ]+\\|-[^- t"
dired-ls-sorting-switches "]+\\)\\)* *$")
(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.
2005-07-20 14:08:39 +00:00
"Regexp recognized by Dired to set `by date' mode.")
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defvar dired-sort-by-name-regexp
Improve ls date switch parsing in Dired (Bug#6987). * dired.el (dired-ls-sorting-switches, dired-sort-by-name-regexp): Improve regexps (Bug#6987). (dired-sort-toggle): Search more robustly for -t flag.
2010-09-05 21:28:50 +00:00
(concat "\\`\\(\\(\\`\\| +\\)\\(--[^ ]+\\|"
"-[^- t" dired-ls-sorting-switches "]+\\)\\)* *$")
(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.
2005-07-20 14:08:39 +00:00
"Regexp recognized by Dired to set `by name' mode.")
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-sort-inhibit): New variable. (dired-sort-toggle-or-edit): Err if dired-sort-inhibit non-nil.
2002-11-21 17:31:51 +00:00
(defvar dired-sort-inhibit nil
"Non-nil means the Dired sort command is disabled.
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
The idea is to set this buffer-locally in special Dired buffers.")
(dired-sort-inhibit): New variable. (dired-sort-toggle-or-edit): Err if dired-sort-inhibit non-nil.
2002-11-21 17:31:51 +00:00
Remove incorrect uses of "modeline". * ansi-color.el (ansi-color-faces-vector): Change default faces. * cus-edit.el (mode-line): * dframe.el (dframe-mouse-hscroll): * emacs-lisp/re-builder.el: * emacs-lisp/easy-mmode.el (define-minor-mode): * frame.el (set-frame-name): * help.el (lookup-minor-mode-from-indicator): * net/rcirc.el (rcirc-activity-string, rcirc-short-buffer-name): * progmodes/cc-cmds.el (c-toggle-auto-newline) (c-toggle-hungry-state): * progmodes/antlr-mode.el (antlr-language-alist): * progmodes/idlw-shell.el (idlwave-shell-electric-stop-line-face): * progmodes/vhdl-mode.el (vhdl-mode): * progmodes/which-func.el (which-func, which-func-cleanup-function): * term/ns-win.el (ns-face-at-pos): * term/sup-mouse.el (sup-mouse-report): * textmodes/flyspell.el (flyspell-mode-line-string): * textmodes/ispell.el (ispell-highlight-face): * textmodes/reftex-global.el: * vc/vc-arch.el (vc-arch-mode-line-string): * vc/vc-cvs.el (vc-cvs-mode-line-string): * vc/vc-git.el (vc-git-mode-line-string): * vc/vc-hooks.el (vc-display-status) (vc-default-mode-line-string): * vc/vc-mtn.el (vc-mtn-mode-line-string): Doc fixes. * dired.el (dired-sort-set-mode-line): Rename from dired-sort-set-modeline. All callers changed. * foldout.el (foldout-mode-line-string): Rename from foldout-modeline-string. All callers changed. (foldout-update-mode-line): Rename from foldout-update-modeline. * strokes.el (strokes-lighter): Rename from strokes-modeline-string. * subr.el (redraw-modeline): Make into obsolete alias. * calendar/timeclock.el (timeclock-mode-line-display): Rename from timeclock-modeline-display. Make old name an alias. (timeclock-update-mode-line): Likewise. All callers changed. (timeclock-mode-line-display): No need to check before using add-hook. (timeclock-relative, timeclock-day-over-hook) (timeclock-use-elapsed, timeclock-mode-string) (timeclock-mode-line-display): Doc fix, "modeline" -> "mode line". * emulation/crisp.el (crisp-mode-mode-line-string): Rename from crisp-mode-modeline-string. * erc-track.el (erc-track, erc-track-faces-priority-list) (erc-track-faces-normal-list, erc-track-find-face) (erc-track-modified-channels): Fix modeline -> mode line in docs. * eshell/esh-mode.el (eshell-status-in-mode-line): Rename from eshell-status-in-modeline. * org-clock.el (org-clock-string-limit) (org-clock-modeline-total, org-clock-task-overrun-text) (org-clock-mode-line-entry): Doc fix, "modeline" -> "mode line". * play/solitaire.el (solitaire-build-mode-line): Rename from solitaire-build-modeline. All callers changed. * play/zone.el (zone-hiding-mode-line): Rename from zone-hiding-modeline. All callers changed. (zone): Remove unusued `modeline-hidden-level' property. * progmodes/xscheme.el (xscheme-mode-line-initialize): Rename from xscheme-modeline-initialize. All callers changed. * textmodes/sgml-mode.el (html-face-tag-alist) (html-tag-face-alist): Use mode-line face instead of obsolete alias modeline. Fixes: debbugs:10329
2012-06-02 10:56:09 +00:00
(defun dired-sort-set-mode-line ()
;; Set mode line display according to dired-actual-switches.
;; Mode line display of "by name" or "by date" guarantees the user a
*** empty log message ***
1992-06-24 02:13:56 +00:00
;; match with the corresponding regexps. Non-matching switches are
;; shown literally.
(dired-sort-other): Move test for dired-mode... (dired-sort-set-modeline): ...to here.
2006-12-29 23:57:38 +00:00
(when (eq major-mode 'dired-mode)
(setq mode-name
(let (case-fold-search)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(cond ((string-match-p
(dired-sort-other): Move test for dired-mode... (dired-sort-set-modeline): ...to here.
2006-12-29 23:57:38 +00:00
dired-sort-by-name-regexp dired-actual-switches)
"Dired by name")
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
((string-match-p
(dired-sort-other): Move test for dired-mode... (dired-sort-set-modeline): ...to here.
2006-12-29 23:57:38 +00:00
dired-sort-by-date-regexp dired-actual-switches)
"Dired by date")
(t
(concat "Dired " dired-actual-switches)))))
(force-mode-line-update)))
*** empty log message ***
1992-06-24 02:13:56 +00:00
Remove incorrect uses of "modeline". * ansi-color.el (ansi-color-faces-vector): Change default faces. * cus-edit.el (mode-line): * dframe.el (dframe-mouse-hscroll): * emacs-lisp/re-builder.el: * emacs-lisp/easy-mmode.el (define-minor-mode): * frame.el (set-frame-name): * help.el (lookup-minor-mode-from-indicator): * net/rcirc.el (rcirc-activity-string, rcirc-short-buffer-name): * progmodes/cc-cmds.el (c-toggle-auto-newline) (c-toggle-hungry-state): * progmodes/antlr-mode.el (antlr-language-alist): * progmodes/idlw-shell.el (idlwave-shell-electric-stop-line-face): * progmodes/vhdl-mode.el (vhdl-mode): * progmodes/which-func.el (which-func, which-func-cleanup-function): * term/ns-win.el (ns-face-at-pos): * term/sup-mouse.el (sup-mouse-report): * textmodes/flyspell.el (flyspell-mode-line-string): * textmodes/ispell.el (ispell-highlight-face): * textmodes/reftex-global.el: * vc/vc-arch.el (vc-arch-mode-line-string): * vc/vc-cvs.el (vc-cvs-mode-line-string): * vc/vc-git.el (vc-git-mode-line-string): * vc/vc-hooks.el (vc-display-status) (vc-default-mode-line-string): * vc/vc-mtn.el (vc-mtn-mode-line-string): Doc fixes. * dired.el (dired-sort-set-mode-line): Rename from dired-sort-set-modeline. All callers changed. * foldout.el (foldout-mode-line-string): Rename from foldout-modeline-string. All callers changed. (foldout-update-mode-line): Rename from foldout-update-modeline. * strokes.el (strokes-lighter): Rename from strokes-modeline-string. * subr.el (redraw-modeline): Make into obsolete alias. * calendar/timeclock.el (timeclock-mode-line-display): Rename from timeclock-modeline-display. Make old name an alias. (timeclock-update-mode-line): Likewise. All callers changed. (timeclock-mode-line-display): No need to check before using add-hook. (timeclock-relative, timeclock-day-over-hook) (timeclock-use-elapsed, timeclock-mode-string) (timeclock-mode-line-display): Doc fix, "modeline" -> "mode line". * emulation/crisp.el (crisp-mode-mode-line-string): Rename from crisp-mode-modeline-string. * erc-track.el (erc-track, erc-track-faces-priority-list) (erc-track-faces-normal-list, erc-track-find-face) (erc-track-modified-channels): Fix modeline -> mode line in docs. * eshell/esh-mode.el (eshell-status-in-mode-line): Rename from eshell-status-in-modeline. * org-clock.el (org-clock-string-limit) (org-clock-modeline-total, org-clock-task-overrun-text) (org-clock-mode-line-entry): Doc fix, "modeline" -> "mode line". * play/solitaire.el (solitaire-build-mode-line): Rename from solitaire-build-modeline. All callers changed. * play/zone.el (zone-hiding-mode-line): Rename from zone-hiding-modeline. All callers changed. (zone): Remove unusued `modeline-hidden-level' property. * progmodes/xscheme.el (xscheme-mode-line-initialize): Rename from xscheme-modeline-initialize. All callers changed. * textmodes/sgml-mode.el (html-face-tag-alist) (html-tag-face-alist): Use mode-line face instead of obsolete alias modeline. Fixes: debbugs:10329
2012-06-02 10:56:09 +00:00
(define-obsolete-function-alias 'dired-sort-set-modeline
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
#'dired-sort-set-mode-line "24.3")
Remove incorrect uses of "modeline". * ansi-color.el (ansi-color-faces-vector): Change default faces. * cus-edit.el (mode-line): * dframe.el (dframe-mouse-hscroll): * emacs-lisp/re-builder.el: * emacs-lisp/easy-mmode.el (define-minor-mode): * frame.el (set-frame-name): * help.el (lookup-minor-mode-from-indicator): * net/rcirc.el (rcirc-activity-string, rcirc-short-buffer-name): * progmodes/cc-cmds.el (c-toggle-auto-newline) (c-toggle-hungry-state): * progmodes/antlr-mode.el (antlr-language-alist): * progmodes/idlw-shell.el (idlwave-shell-electric-stop-line-face): * progmodes/vhdl-mode.el (vhdl-mode): * progmodes/which-func.el (which-func, which-func-cleanup-function): * term/ns-win.el (ns-face-at-pos): * term/sup-mouse.el (sup-mouse-report): * textmodes/flyspell.el (flyspell-mode-line-string): * textmodes/ispell.el (ispell-highlight-face): * textmodes/reftex-global.el: * vc/vc-arch.el (vc-arch-mode-line-string): * vc/vc-cvs.el (vc-cvs-mode-line-string): * vc/vc-git.el (vc-git-mode-line-string): * vc/vc-hooks.el (vc-display-status) (vc-default-mode-line-string): * vc/vc-mtn.el (vc-mtn-mode-line-string): Doc fixes. * dired.el (dired-sort-set-mode-line): Rename from dired-sort-set-modeline. All callers changed. * foldout.el (foldout-mode-line-string): Rename from foldout-modeline-string. All callers changed. (foldout-update-mode-line): Rename from foldout-update-modeline. * strokes.el (strokes-lighter): Rename from strokes-modeline-string. * subr.el (redraw-modeline): Make into obsolete alias. * calendar/timeclock.el (timeclock-mode-line-display): Rename from timeclock-modeline-display. Make old name an alias. (timeclock-update-mode-line): Likewise. All callers changed. (timeclock-mode-line-display): No need to check before using add-hook. (timeclock-relative, timeclock-day-over-hook) (timeclock-use-elapsed, timeclock-mode-string) (timeclock-mode-line-display): Doc fix, "modeline" -> "mode line". * emulation/crisp.el (crisp-mode-mode-line-string): Rename from crisp-mode-modeline-string. * erc-track.el (erc-track, erc-track-faces-priority-list) (erc-track-faces-normal-list, erc-track-find-face) (erc-track-modified-channels): Fix modeline -> mode line in docs. * eshell/esh-mode.el (eshell-status-in-mode-line): Rename from eshell-status-in-modeline. * org-clock.el (org-clock-string-limit) (org-clock-modeline-total, org-clock-task-overrun-text) (org-clock-mode-line-entry): Doc fix, "modeline" -> "mode line". * play/solitaire.el (solitaire-build-mode-line): Rename from solitaire-build-modeline. All callers changed. * play/zone.el (zone-hiding-mode-line): Rename from zone-hiding-modeline. All callers changed. (zone): Remove unusued `modeline-hidden-level' property. * progmodes/xscheme.el (xscheme-mode-line-initialize): Rename from xscheme-modeline-initialize. All callers changed. * textmodes/sgml-mode.el (html-face-tag-alist) (html-tag-face-alist): Use mode-line face instead of obsolete alias modeline. Fixes: debbugs:10329
2012-06-02 10:56:09 +00:00
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-sort-toggle-or-edit (&optional arg)
Improve ls date switch parsing in Dired (Bug#6987). * dired.el (dired-ls-sorting-switches, dired-sort-by-name-regexp): Improve regexps (Bug#6987). (dired-sort-toggle): Search more robustly for -t flag.
2010-09-05 21:28:50 +00:00
"Toggle sorting by date, and refresh the Dired buffer.
With a prefix argument, edit the current listing switches instead."
Initial revision
1992-05-30 23:52:26 +00:00
(interactive "P")
(dired-sort-inhibit): New variable. (dired-sort-toggle-or-edit): Err if dired-sort-inhibit non-nil.
2002-11-21 17:31:51 +00:00
(when dired-sort-inhibit
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(error "Cannot sort this Dired buffer"))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(if arg
(dired-sort-other
* lisp/dired.el (dired-sort-toggle-or-edit): Revert last changes.
2011-09-11 17:08:17 +00:00
(read-string "ls switches (must contain -l): " dired-actual-switches))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(dired-sort-toggle)))
(defun dired-sort-toggle ()
;; Toggle between sort by date/name. Reverts the buffer.
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(let ((sorting-by-date (string-match-p dired-sort-by-date-regexp
dired-actual-switches))
Improve ls date switch parsing in Dired (Bug#6987). * dired.el (dired-ls-sorting-switches, dired-sort-by-name-regexp): Improve regexps (Bug#6987). (dired-sort-toggle): Search more robustly for -t flag.
2010-09-05 21:28:50 +00:00
;; Regexp for finding (possibly embedded) -t switches.
(switch-regexp "\\(\\`\\| \\)-\\([a-su-zA-Z]*\\)\\(t\\)\\([^ ]*\\)")
case-fold-search)
;; Remove the -t switch.
(while (string-match switch-regexp dired-actual-switches)
(if (and (equal (match-string 2 dired-actual-switches) "")
(equal (match-string 4 dired-actual-switches) ""))
;; Remove a stand-alone -t switch.
(setq dired-actual-switches
(replace-match "" t t dired-actual-switches))
;; Remove a switch of the form -XtY for some X and Y.
(setq dired-actual-switches
(replace-match "" t t dired-actual-switches 3))))
Ensure dired-display-file displays it in other window. * dired.el (dired-display-file): Force use of other window.
2014-03-18 12:07:01 +00:00
Improve ls date switch parsing in Dired (Bug#6987). * dired.el (dired-ls-sorting-switches, dired-sort-by-name-regexp): Improve regexps (Bug#6987). (dired-sort-toggle): Search more robustly for -t flag.
2010-09-05 21:28:50 +00:00
;; Now, if we weren't sorting by date before, add the -t switch.
* dired.el (dired-sort-toggle): Some ls implementations only allow a single option string. Fixes: debbugs:12666
2012-10-18 03:50:15 +00:00
;; Some simple-minded ls implementations (eg ftp servers) only
;; allow a single option string, so try not to add " -t" if possible.
Improve ls date switch parsing in Dired (Bug#6987). * dired.el (dired-ls-sorting-switches, dired-sort-by-name-regexp): Improve regexps (Bug#6987). (dired-sort-toggle): Search more robustly for -t flag.
2010-09-05 21:28:50 +00:00
(unless sorting-by-date
* dired.el (dired-sort-toggle): Some ls implementations only allow a single option string. Fixes: debbugs:12666
2012-10-18 03:50:15 +00:00
(setq dired-actual-switches
(concat dired-actual-switches
(if (string-match-p "\\`-[[:alnum:]]+\\'"
dired-actual-switches)
"t"
" -t")))))
Remove incorrect uses of "modeline". * ansi-color.el (ansi-color-faces-vector): Change default faces. * cus-edit.el (mode-line): * dframe.el (dframe-mouse-hscroll): * emacs-lisp/re-builder.el: * emacs-lisp/easy-mmode.el (define-minor-mode): * frame.el (set-frame-name): * help.el (lookup-minor-mode-from-indicator): * net/rcirc.el (rcirc-activity-string, rcirc-short-buffer-name): * progmodes/cc-cmds.el (c-toggle-auto-newline) (c-toggle-hungry-state): * progmodes/antlr-mode.el (antlr-language-alist): * progmodes/idlw-shell.el (idlwave-shell-electric-stop-line-face): * progmodes/vhdl-mode.el (vhdl-mode): * progmodes/which-func.el (which-func, which-func-cleanup-function): * term/ns-win.el (ns-face-at-pos): * term/sup-mouse.el (sup-mouse-report): * textmodes/flyspell.el (flyspell-mode-line-string): * textmodes/ispell.el (ispell-highlight-face): * textmodes/reftex-global.el: * vc/vc-arch.el (vc-arch-mode-line-string): * vc/vc-cvs.el (vc-cvs-mode-line-string): * vc/vc-git.el (vc-git-mode-line-string): * vc/vc-hooks.el (vc-display-status) (vc-default-mode-line-string): * vc/vc-mtn.el (vc-mtn-mode-line-string): Doc fixes. * dired.el (dired-sort-set-mode-line): Rename from dired-sort-set-modeline. All callers changed. * foldout.el (foldout-mode-line-string): Rename from foldout-modeline-string. All callers changed. (foldout-update-mode-line): Rename from foldout-update-modeline. * strokes.el (strokes-lighter): Rename from strokes-modeline-string. * subr.el (redraw-modeline): Make into obsolete alias. * calendar/timeclock.el (timeclock-mode-line-display): Rename from timeclock-modeline-display. Make old name an alias. (timeclock-update-mode-line): Likewise. All callers changed. (timeclock-mode-line-display): No need to check before using add-hook. (timeclock-relative, timeclock-day-over-hook) (timeclock-use-elapsed, timeclock-mode-string) (timeclock-mode-line-display): Doc fix, "modeline" -> "mode line". * emulation/crisp.el (crisp-mode-mode-line-string): Rename from crisp-mode-modeline-string. * erc-track.el (erc-track, erc-track-faces-priority-list) (erc-track-faces-normal-list, erc-track-find-face) (erc-track-modified-channels): Fix modeline -> mode line in docs. * eshell/esh-mode.el (eshell-status-in-mode-line): Rename from eshell-status-in-modeline. * org-clock.el (org-clock-string-limit) (org-clock-modeline-total, org-clock-task-overrun-text) (org-clock-mode-line-entry): Doc fix, "modeline" -> "mode line". * play/solitaire.el (solitaire-build-mode-line): Rename from solitaire-build-modeline. All callers changed. * play/zone.el (zone-hiding-mode-line): Rename from zone-hiding-modeline. All callers changed. (zone): Remove unusued `modeline-hidden-level' property. * progmodes/xscheme.el (xscheme-mode-line-initialize): Rename from xscheme-modeline-initialize. All callers changed. * textmodes/sgml-mode.el (html-face-tag-alist) (html-tag-face-alist): Use mode-line face instead of obsolete alias modeline. Fixes: debbugs:10329
2012-06-02 10:56:09 +00:00
(dired-sort-set-mode-line)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(revert-buffer))
Revert last change.
2001-01-26 13:14:11 +00:00
;; Some user code loads dired especially for this.
Comment change.
2002-01-13 02:39:08 +00:00
;; Don't do that--use replace-regexp-in-string instead.
Revert last change.
2001-01-26 13:14:11 +00:00
(defun dired-replace-in-string (regexp newtext string)
;; Replace REGEXP with NEWTEXT everywhere in STRING and return result.
;; NEWTEXT is taken literally---no \\DIGIT escapes will be recognized.
(let ((result "") (start 0) mb me)
(while (string-match regexp string start)
(setq mb (match-beginning 0)
me (match-end 0)
result (concat result (substring string start mb) newtext)
start me))
(concat result (substring string start))))
*** empty log message ***
1992-06-24 02:13:56 +00:00
(defun dired-sort-other (switches &optional no-revert)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Specify new `ls' SWITCHES for current Dired buffer.
(dired-mode): Use run-mode-hooks. (dired-move-to-end-of-filename): Use match-string.
2004-03-26 15:17:50 +00:00
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."
(dired-sort-R-check): Added to allow recursive listing to be undone. (dired-sort-other): Use it.
2000-07-24 12:27:26 +00:00
(dired-sort-R-check switches)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(setq dired-actual-switches switches)
Remove incorrect uses of "modeline". * ansi-color.el (ansi-color-faces-vector): Change default faces. * cus-edit.el (mode-line): * dframe.el (dframe-mouse-hscroll): * emacs-lisp/re-builder.el: * emacs-lisp/easy-mmode.el (define-minor-mode): * frame.el (set-frame-name): * help.el (lookup-minor-mode-from-indicator): * net/rcirc.el (rcirc-activity-string, rcirc-short-buffer-name): * progmodes/cc-cmds.el (c-toggle-auto-newline) (c-toggle-hungry-state): * progmodes/antlr-mode.el (antlr-language-alist): * progmodes/idlw-shell.el (idlwave-shell-electric-stop-line-face): * progmodes/vhdl-mode.el (vhdl-mode): * progmodes/which-func.el (which-func, which-func-cleanup-function): * term/ns-win.el (ns-face-at-pos): * term/sup-mouse.el (sup-mouse-report): * textmodes/flyspell.el (flyspell-mode-line-string): * textmodes/ispell.el (ispell-highlight-face): * textmodes/reftex-global.el: * vc/vc-arch.el (vc-arch-mode-line-string): * vc/vc-cvs.el (vc-cvs-mode-line-string): * vc/vc-git.el (vc-git-mode-line-string): * vc/vc-hooks.el (vc-display-status) (vc-default-mode-line-string): * vc/vc-mtn.el (vc-mtn-mode-line-string): Doc fixes. * dired.el (dired-sort-set-mode-line): Rename from dired-sort-set-modeline. All callers changed. * foldout.el (foldout-mode-line-string): Rename from foldout-modeline-string. All callers changed. (foldout-update-mode-line): Rename from foldout-update-modeline. * strokes.el (strokes-lighter): Rename from strokes-modeline-string. * subr.el (redraw-modeline): Make into obsolete alias. * calendar/timeclock.el (timeclock-mode-line-display): Rename from timeclock-modeline-display. Make old name an alias. (timeclock-update-mode-line): Likewise. All callers changed. (timeclock-mode-line-display): No need to check before using add-hook. (timeclock-relative, timeclock-day-over-hook) (timeclock-use-elapsed, timeclock-mode-string) (timeclock-mode-line-display): Doc fix, "modeline" -> "mode line". * emulation/crisp.el (crisp-mode-mode-line-string): Rename from crisp-mode-modeline-string. * erc-track.el (erc-track, erc-track-faces-priority-list) (erc-track-faces-normal-list, erc-track-find-face) (erc-track-modified-channels): Fix modeline -> mode line in docs. * eshell/esh-mode.el (eshell-status-in-mode-line): Rename from eshell-status-in-modeline. * org-clock.el (org-clock-string-limit) (org-clock-modeline-total, org-clock-task-overrun-text) (org-clock-mode-line-entry): Doc fix, "modeline" -> "mode line". * play/solitaire.el (solitaire-build-mode-line): Rename from solitaire-build-modeline. All callers changed. * play/zone.el (zone-hiding-mode-line): Rename from zone-hiding-modeline. All callers changed. (zone): Remove unusued `modeline-hidden-level' property. * progmodes/xscheme.el (xscheme-mode-line-initialize): Rename from xscheme-modeline-initialize. All callers changed. * textmodes/sgml-mode.el (html-face-tag-alist) (html-tag-face-alist): Use mode-line face instead of obsolete alias modeline. Fixes: debbugs:10329
2012-06-02 10:56:09 +00:00
(dired-sort-set-mode-line)
*** empty log message ***
1992-06-24 02:13:56 +00:00
(or no-revert (revert-buffer)))
(dired-sort-R-check): Added to allow recursive listing to be undone. (dired-sort-other): Use it.
2000-07-24 12:27:26 +00:00
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
(defvar-local dired-subdir-alist-pre-R nil
(dired-move-to-filename-regexp): Define as alias. (dired-no-confirm): Use defcustom. (dired-subdir-alist-pre-R): Put defvar at top level.
2006-01-19 17:50:15 +00:00
"Value of `dired-subdir-alist' before -R switch added.")
(dired-sort-R-check): Added to allow recursive listing to be undone. (dired-sort-other): Use it.
2000-07-24 12:27:26 +00:00
(defun dired-sort-R-check (switches)
"Additional processing of -R in ls option string SWITCHES.
Saves `dired-subdir-alist' when R is set and restores saved value
minus any directories explicitly deleted when R is cleared.
To be called first in body of `dired-sort-other', etc."
(cond
* lisp/dired.el (dired-check-switches, dired-switches-recursive-p): New functions. (dired-switches-escape-p, dired-move-to-end-of-filename): Use `dired-check-switches'. (dired-insert-old-subdirs, dired-build-subdir-alist) (dired-sort-R-check): Use `dired-switches-recursive-p'. Fixes: debbugs:17218
2014-05-03 09:22:59 +00:00
((and (dired-switches-recursive-p switches)
(not (dired-switches-recursive-p dired-actual-switches)))
(dired-sort-R-check): Added to allow recursive listing to be undone. (dired-sort-other): Use it.
2000-07-24 12:27:26 +00:00
;; Adding -R to ls switches -- save `dired-subdir-alist':
(setq dired-subdir-alist-pre-R dired-subdir-alist))
* lisp/dired.el (dired-check-switches, dired-switches-recursive-p): New functions. (dired-switches-escape-p, dired-move-to-end-of-filename): Use `dired-check-switches'. (dired-insert-old-subdirs, dired-build-subdir-alist) (dired-sort-R-check): Use `dired-switches-recursive-p'. Fixes: debbugs:17218
2014-05-03 09:22:59 +00:00
((and (dired-switches-recursive-p dired-actual-switches)
(not (dired-switches-recursive-p switches)))
(dired-sort-R-check): Added to allow recursive listing to be undone. (dired-sort-other): Use it.
2000-07-24 12:27:26 +00:00
;; Deleting -R from ls switches -- revert to pre-R subdirs
;; that are still present:
(setq dired-subdir-alist
(if dired-subdir-alist-pre-R
(let (subdirs)
(while dired-subdir-alist-pre-R
(if (assoc (caar dired-subdir-alist-pre-R)
dired-subdir-alist)
;; subdir still present...
(setq subdirs
(cons (car dired-subdir-alist-pre-R)
subdirs)))
(setq dired-subdir-alist-pre-R
(cdr dired-subdir-alist-pre-R)))
(reverse subdirs))
;; No pre-R subdir alist, so revert to main directory
;; listing:
(list (car (reverse dired-subdir-alist))))))))
Revert last change.
2001-01-26 13:14:11 +00:00
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
;;;; Drag and drop support
(dired-recursive-deletes, dired-recursive-copies): Change default to `top'.
2007-06-01 05:01:56 +00:00
(defcustom dired-recursive-copies 'top
Misc doc fixes for Dired. * dired-aux.el (dired-do-create-files): Doc fix (Bug#11327). (dired-create-files): Doc fix (Bug#11329). (dired-do-copy): Doc fix (Bug#11334). (dired-mark-read-string): Doc fix (Bug#11553). * dired.el (dired-recursive-copies, dired-recursive-deletes): Doc fix (Bug#11326). (dired-make-relative): Doc fix (Bug#11332). Remove unused arg. (dired-dwim-target): Doc fix. * wdired.el (wdired-mode): Doc fix.
2012-06-22 07:30:33 +00:00
"Whether Dired copies directories recursively.
If nil, never copy recursively.
`always' means to copy recursively without asking.
`top' means to ask for each directory at top level.
Any other value means to ask for each directory."
(dired-recursive-copies): Moved from dired-aux.el.
2004-11-22 16:53:41 +00:00
:type '(choice :tag "Copy directories"
(const :tag "No recursive copies" nil)
(const :tag "Ask for each directory" t)
(const :tag "Ask for each top directory only" top)
(const :tag "Copy directories without asking" always))
:group 'dired)
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
(defun dired-dnd-popup-notice ()
(dired-dnd-popup-notice): Use message-box.
2005-05-23 23:36:18 +00:00
(message-box
(dired-dnd-handle-local-file): Obey dired-backup-overwrite for copy, move, and link operations.
2008-04-06 21:01:54 +00:00
"Dired recursive copies are currently disabled.\nSee the variable `dired-recursive-copies'."))
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
Update x-popup-menu declaration.
2009-11-10 08:11:47 +00:00
(declare-function x-popup-menu "menu.c" (position menu))
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
(defun dired-dnd-do-ask-action (uri)
;; No need to get actions and descriptions from the source,
;; we only have three actions anyway.
(dired-subdir-switches, dired-switches-alist): New vars. (dired-insert-old-subdirs): Do not repeatedly delete and reinsert subdirs if -R switch is used for a subdir. (dired-mode): Set `dired-switches-alist'. (dired-build-subdir-alist): Only print number of directories in echo area when invoked interactively.
2004-06-06 02:22:41 +00:00
(let ((action (x-popup-menu
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
t
(list "What action?"
(cons ""
'(("Copy here" . copy)
("Move here" . move)
("Link here" . link)
"--"
("Cancel" . nil)))))))
(if action
(dired-dnd-handle-local-file uri action)
nil)))
(dired-relist-entry): Declare as function.
2007-11-19 00:08:01 +00:00
(declare-function dired-relist-entry "dired-aux" (file))
(make-symbolic-link): Declare as function.
2007-11-22 13:48:39 +00:00
(declare-function make-symbolic-link "fileio.c")
(dired-relist-entry): Declare as function.
2007-11-19 00:08:01 +00:00
Add some compiler declarations, for builds without X.
2008-06-12 03:56:20 +00:00
;; Only used when (featurep 'dnd).
(declare-function dnd-get-local-file-name "dnd" (uri &optional must-exist))
(declare-function dnd-get-local-file-uri "dnd" (uri))
* doc/lispref/variables.texi (Scope): Mention the availability of lexbind. (Lexical Binding): New node. * doc/lispref/eval.texi (Eval): Add `eval's new `lexical' arg. * lisp/emacs-lisp/cconv.el (cconv-liftwhen): Increase threshold. (cconv-closure-convert-rec): Convert interactive spec in empty lexenv. (cconv-analyse-use): Improve unused vars warnings. (cconv-analyse-form): Analyze interactive spec in empty lexenv. * lisp/emacs-lisp/bytecomp.el (byte-compile-lambda): Always byte-compile the interactive spec in lexical-binding mode. (byte-compile-refresh-preloaded): Don't reload byte-compiler files. * lisp/custom.el (custom-initialize-default): Use defvar. (custom-declare-variable): Set the special-variable-p flag. * lisp/help-fns.el (help-make-usage): Drop leading underscores. * lisp/dired.el (dired-revert, dired-make-relative): Mark unused args. (dired-unmark-all-files): Remove unused var `query'. (dired-overwrite-confirmed): Declare. (dired-restore-desktop-buffer): Don't use dynamically scoped arg names. * lisp/mpc.el: Mark unused args. (mpc--faster-toggle): Remove unused var `songnb'. * lisp/server.el (server-kill-buffer-running): Move before first use. * lisp/minibuffer.el: Mark unused args. * src/callint.c (quotify_arg): Simplify the logic. (Fcall_interactively): Use lexical binding when evaluating the interactive spec of a lexically bound function.
2011-03-01 05:03:24 +00:00
(defvar dired-overwrite-confirmed) ;Defined in dired-aux.
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
(defun dired-dnd-handle-local-file (uri action)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Copy, move or link a file to the Dired directory.
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
URI is the file to handle, ACTION is one of copy, move, link or ask.
Ask means pop up a menu for the user to select one of copy, move or link."
(require 'dired-aux)
* dired.el (dired-mode): Use dnd-* instead of x-dnd-* (dired-dnd-handle-local-file): Call dnd-get-local-file-name. (dired-dnd-handle-file): Call dnd-get-local-file-uri
2005-04-11 19:28:07 +00:00
(let* ((from (dnd-get-local-file-name uri t))
(dired-dnd-handle-local-file): Obey dired-backup-overwrite for copy, move, and link operations.
2008-04-06 20:58:20 +00:00
(to (when from
(concat (dired-current-directory)
(file-name-nondirectory from)))))
(dired-dnd-handle-local-file): Obey dired-backup-overwrite.
2008-04-06 20:11:47 +00:00
(when from
(dired-dnd-handle-local-file): Obey dired-backup-overwrite for copy, move, and link operations.
2008-04-06 20:58:20 +00:00
(cond ((eq action 'ask)
(dired-dnd-handle-local-file): Obey dired-backup-overwrite.
2008-04-06 20:11:47 +00:00
(dired-dnd-do-ask-action uri))
(dired-dnd-handle-local-file): Obey dired-backup-overwrite for copy, move, and link operations.
2008-04-06 20:58:20 +00:00
;; If copying a directory and dired-recursive-copies is
;; nil, dired-copy-file fails. Pop up a notice.
((and (memq action '(copy private))
(file-directory-p from)
(not dired-recursive-copies))
(dired-dnd-popup-notice))
((memq action '(copy private move link))
(let ((overwrite (and (file-exists-p to)
(y-or-n-p
Top-level elisp files respect ‘text-quoting-style’ In top-level elisp files, use format-message in diagnostic formats, so that they follow user preference as per ‘text-quoting-style’ rather than being hard-coded to quote `like this'. * lisp/allout.el (allout-get-configvar-values): * lisp/apropos.el (apropos-symbols-internal): * lisp/dired-aux.el (dired-do-shell-command, dired-create-files) (dired-do-create-files-regexp, dired-create-files-non-directory): * lisp/dired-x.el (dired-do-run-mail): * lisp/dired.el (dired-log, dired-dnd-handle-local-file): * lisp/disp-table.el (standard-display-european): * lisp/find-dired.el (find-dired): * lisp/forms.el (forms-mode): * lisp/ido.el (ido-buffer-internal): * lisp/info.el (Info-index-next): * lisp/outline.el (outline-invent-heading): * lisp/printing.el (pr-ps-outfile-preprint, pr-i-ps-send): * lisp/proced.el (proced-log): * lisp/ps-print.el (ps-print-preprint, ps-get-size): * lisp/recentf.el (recentf-open-files, recentf-save-list): * lisp/savehist.el (savehist-save): * lisp/server.el (server-ensure-safe-dir): * lisp/ses.el (ses-rename-cell): * lisp/simple.el (list-processes--refresh): * lisp/startup.el (command-line): * lisp/strokes.el (strokes-unset-last-stroke) (strokes-execute-stroke): Use format-message so that quotes are restyled. * lisp/cus-edit.el (custom-raised-buttons, customize-browse): Don’t quote ‘raised’. * lisp/descr-text.el (describe-char): * lisp/dirtrack.el (dirtrack-debug-message): * lisp/hexl.el (hexl-insert-multibyte-char): Apply substitute-command-keys to help string. * lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes) (wdired-do-perm-changes): Let dired-log do the formatting.
2015-08-26 08:30:29 +00:00
(format-message
"Overwrite existing file `%s'? " to))))
(dired-dnd-handle-local-file): Obey dired-backup-overwrite for copy, move, and link operations.
2008-04-06 20:58:20 +00:00
;; Binding dired-overwrite-confirmed to nil makes
;; dired-handle-overwrite a no-op. We instead use
;; y-or-n-p, which pops a graphical menu.
dired-overwrite-confirmed backup-file)
(when (and overwrite
;; d-b-o is defined in dired-aux.
(boundp 'dired-backup-overwrite)
dired-backup-overwrite
(setq backup-file
(car (find-backup-file-name to)))
(or (eq dired-backup-overwrite 'always)
(y-or-n-p
Top-level elisp files respect ‘text-quoting-style’ In top-level elisp files, use format-message in diagnostic formats, so that they follow user preference as per ‘text-quoting-style’ rather than being hard-coded to quote `like this'. * lisp/allout.el (allout-get-configvar-values): * lisp/apropos.el (apropos-symbols-internal): * lisp/dired-aux.el (dired-do-shell-command, dired-create-files) (dired-do-create-files-regexp, dired-create-files-non-directory): * lisp/dired-x.el (dired-do-run-mail): * lisp/dired.el (dired-log, dired-dnd-handle-local-file): * lisp/disp-table.el (standard-display-european): * lisp/find-dired.el (find-dired): * lisp/forms.el (forms-mode): * lisp/ido.el (ido-buffer-internal): * lisp/info.el (Info-index-next): * lisp/outline.el (outline-invent-heading): * lisp/printing.el (pr-ps-outfile-preprint, pr-i-ps-send): * lisp/proced.el (proced-log): * lisp/ps-print.el (ps-print-preprint, ps-get-size): * lisp/recentf.el (recentf-open-files, recentf-save-list): * lisp/savehist.el (savehist-save): * lisp/server.el (server-ensure-safe-dir): * lisp/ses.el (ses-rename-cell): * lisp/simple.el (list-processes--refresh): * lisp/startup.el (command-line): * lisp/strokes.el (strokes-unset-last-stroke) (strokes-execute-stroke): Use format-message so that quotes are restyled. * lisp/cus-edit.el (custom-raised-buttons, customize-browse): Don’t quote ‘raised’. * lisp/descr-text.el (describe-char): * lisp/dirtrack.el (dirtrack-debug-message): * lisp/hexl.el (hexl-insert-multibyte-char): Apply substitute-command-keys to help string. * lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes) (wdired-do-perm-changes): Let dired-log do the formatting.
2015-08-26 08:30:29 +00:00
(format-message
(dired-dnd-handle-local-file): Obey dired-backup-overwrite for copy, move, and link operations.
2008-04-06 20:58:20 +00:00
"Make backup for existing file `%s'? " to))))
(rename-file to backup-file 0)
(dired-relist-entry backup-file))
(cond ((memq action '(copy private))
(dired-copy-file from to overwrite))
((eq action 'move)
(dired-rename-file from to overwrite))
((eq action 'link)
(make-symbolic-link from to overwrite)))
(dired-relist-entry to)
action))))))
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
(defun dired-dnd-handle-file (uri action)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Copy, move or link a file to the Dired directory if it is a local file.
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
URI is the file to handle. If the hostname in the URI isn't local, do nothing.
ACTION is one of copy, move, link or ask.
Ask means pop up a menu for the user to select one of copy, move or link."
* dired.el (dired-mode): Use dnd-* instead of x-dnd-* (dired-dnd-handle-local-file): Call dnd-get-local-file-name. (dired-dnd-handle-file): Call dnd-get-local-file-uri
2005-04-11 19:28:07 +00:00
(let ((local-file (dnd-get-local-file-uri uri)))
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
(if local-file (dired-dnd-handle-local-file local-file action)
nil)))
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
;;;; Desktop support
(eval-when-compile (require 'desktop))
lisp/*.el: Add missing declarations. * descr-text.el (quail-find-key): * dired.el (desktop-file-name): * dirtrack.el (shell-prefixed-directory-name, shell-process-cd): * generic-x.el (comint-mode, comint-exec): * image-dired.el (widget-forward): * info.el (speedbar-add-expansion-list, speedbar-center-buffer-smartly) (speedbar-change-expand-button-char) (speedbar-change-initial-expansion-list, speedbar-delete-subblock) (speedbar-make-specialized-keymap, speedbar-make-tag-line): * printing.el (easy-menu-add-item, easy-menu-remove-item) (widget-field-action, widget-value-set): * speedbar.el (imenu--make-index-alist): * term.el (ring-empty-p, ring-ref, ring-insert-at-beginning) (ring-length, ring-insert): * vcursor.el (compare-windows-skip-whitespace): * woman.el (dired-get-filename): Declare functions. * term/w32-win.el (cygwin-convert-path-from-windows): Fix declaration.
2012-11-17 21:52:12 +00:00
(declare-function desktop-file-name "desktop" (filename dirname))
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
Let cconv use :fun-body in special forms that need it. * lisp/emacs-lisp/cconv.el (cconv-closure-convert): Drop `toplevel' arg. (cconv-closure-convert-toplevel): Remove. (cconv-lookup-let): New fun. (cconv-closure-convert-rec): Don't bother with defs-are-legal. Use :fun-body to handle special forms that require closing their forms. * lisp/emacs-lisp/bytecomp.el (byte-compile-file-form, byte-compile): Use cconv-closure-convert instead of cconv-closure-convert-toplevel. (byte-compile-lambda, byte-compile-make-closure): * lisp/emacs-lisp/byte-lexbind.el (byte-compile-maybe-push-heap-environment): Make sure cconv did its job. * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Check stack-depth before using it. * lisp/dired.el (dired-desktop-buffer-misc-data): Don't use a dynamic var as function argument.
2011-02-11 22:30:02 +00:00
(defun dired-desktop-buffer-misc-data (dirname)
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
"Auxiliary information to be saved in desktop file."
(cons
;; Value of `dired-directory'.
(if (consp dired-directory)
;; Directory name followed by list of files.
Let cconv use :fun-body in special forms that need it. * lisp/emacs-lisp/cconv.el (cconv-closure-convert): Drop `toplevel' arg. (cconv-closure-convert-toplevel): Remove. (cconv-lookup-let): New fun. (cconv-closure-convert-rec): Don't bother with defs-are-legal. Use :fun-body to handle special forms that require closing their forms. * lisp/emacs-lisp/bytecomp.el (byte-compile-file-form, byte-compile): Use cconv-closure-convert instead of cconv-closure-convert-toplevel. (byte-compile-lambda, byte-compile-make-closure): * lisp/emacs-lisp/byte-lexbind.el (byte-compile-maybe-push-heap-environment): Make sure cconv did its job. * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Check stack-depth before using it. * lisp/dired.el (dired-desktop-buffer-misc-data): Don't use a dynamic var as function argument.
2011-02-11 22:30:02 +00:00
(cons (desktop-file-name (car dired-directory) dirname)
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
(cdr dired-directory))
(dired-desktop-buffer-misc-data, dired-restore-desktop-buffer): Delete duplicate words.
2005-07-18 15:18:33 +00:00
;; Directory name, optionally with shell wildcard.
Let cconv use :fun-body in special forms that need it. * lisp/emacs-lisp/cconv.el (cconv-closure-convert): Drop `toplevel' arg. (cconv-closure-convert-toplevel): Remove. (cconv-lookup-let): New fun. (cconv-closure-convert-rec): Don't bother with defs-are-legal. Use :fun-body to handle special forms that require closing their forms. * lisp/emacs-lisp/bytecomp.el (byte-compile-file-form, byte-compile): Use cconv-closure-convert instead of cconv-closure-convert-toplevel. (byte-compile-lambda, byte-compile-make-closure): * lisp/emacs-lisp/byte-lexbind.el (byte-compile-maybe-push-heap-environment): Make sure cconv did its job. * lisp/emacs-lisp/byte-opt.el (byte-optimize-lapcode): Check stack-depth before using it. * lisp/dired.el (dired-desktop-buffer-misc-data): Don't use a dynamic var as function argument.
2011-02-11 22:30:02 +00:00
(desktop-file-name dired-directory dirname))
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
;; Subdirectories in `dired-subdir-alist'.
(cdr
(nreverse
(mapcar
Don't quote lambda forms * lisp/dired.el (dired-re-maybe-mark, dired-map-over-marks) (dired-mark, dired-desktop-buffer-misc-data) * lisp/dired-aux.el (dired-do-create-files, dired-do-create-files-regexp) (dired-create-files-non-directory, dired-insert-subdir-validate) (dired-alist-sort, dired-do-shell-command): Don't quote lambda forms.
2017-06-26 05:22:27 +00:00
(lambda (f) (desktop-file-name (car f) dirname))
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
dired-subdir-alist)))))
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
* doc/lispref/variables.texi (Scope): Mention the availability of lexbind. (Lexical Binding): New node. * doc/lispref/eval.texi (Eval): Add `eval's new `lexical' arg. * lisp/emacs-lisp/cconv.el (cconv-liftwhen): Increase threshold. (cconv-closure-convert-rec): Convert interactive spec in empty lexenv. (cconv-analyse-use): Improve unused vars warnings. (cconv-analyse-form): Analyze interactive spec in empty lexenv. * lisp/emacs-lisp/bytecomp.el (byte-compile-lambda): Always byte-compile the interactive spec in lexical-binding mode. (byte-compile-refresh-preloaded): Don't reload byte-compiler files. * lisp/custom.el (custom-initialize-default): Use defvar. (custom-declare-variable): Set the special-variable-p flag. * lisp/help-fns.el (help-make-usage): Drop leading underscores. * lisp/dired.el (dired-revert, dired-make-relative): Mark unused args. (dired-unmark-all-files): Remove unused var `query'. (dired-overwrite-confirmed): Declare. (dired-restore-desktop-buffer): Don't use dynamically scoped arg names. * lisp/mpc.el: Mark unused args. (mpc--faster-toggle): Remove unused var `songnb'. * lisp/server.el (server-kill-buffer-running): Move before first use. * lisp/minibuffer.el: Mark unused args. * src/callint.c (quotify_arg): Simplify the logic. (Fcall_interactively): Use lexical binding when evaluating the interactive spec of a lexically bound function.
2011-03-01 05:03:24 +00:00
(defun dired-restore-desktop-buffer (_file-name
_buffer-name
misc-data)
lisp/*.el: Fix typos; use string-match-p, looking-at-p, setq-local, defvar-local. * lisp/allout-widgets.el (allout-widgets-mode-off) (allout-widgets-mode-on, allout-widgets-pre-command-business) (allout-widgets-post-command-business) (allout-widgets-after-copy-or-kill-function) (allout-widgets-after-undo-function, allout-test-range-overlaps) (allout-decorate-item-and-context) (allout-graphics-modification-handler): Fix typos in docstrings. (allout-get-or-create-parent-widget): Use `looking-at-p'. * lisp/cmuscheme.el (scheme-start-file): Doc fix. (inferior-scheme-mode, switch-to-scheme): Fix typos in docstrings. (scheme-input-filter): Use `string-match-p'. * lisp/composite.el (compose-gstring-for-terminal): Fix typo in docstring. * lisp/dired-x.el: Use Dired consistently in docstrings. * lisp/dired.el: Use Dired consistently in docstrings. (dired-readin, dired-mode): Use `setq-local'. (dired-switches-alist): Make defvar-local. (dired-buffers-for-dir): Use `zerop'. (dired-safe-switches-p, dired-switches-escape-p) (dired-insert-old-subdirs, dired-move-to-end-of-filename) (dired-glob-regexp, dired-in-this-tree, dired-goto-file-1) (dired-sort-set-mode-line, dired-sort-toggle, dired-sort-R-check): (dired-goto-next-nontrivial-file): Use `string-match-p'. (dired-align-file, dired-insert-directory, dired-mark-files-in-region) (dired-toggle-marks, dired-mark-files-containing-regexp) (dired-mark-symlinks, dired-mark-directories, dired-mark-executables) (dired-flag-auto-save-files, dired-flag-backup-files): Use `looking-at-p'. (dired-mark-files-regexp, dired-build-subdir-alist): Use `string-match-p', `looking-at-p'. * lisp/dos-w32.el (untranslated-canonical-name, untranslated-file-p) (direct-print-region-helper): Use `string-match-p'.
2013-06-21 12:24:37 +00:00
"Restore a Dired buffer specified in a desktop file."
* doc/lispref/variables.texi (Scope): Mention the availability of lexbind. (Lexical Binding): New node. * doc/lispref/eval.texi (Eval): Add `eval's new `lexical' arg. * lisp/emacs-lisp/cconv.el (cconv-liftwhen): Increase threshold. (cconv-closure-convert-rec): Convert interactive spec in empty lexenv. (cconv-analyse-use): Improve unused vars warnings. (cconv-analyse-form): Analyze interactive spec in empty lexenv. * lisp/emacs-lisp/bytecomp.el (byte-compile-lambda): Always byte-compile the interactive spec in lexical-binding mode. (byte-compile-refresh-preloaded): Don't reload byte-compiler files. * lisp/custom.el (custom-initialize-default): Use defvar. (custom-declare-variable): Set the special-variable-p flag. * lisp/help-fns.el (help-make-usage): Drop leading underscores. * lisp/dired.el (dired-revert, dired-make-relative): Mark unused args. (dired-unmark-all-files): Remove unused var `query'. (dired-overwrite-confirmed): Declare. (dired-restore-desktop-buffer): Don't use dynamically scoped arg names. * lisp/mpc.el: Mark unused args. (mpc--faster-toggle): Remove unused var `songnb'. * lisp/server.el (server-kill-buffer-running): Move before first use. * lisp/minibuffer.el: Mark unused args. * src/callint.c (quotify_arg): Simplify the logic. (Fcall_interactively): Use lexical binding when evaluating the interactive spec of a lexically bound function.
2011-03-01 05:03:24 +00:00
;; First element of `misc-data' is the value of `dired-directory'.
(dired-desktop-buffer-misc-data, dired-restore-desktop-buffer): Delete duplicate words.
2005-07-18 15:18:33 +00:00
;; This value is a directory name, optionally with shell wildcard or
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
;; a directory name followed by list of files.
* doc/lispref/variables.texi (Scope): Mention the availability of lexbind. (Lexical Binding): New node. * doc/lispref/eval.texi (Eval): Add `eval's new `lexical' arg. * lisp/emacs-lisp/cconv.el (cconv-liftwhen): Increase threshold. (cconv-closure-convert-rec): Convert interactive spec in empty lexenv. (cconv-analyse-use): Improve unused vars warnings. (cconv-analyse-form): Analyze interactive spec in empty lexenv. * lisp/emacs-lisp/bytecomp.el (byte-compile-lambda): Always byte-compile the interactive spec in lexical-binding mode. (byte-compile-refresh-preloaded): Don't reload byte-compiler files. * lisp/custom.el (custom-initialize-default): Use defvar. (custom-declare-variable): Set the special-variable-p flag. * lisp/help-fns.el (help-make-usage): Drop leading underscores. * lisp/dired.el (dired-revert, dired-make-relative): Mark unused args. (dired-unmark-all-files): Remove unused var `query'. (dired-overwrite-confirmed): Declare. (dired-restore-desktop-buffer): Don't use dynamically scoped arg names. * lisp/mpc.el: Mark unused args. (mpc--faster-toggle): Remove unused var `songnb'. * lisp/server.el (server-kill-buffer-running): Move before first use. * lisp/minibuffer.el: Mark unused args. * src/callint.c (quotify_arg): Simplify the logic. (Fcall_interactively): Use lexical binding when evaluating the interactive spec of a lexically bound function.
2011-03-01 05:03:24 +00:00
(let* ((dired-dir (car misc-data))
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
(dir (if (consp dired-dir) (car dired-dir) dired-dir)))
(if (file-directory-p (file-name-directory dir))
* lisp/dired.el (dired-restore-desktop-buffer): Demote errors; eg in case a glob match fails. Fixes: debbugs:16884
2014-02-26 19:18:49 +00:00
(with-demoted-errors "Desktop: Problem restoring directory: %S"
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
(dired dired-dir)
* doc/lispref/variables.texi (Scope): Mention the availability of lexbind. (Lexical Binding): New node. * doc/lispref/eval.texi (Eval): Add `eval's new `lexical' arg. * lisp/emacs-lisp/cconv.el (cconv-liftwhen): Increase threshold. (cconv-closure-convert-rec): Convert interactive spec in empty lexenv. (cconv-analyse-use): Improve unused vars warnings. (cconv-analyse-form): Analyze interactive spec in empty lexenv. * lisp/emacs-lisp/bytecomp.el (byte-compile-lambda): Always byte-compile the interactive spec in lexical-binding mode. (byte-compile-refresh-preloaded): Don't reload byte-compiler files. * lisp/custom.el (custom-initialize-default): Use defvar. (custom-declare-variable): Set the special-variable-p flag. * lisp/help-fns.el (help-make-usage): Drop leading underscores. * lisp/dired.el (dired-revert, dired-make-relative): Mark unused args. (dired-unmark-all-files): Remove unused var `query'. (dired-overwrite-confirmed): Declare. (dired-restore-desktop-buffer): Don't use dynamically scoped arg names. * lisp/mpc.el: Mark unused args. (mpc--faster-toggle): Remove unused var `songnb'. * lisp/server.el (server-kill-buffer-running): Move before first use. * lisp/minibuffer.el: Mark unused args. * src/callint.c (quotify_arg): Simplify the logic. (Fcall_interactively): Use lexical binding when evaluating the interactive spec of a lexically bound function.
2011-03-01 05:03:24 +00:00
;; The following elements of `misc-data' are the keys
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
;; from `dired-subdir-alist'.
Dired: Use invisibility-spec instead of selective-display * lisp/dired.el (dired-subdir-regexp): No need to pay attention to \r. (dired-remember-hidden): Use pcase-dolist and dired--hidden-p. (dired-mode): Set invisibility-spec instead of selective-display. (dired--hidden-p, dired--hide, dired--unhide, dired--find-hidden-pos): New functions. (dired-move-to-end-of-filename): Use dired--hidden-p. (dired-next-subdir): No need to pay attention to \r. (dired-fun-in-all-buffers): Use push. * lisp/dired-aux.el (dired-unhide-subdir, dired-hide-subdir, dired-hide-all): Use the new functions and with-silent-modifications. (dired-add-entry): Use dired--hidden-p. (dired-goto-subdir): No need to pay attention to \r. (dired-hide-check): Remove. (dired-subdir-hidden-p): Use dired--hidden-p. (dired-do-find-regexp): Use file-name-as-directory.
2019-03-17 17:35:20 +00:00
(mapc #'dired-maybe-insert-subdir (cdr misc-data))
(dired-restore-desktop-buffer) Move from desktop.el. Add parameters. Pause to display error only when desktop-missing-file-warning is non-nil. (dired-desktop-buffer-misc-data): Move from desktop.el. Add parameter.
2004-04-21 20:52:18 +00:00
(current-buffer))
(message "Desktop: Directory %s no longer exists." dir)
(when desktop-missing-file-warning (sit-for 1))
nil)))
* x-dnd.el: New file for drag and drop. * term/x-win.el: require x-dnd, set after-make-frame-functions to x-dnd-init-frame, let x-dnd-handle-drag-n-drop-event handle drag-n-drop event. * dired.el (dired-dnd-test-function, dired-dnd-popup-notice) (dired-dnd-do-ask-action, dired-dnd-handle-local-file) (dired-dnd-handle-file): New functions for drag and drop support. (dired-mode): Initialize drag and drop if x-dnd present.
2004-02-03 16:55:30 +00:00
Revert last change.
2005-08-14 23:45:46 +00:00
(add-to-list 'desktop-buffer-mode-handlers
'(dired-mode . dired-restore-desktop-buffer))
Add handler to desktop-buffer-mode-handlers. (dired-restore-desktop-buffer): Remove autoload cookie. (dired-mode): Add autoload cookie.
2005-08-10 19:39:16 +00:00
*** empty log message ***
1992-07-21 22:40:10 +00:00
(provide 'dired)
`provide' "dired" before running user hooks.
1993-10-25 06:13:41 +00:00
(run-hooks 'dired-load-hook) ; for your customizations
*** empty log message ***
1992-07-21 22:40:10 +00:00
;;; dired.el ends here
Reference in New Issue Copy Permalink