lisp/progmodes/prog-mode.el: Force font-lock to deal with `composition' prop.

[bpt/emacs.git] / lisp / find-dired.el

diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 9c1c8ee..f9a0c01 100644 (file)
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -1,6 +1,7 @@
 ;;; find-dired.el --- run a `find' command and dired the output
 
-;; Copyright (C) 1992, 1994-1995, 2000-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994-1995, 2000-2013 Free Software Foundation,
+;; Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>,
 ;;        Sebastian Kremer <sk@thp.uni-koeln.de>
@@ -209,13 +210,15 @@ use in place of \"-ls\" as the final argument."
     (insert "  " dir ":\n")
     ;; Make second line a ``find'' line in analogy to the ``total'' or
     ;; ``wildcard'' line.
-    (insert "  " args "\n")
+    (let ((point (point)))
+      (insert "  " args "\n")
+      (dired-insert-set-properties point (point)))
     (setq buffer-read-only t)
     (let ((proc (get-buffer-process (current-buffer))))
       (set-process-filter proc (function find-dired-filter))
       (set-process-sentinel proc (function find-dired-sentinel))
       ;; Initialize the process marker; it is used by the filter.
-      (move-marker (process-mark proc) 1 (current-buffer)))
+      (move-marker (process-mark proc) (point) (current-buffer)))
     (setq mode-line-process '(":%s"))))
 
 (defun kill-find ()
@@ -336,10 +339,11 @@ use in place of \"-ls\" as the final argument."
          (let ((buffer-read-only nil))
            (save-excursion
              (goto-char (point-max))
-             (insert "\n  find " state)
-             (forward-char -1)         ;Back up before \n at end of STATE.
-             (insert " at " (substring (current-time-string) 0 19))
-             (forward-char 1)
+             (let ((point (point)))
+               (insert "\n  find " state)
+               (forward-char -1)               ;Back up before \n at end of STATE.
+               (insert " at " (substring (current-time-string) 0 19))
+               (dired-insert-set-properties point (point)))
              (setq mode-line-process
                    (concat ":"
                            (symbol-name (process-status proc))))