X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9898bd0e5b0e51ce9040e11ae25c9a07ec08eb4f..abe07ef01ccb61968e6aebc1178dbefb683a27ae:/lisp/thumbs.el

diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 6ac8eddc9d..d8bb8cb34f 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -1,9 +1,9 @@
 ;;; thumbs.el --- Thumbnails previewer for images files
 
-;; Copyright (C) 2004-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
 
 ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: Multimedia
 
 ;; This file is part of GNU Emacs.
@@ -57,6 +57,7 @@
 ;;; Code:
 
 (require 'dired)
+(require 'cl-lib)			; for cl-gensym
 
 ;; CUSTOMIZATIONS
 
@@ -92,7 +93,7 @@ When it reaches that size (in bytes), a warning is sent."
   :group 'thumbs)
 
 ;; Unfortunately Windows XP has a program called CONVERT.EXE in
-;; C:/WINDOWS/SYSTEM32/ for partioning NTFS system.  So Emacs
+;; C:/WINDOWS/SYSTEM32/ for partitioning NTFS systems.  So Emacs
 ;; can find the one in your ImageMagick directory, you need to
 ;; customize this value to the absolute filename.
 (defcustom thumbs-conversion-program
@@ -179,21 +180,6 @@ this value can let another user see some of your images."
 (make-variable-buffer-local 'thumbs-marked-list)
 (put 'thumbs-marked-list 'permanent-local t)
 
-(defalias 'thumbs-gensym
-    (if (fboundp 'gensym)
-        'gensym
-      ;; Copied from cl-macs.el
-      (defvar thumbs-gensym-counter 0)
-      (lambda (&optional prefix)
-	"Generate a new uninterned symbol.
-The name is made by appending a number to PREFIX, default \"G\"."
-	(let ((pfix (if (stringp prefix) prefix "G"))
-	      (num (if (integerp prefix) prefix
-		     (prog1 thumbs-gensym-counter
-		       (setq thumbs-gensym-counter
-			     (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)))
 
@@ -202,7 +188,7 @@ The name is made by appending a number to PREFIX, default \"G\"."
   (format "%s%s-%s.jpg"
           (thumbs-temp-dir)
           thumbs-temp-prefix
-          (thumbs-gensym "T")))
+          (cl-gensym "T")))
 
 (defun thumbs-thumbsdir ()
   "Return the current thumbnails directory (from `thumbs-thumbsdir').
@@ -235,7 +221,7 @@ reached."
       (setq dirsize (- dirsize (car (cdar files-list))))
       (setq files-list (cdr files-list)))))
 
-;; Check the thumbsnail directory size and clean it if necessary.
+;; Check the thumbnail directory size and clean it if necessary.
 (when thumbs-thumbsdir-auto-clean
   (thumbs-cleanup-thumbsdir))