diff options
Diffstat (limited to 'lisp/dired.el')
| -rw-r--r-- | lisp/dired.el | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index 43f05dcf881..b0d86297e71 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -418,7 +418,24 @@ Subexpression 2 must end right before the \\n or \\r.") ;; 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-move-to-filename) nil (0 dired-ignored-face))))) + '(".+" (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)))) +) "Additional expressions to highlight in Dired mode.") ;;; Macros must be defined before they are used, for the byte compiler. @@ -3163,10 +3180,8 @@ Anything else means ask for each directory." :group 'dired) (defun dired-dnd-popup-notice () - (x-popup-dialog - t - '("Recursive copies not enabled.\nSee variable dired-recursive-copies." - ("Ok" . nil)))) + (message-box + "Recursive copies not enabled.\nSee variable dired-recursive-copies.")) (defun dired-dnd-do-ask-action (uri) |