Mercurial > emacs
changeset 111914:f773f82f2c63
Initialize image-dired auxilliary filenames relative to image-dired-dirs (Bug#7518).
* image-dired.el (image-dired-db-file)
(image-dired-temp-image-file, image-dired-gallery-dir)
(image-dired-temp-rotate-image-file): Set default values relative
to image-dired-dir (Bug#7518).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 06 Dec 2010 14:45:31 -0500 |
| parents | 5510dd208e55 |
| children | b9fb819345d9 |
| files | lisp/ChangeLog lisp/image-dired.el |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Dec 06 14:35:54 2010 -0500 +++ b/lisp/ChangeLog Mon Dec 06 14:45:31 2010 -0500 @@ -1,3 +1,10 @@ +2010-12-06 Chong Yidong <cyd@stupidchicken.com> + + * image-dired.el (image-dired-db-file) + (image-dired-temp-image-file, image-dired-gallery-dir) + (image-dired-temp-rotate-image-file): Set default values relative + to image-dired-dir (Bug#7518). + 2010-12-06 Lawrence Mitchell <lawrence.mitchell@ed.ac.uk> * format.el (format-decode-run-method): Pass args FROM and TO, not
--- a/lisp/image-dired.el Mon Dec 06 14:35:54 2010 -0500 +++ b/lisp/image-dired.el Mon Dec 06 14:45:31 2010 -0500 @@ -186,19 +186,19 @@ :group 'image-dired) (defcustom image-dired-db-file - (locate-user-emacs-file "image-dired/.image-dired_db") + (expand-file-name ".image-dired_db" image-dired-dir) "Database file where file names and their associated tags are stored." :type 'string :group 'image-dired) (defcustom image-dired-temp-image-file - (locate-user-emacs-file "image-dired/.image-dired_temp") + (expand-file-name ".image-dired_temp" image-dired-dir) "Name of temporary image file used by various commands." :type 'string :group 'image-dired) (defcustom image-dired-gallery-dir - (locate-user-emacs-file "image-dired/.image-dired_gallery") + (expand-file-name ".image-dired_gallery" image-dired-dir) "Directory to store generated gallery html pages. This path needs to be \"shared\" to the public so that it can access the index.html page that image-dired creates." @@ -343,7 +343,7 @@ :group 'image-dired) (defcustom image-dired-temp-rotate-image-file - (locate-user-emacs-file "image-dired/.image-dired_rotate_temp") + (expand-file-name ".image-dired_rotate_temp" image-dired-dir) "Temporary file for rotate operations." :type 'string :group 'image-dired)