From d0e7b67e10d3ecb34969c0af18ef6317fd96636d Mon Sep 17 00:00:00 2001 From: none Date: Tue, 24 Sep 2024 04:25:13 +0000 Subject: [PATCH] image-dired: quote file name fore search-forward-regexp For example when you have file with name "file[image].jpg". and use M-x image-dired you will have error: image-dired-list-tags: Invalid regexp: "Unmatched [ or [^" --- lisp/image/image-dired-dired.el | 2 +- lisp/image/image-dired-tags.el | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/image/image-dired-dired.el b/lisp/image/image-dired-dired.el index 7219a10..c4e82e9 100644 --- a/lisp/image/image-dired-dired.el +++ b/lisp/image/image-dired-dired.el @@ -383,7 +383,7 @@ matching tag will be marked in the Dired buffer." (file-name-directory curr-file))) (setq curr-file (file-name-nondirectory curr-file)) (goto-char (point-min)) - (when (search-forward-regexp (format "\\s %s[*@]?$" curr-file) nil t) + (when (search-forward-regexp (format "\\s %s[*@]?$" (regexp-quote curr-file)) nil t) (setq hits (+ hits 1)) (dired-mark 1)))) (message "%d files with matching tag marked" hits))) diff --git a/lisp/image/image-dired-tags.el b/lisp/image/image-dired-tags.el index 54595ad..828372e 100644 --- a/lisp/image/image-dired-tags.el +++ b/lisp/image/image-dired-tags.el @@ -79,7 +79,7 @@ FILE-TAGS is an alist in the following form: (setq file (car elt) tag (cdr elt)) (goto-char (point-min)) - (if (search-forward-regexp (format "^%s.*$" file) nil t) + (if (search-forward-regexp (format "^%s.*$" (regexp-quote file)) nil t) (progn (setq end (point)) (beginning-of-line) @@ -103,7 +103,7 @@ FILES can be a name of a single file (a string) or a list of file names." (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;" (regexp-quote file)) nil t) (end-of-line) (setq end (point)) (beginning-of-line) @@ -125,7 +125,7 @@ Value is a list of all tags for FILE." (image-dired-sane-db-file) (image-dired--with-db-file (let (end (tags "")) - (when (search-forward-regexp (format "^%s" file) nil t) + (when (search-forward-regexp (format "^%s" (regexp-quote file)) nil t) (end-of-line) (setq end (point)) (beginning-of-line) @@ -179,7 +179,7 @@ FILE-COMMENTS is an alist on the following form: (setq file (car elt) comment (cdr elt)) (goto-char (point-min)) - (if (search-forward-regexp (format "^%s.*$" file) nil t) + (if (search-forward-regexp (format "^%s.*$" (regexp-quote file)) nil t) (progn (setq end (point)) (beginning-of-line) @@ -236,7 +236,7 @@ Optionally use old comment from FILE as initial value." (image-dired-sane-db-file) (image-dired--with-db-file (let (end comment-beg-pos comment-end-pos comment) - (when (search-forward-regexp (format "^%s" file) nil t) + (when (search-forward-regexp (format "^%s" (regexp-quote file)) nil t) (end-of-line) (setq end (point)) (beginning-of-line) -- 2.44.2