diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-12-06 14:45:31 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-12-06 14:45:31 -0500 |
| commit | bc60f4de593965f51944d8916bba9311433d23db (patch) | |
| tree | 240db87310c0a2ff9d27ca4858bfe137d3be8e09 | |
| parent | 3ecba0495e877769d3b29f67f0648af39352edb8 (diff) | |
| download | emacs-bc60f4de593965f51944d8916bba9311433d23db.tar.gz | |
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).
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/image-dired.el | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 88fcbc850be..a758e7f0a7f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/image-dired.el b/lisp/image-dired.el index f006e2e9edd..730dd1aadc8 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -186,19 +186,19 @@ that allows sharing of thumbnails across different programs." :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 @@ original image file name and %t which is replaced by :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) |