# HG changeset patch # User Juri Linkov # Date 1208904465 0 # Node ID 4cca1963bd3768bb41fec2e7de92686ca99c3888 # Parent 8e1e3b9425df5d7e0a15d5c763901cee179da636 (image-dired-track-original-file) (image-dired-modify-mark-on-thumb-original-file): Use `dired-goto-file' instead of `search-forward'. This solves a bug with finding files where the file name is a subset of other file names. Doc fix. diff -r 8e1e3b9425df -r 4cca1963bd37 lisp/image-dired.el --- a/lisp/image-dired.el Tue Apr 22 20:39:20 2008 +0000 +++ b/lisp/image-dired.el Tue Apr 22 22:47:45 2008 +0000 @@ -1030,12 +1030,9 @@ (dired-buf (image-dired-associated-dired-buffer)) (file-name (image-dired-original-file-name))) (when (and (buffer-live-p dired-buf) file-name) - (setq file-name (file-name-nondirectory file-name)) (set-buffer dired-buf) - (goto-char (point-min)) - (if (not (search-forward file-name nil t)) + (if (not (dired-goto-file file-name)) (message "Could not track file") - (dired-move-to-filename) (set-window-point (image-dired-get-buffer-window dired-buf) (point))) (set-buffer old-buf)))) @@ -1199,8 +1196,7 @@ (defun image-dired-modify-mark-on-thumb-original-file (command) "Modify mark in dired buffer. -This is quite ugly but I don't know how to implemented in a better -way. COMMAND is one of 'mark for marking file in dired, 'unmark for +COMMAND is one of 'mark for marking file in dired, 'unmark for unmarking file in dired or 'flag for flagging file for delete in dired." (let ((file-name (image-dired-original-file-name)) @@ -1209,9 +1205,7 @@ (message "No image, or image with correct properties, at point.") (with-current-buffer dired-buf (message "%s" file-name) - (setq file-name (file-name-nondirectory file-name)) - (goto-char (point-min)) - (if (search-forward file-name nil t) + (if (dired-goto-file file-name) (cond ((eq command 'mark) (dired-mark 1)) ((eq command 'unmark) (dired-unmark 1)) ((eq command 'toggle)