Mercurial > emacs
comparison lisp/dired.el @ 90185:5b029ff3b08d
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-55
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 320-323)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 26 May 2005 05:42:19 +0000 |
parents | f042e7c0fe20 4c2b5f50f981 |
children | 173dee4e2611 |
comparison
equal
deleted
inserted
replaced
90184:9e5e2f01c7ab | 90185:5b029ff3b08d |
---|---|
416 ;; Files suffixed with `completion-ignored-extensions'. | 416 ;; Files suffixed with `completion-ignored-extensions'. |
417 '(eval . | 417 '(eval . |
418 ;; It is quicker to first find just an extension, then go back to the | 418 ;; It is quicker to first find just an extension, then go back to the |
419 ;; start of that file name. So we do this complex MATCH-ANCHORED form. | 419 ;; start of that file name. So we do this complex MATCH-ANCHORED form. |
420 (list (concat "\\(" (regexp-opt completion-ignored-extensions) "\\|#\\)$") | 420 (list (concat "\\(" (regexp-opt completion-ignored-extensions) "\\|#\\)$") |
421 '(".+" (dired-move-to-filename) nil (0 dired-ignored-face))))) | 421 '(".+" (dired-move-to-filename) nil (0 dired-ignored-face)))) |
422 ;; | |
423 ;; Files suffixed with `completion-ignored-extensions' | |
424 ;; plus a character put in by -F. | |
425 '(eval . | |
426 (list (concat "\\(" (regexp-opt completion-ignored-extensions) | |
427 "\\|#\\)[*=|]$") | |
428 '(".+" (progn | |
429 (end-of-line) | |
430 ;; If the last character is not part of the filename, | |
431 ;; move back to the start of the filename | |
432 ;; so it can be fontified. | |
433 ;; Otherwise, leave point at the end of the line; | |
434 ;; that way, nothing is fontified. | |
435 (unless (get-text-property (1- (point)) 'mouse-face) | |
436 (dired-move-to-filename))) | |
437 nil (0 dired-ignored-face)))) | |
438 ) | |
422 "Additional expressions to highlight in Dired mode.") | 439 "Additional expressions to highlight in Dired mode.") |
423 | 440 |
424 ;;; Macros must be defined before they are used, for the byte compiler. | 441 ;;; Macros must be defined before they are used, for the byte compiler. |
425 | 442 |
426 (defmacro dired-mark-if (predicate msg) | 443 (defmacro dired-mark-if (predicate msg) |
3161 (const :tag "Ask for each top directory only" top) | 3178 (const :tag "Ask for each top directory only" top) |
3162 (const :tag "Copy directories without asking" always)) | 3179 (const :tag "Copy directories without asking" always)) |
3163 :group 'dired) | 3180 :group 'dired) |
3164 | 3181 |
3165 (defun dired-dnd-popup-notice () | 3182 (defun dired-dnd-popup-notice () |
3166 (x-popup-dialog | 3183 (message-box |
3167 t | 3184 "Recursive copies not enabled.\nSee variable dired-recursive-copies.")) |
3168 '("Recursive copies not enabled.\nSee variable dired-recursive-copies." | |
3169 ("Ok" . nil)))) | |
3170 | 3185 |
3171 | 3186 |
3172 (defun dired-dnd-do-ask-action (uri) | 3187 (defun dired-dnd-do-ask-action (uri) |
3173 ;; No need to get actions and descriptions from the source, | 3188 ;; No need to get actions and descriptions from the source, |
3174 ;; we only have three actions anyway. | 3189 ;; we only have three actions anyway. |