Avoid problems when one tag/file is a substring of another

* lisp/image-dired.el (image-dired-remove-tag): End of filename is bound
by ";" and end of tag is bound by ";" or end of line.

diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 542701470e9e4c9ec10f5ebf7e365a7268ff5986..97fbd7bb1fbac13587cca8bdc33bc7e8384fc56b 100644 (file)
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -1111,11 +1111,12 @@ FILE-TAGS is an alist in the following form:
         (error "Files must be a string or a list of strings!")))
      (dolist (file files)
        (goto-char (point-min))
-       (when (search-forward-regexp (format "^%s" file) nil t)
+       (when (search-forward-regexp (format "^%s;" file) nil t)
         (end-of-line)
         (setq end (point))
         (beginning-of-line)
-        (when (search-forward-regexp (format "\\(;%s\\)" tag) end t)
+        (when (search-forward-regexp
+                (format "\\(;%s\\)\\($\\|;\\)" tag) end t)
           (delete-region (match-beginning 1) (match-end 1))
           ;; Check if file should still be in the database. If
           ;; it has no tags or comments, it will be removed.