[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100277: Initialize image-dired auxilliary filenames relative to image-dired-dirs (Bug#7518).

[Chong Yidong]

------------------------------------------------------------
revno: 100277
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Mon 2010-12-06 14:45:31 -0500
message:
  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).
modified:
  lisp/ChangeLog
  lisp/image-dired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-06 19:35:54 +0000
+++ b/lisp/ChangeLog    2010-12-06 19:45:31 +0000
@@ -1,3 +1,10 @@
+2010-12-06  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * format.el (format-decode-run-method): Pass args FROM and TO, not

=== modified file 'lisp/image-dired.el'
--- a/lisp/image-dired.el       2010-03-22 16:50:29 +0000
+++ b/lisp/image-dired.el       2010-12-06 19:45:31 +0000
@@ -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)