(texinfo-mode): Change charset of one quotation mark

[gnu-emacs] / lisp / thumbs.el

diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 0fa44a3b8ee9fc9734b0835f8ce5936ded6e68be..9a41507e41004ecb4b22e9af89a2ba1f7fe2de43 100644 (file)
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -1,6 +1,6 @@
 ;;; thumbs.el --- Thumbnails previewer for images files
 
-;; Copyright 2004, 2005 Free Software Foundation, Inc
+;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
 ;; Keywords: Multimedia
@@ -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
@@ -138,23 +138,25 @@ this value can let another user see some of your images."
   :group 'thumbs)
 
 ;; Initialize some variable, for later use.
-(defvar thumbs-current-tmp-filename
-  nil
+(defvar thumbs-current-tmp-filename nil
   "Temporary filename of current image.")
-(defvar thumbs-current-image-filename
-  nil
+(make-variable-buffer-local 'thumbs-current-tmp-filename)
+
+(defvar thumbs-current-image-filename nil
   "Filename of current image.")
-(defvar thumbs-current-image-size
-  nil
+(make-variable-buffer-local 'thumbs-current-image-filename)
+
+(defvar thumbs-current-image-size nil
   "Size of current image.")
-(defvar thumbs-image-num
-  nil
+
+(defvar thumbs-image-num nil
   "Number of current image.")
-(defvar thumbs-current-dir
-  nil
+(make-variable-buffer-local 'thumbs-image-num)
+
+(defvar thumbs-current-dir nil
   "Current directory.")
-(defvar thumbs-markedL
-  nil
+
+(defvar thumbs-markedL nil
   "List of marked files.")
 
 (defalias 'thumbs-gensym
@@ -172,17 +174,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 +273,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 +312,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
@@ -333,6 +339,7 @@ Or, alternatively, a SIZE may be specified."
   (cond ((string-match ".*\\.jpe?g\\'" img) 'jpeg)
        ((string-match ".*\\.xpm\\'" img) 'xpm)
        ((string-match ".*\\.xbm\\'" img) 'xbm)
+       ((string-match ".*\\.pbm\\'" img) 'pbm)
        ((string-match ".*\\.gif\\'" img) 'gif)
        ((string-match ".*\\.bmp\\'" img) 'bmp)
        ((string-match ".*\\.png\\'" img) 'png)
@@ -361,8 +368,8 @@ If MARKED is non-nil, the image is marked."
                   :conversion ,(if marked 'disabled)
                   :margin ,thumbs-margin)))
     (insert-image i)
-    (setq thumbs-current-image-size
-         (image-size i t))))
+    (set (make-local-variable 'thumbs-current-image-size)
+         (image-size i t))))
 
 (defun thumbs-insert-thumb (img &optional marked)
   "Insert the thumbnail for IMG at point.
@@ -393,8 +400,7 @@ If MARKED is non-nil, the image is marked."
     (thumbs-mode)
     (thumbs-do-thumbs-insertion L)
     (goto-char (point-min))
-    (setq thumbs-current-dir default-directory)
-    (make-variable-buffer-local 'thumbs-current-dir)))
+    (set (make-local-variable 'thumbs-current-dir) default-directory)))
 
 ;;;###autoload
 (defun thumbs-show-all-from-dir (dir &optional reg same-window)
@@ -432,10 +438,6 @@ and SAME-WINDOW to show thumbs in the same window."
     (setq thumbs-current-image-filename img
          thumbs-current-tmp-filename nil
          thumbs-image-num (or num 0))
-    (make-variable-buffer-local 'thumbs-current-image-filename)
-    (make-variable-buffer-local 'thumbs-current-tmp-filename)
-    (make-variable-buffer-local 'thumbs-current-image-size)
-    (make-variable-buffer-local 'thumbs-image-num)
     (delete-region (point-min)(point-max))
     (thumbs-insert-image img (thumbs-image-type img) 0)))
 
@@ -637,7 +639,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)