comparison lisp/image-dired.el @ 91040:14c4a6aac623

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 866-879) - Merge multi-tty branch - Update from CVS - Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
author Miles Bader <miles@gnu.org>
date Thu, 11 Oct 2007 16:14:00 +0000
parents 6351a7ed5ae4
children 786d3a985758
comparison
equal deleted inserted replaced
91039:eefadc1e1d5e 91040:14c4a6aac623
818 (with-current-buffer buf 818 (with-current-buffer buf
819 (let ((inhibit-read-only t)) 819 (let ((inhibit-read-only t))
820 (if (not append) 820 (if (not append)
821 (erase-buffer) 821 (erase-buffer)
822 (goto-char (point-max))) 822 (goto-char (point-max)))
823 (mapcar 823 (mapc
824 (lambda (curr-file) 824 (lambda (curr-file)
825 (setq thumb-name (image-dired-thumb-name curr-file)) 825 (setq thumb-name (image-dired-thumb-name curr-file))
826 (if (and (not (file-exists-p thumb-name)) 826 (if (and (not (file-exists-p thumb-name))
827 (not (= 0 (image-dired-create-thumb curr-file thumb-name)))) 827 (not (= 0 (image-dired-create-thumb curr-file thumb-name))))
828 (message "Thumb could not be created for file %s" curr-file) 828 (message "Thumb could not be created for file %s" curr-file)
916 (setq buf (find-file image-dired-db-file)) 916 (setq buf (find-file image-dired-db-file))
917 (if (not (listp files)) 917 (if (not (listp files))
918 (if (stringp files) 918 (if (stringp files)
919 (setq files (list files)) 919 (setq files (list files))
920 (error "Files must be a string or a list of strings!"))) 920 (error "Files must be a string or a list of strings!")))
921 (mapcar 921 (mapc
922 (lambda (file) 922 (lambda (file)
923 (goto-char (point-min)) 923 (goto-char (point-min))
924 (when (search-forward-regexp 924 (when (search-forward-regexp
925 (format "^%s" file) nil t) 925 (format "^%s" file) nil t)
926 (end-of-line) 926 (end-of-line)
1852 (image-dired-create-display-image-buffer) 1852 (image-dired-create-display-image-buffer)
1853 (display-buffer image-dired-display-image-buffer) 1853 (display-buffer image-dired-display-image-buffer)
1854 (image-dired-display-image (dired-get-filename) arg)) 1854 (image-dired-display-image (dired-get-filename) arg))
1855 1855
1856 (defun image-dired-image-at-point-p () 1856 (defun image-dired-image-at-point-p ()
1857 "Return true if there is a image-dired thumbnail at point." 1857 "Return true if there is an image-dired thumbnail at point."
1858 (get-text-property (point) 'image-dired-thumbnail)) 1858 (get-text-property (point) 'image-dired-thumbnail))
1859 1859
1860 (defun image-dired-rotate-thumbnail (degrees) 1860 (defun image-dired-rotate-thumbnail (degrees)
1861 "Rotate thumbnail DEGREES degrees." 1861 "Rotate thumbnail DEGREES degrees."
1862 (if (not (image-dired-image-at-point-p)) 1862 (if (not (image-dired-image-at-point-p))
2168 (while (search-forward-regexp 2168 (while (search-forward-regexp
2169 (concat "\\(^[^;\n]+\\);.*" tag ".*$") nil t) 2169 (concat "\\(^[^;\n]+\\);.*" tag ".*$") nil t)
2170 (setq files (append (list (match-string 1)) files))) 2170 (setq files (append (list (match-string 1)) files)))
2171 (kill-buffer buf) 2171 (kill-buffer buf)
2172 ;; Mark files 2172 ;; Mark files
2173 (mapcar 2173 (mapc
2174 ;; I tried using `dired-mark-files-regexp' but it was 2174 ;; I tried using `dired-mark-files-regexp' but it was
2175 ;; waaaay to slow. 2175 ;; waaaay to slow.
2176 (lambda (curr-file) 2176 (lambda (curr-file)
2177 ;; Don't bother about hits found in other directories than 2177 ;; Don't bother about hits found in other directories than
2178 ;; the current one. 2178 ;; the current one.