diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-13 10:27:36 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-13 10:27:36 -0500 |
| commit | f49d1f52b2e368ef67dcfececd426de958548f4e (patch) | |
| tree | ce24ced92f2acc976daf4b69e3634c8bd600e44e /lisp/image-dired.el | |
| parent | 07176b2a9e63a0d3933b167f987475d8a18da5cc (diff) | |
| parent | 11aad4e9f9f54ce8e9ecc66347e512b20a3cdf39 (diff) | |
| download | emacs-f49d1f52b2e368ef67dcfececd426de958548f4e.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/image-dired.el')
| -rw-r--r-- | lisp/image-dired.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/image-dired.el b/lisp/image-dired.el index a74ddd312d5..565448c854e 100644 --- a/lisp/image-dired.el +++ b/lisp/image-dired.el @@ -187,19 +187,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." @@ -344,7 +344,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) |