(custom-initialize-safe-set, custom-initialize-safe-default): Doc fixes.

[gnu-emacs] / lisp / thumbs.el

diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 0fa44a3b8ee9fc9734b0835f8ce5936ded6e68be..478fb0b65281381ab615d8cfa555d623acebfc70 100644 (file)
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 ;;
 ;; Thanks: Alex Schroeder <alex@gnu.org> for maintaining the package at some time
 ;;         The peoples at #emacs@freenode.net for numerous help
@@ -77,13 +77,13 @@
 
 (defcustom thumbs-per-line 5
   "*Number of thumbnails per line to show in directory."
-  :type 'string
+  :type 'integer
   :group 'thumbs)
 
 (defcustom thumbs-thumbsdir-max-size 50000000
   "Max size for thumbnails directory.
 When it reaches that size (in bytes), a warning is sent."
-  :type 'string
+  :type 'integer
   :group 'thumbs)
 
 (defcustom thumbs-conversion-program
@@ -104,13 +104,13 @@ It must be 'convert'."
 
 (defcustom thumbs-relief 5
   "*Size of button-like border around thumbnails."
-  :type 'string
+  :type 'integer
   :group 'thumbs)
 
 (defcustom thumbs-margin 2
   "*Size of the margin around thumbnails.
 This is where you see the cursor."
-  :type 'string
+  :type 'integer
   :group 'thumbs)
 
 (defcustom thumbs-thumbsdir-auto-clean t
@@ -122,7 +122,7 @@ than `thumbs-thumbsdir-max-size'."
 
 (defcustom thumbs-image-resizing-step 10
   "Step by which to resize image."
-  :type 'string
+  :type 'integer
   :group 'thumbs)
 
 (defcustom thumbs-temp-dir temporary-file-directory
@@ -172,17 +172,21 @@ The name is made by appending a number to PREFIX, default \"G\"."
                             (1+ thumbs-gensym-counter))))))
          (make-symbol (format "%s%d" pfix num))))))
 
+(defsubst thumbs-temp-dir ()
+  (file-name-as-directory (expand-file-name thumbs-temp-dir)))
+
 (defun thumbs-temp-file ()
   "Return a unique temporary filename for an image."
   (format "%s%s-%s.jpg"
-          (expand-file-name thumbs-temp-dir)
+          (thumbs-temp-dir)
           thumbs-temp-prefix
           (thumbs-gensym "T")))
 
 (defun thumbs-thumbsdir ()
   "Return the current thumbnails directory (from `thumbs-thumbsdir').
 Create the thumbnails directory if it does not exist."
-  (let ((thumbs-thumbsdir (expand-file-name thumbs-thumbsdir)))
+  (let ((thumbs-thumbsdir (file-name-as-directory
+                           (expand-file-name thumbs-thumbsdir))))
     (unless (file-directory-p thumbs-thumbsdir)
       (make-directory thumbs-thumbsdir)
       (message "Creating thumbnails directory"))
@@ -267,7 +271,7 @@ Or, alternatively, a SIZE may be specified."
   (condition-case nil
     (apply 'delete-file
           (directory-files
-           thumbs-temp-dir t
+           (thumbs-temp-dir) t
            thumbs-temp-prefix))
     (error nil))
   (let ((buffer-read-only nil)
@@ -306,7 +310,7 @@ Or, alternatively, a SIZE may be specified."
   "Return a thumbnail name for the image IMG."
   (convert-standard-filename
    (let ((filename (expand-file-name img)))
-     (format "%s/%08x-%s.jpg"
+     (format "%s%08x-%s.jpg"
              (thumbs-thumbsdir)
              (sxhash filename)
              (subst-char-in-string
@@ -637,7 +641,7 @@ ACTION and ARG should be a valid convert command."
   ;; cleaning of old temp file
   (mapc 'delete-file
        (directory-files
-        thumbs-temp-dir
+        (thumbs-temp-dir)
         t
         thumbs-temp-prefix))
   (let ((buffer-read-only nil)