HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnus-html.el (gnus-html-wash-tags): Remove all <pre_int> place holders.
[bpt/emacs.git]
/
lisp
/
thumbs.el
diff --git
a/lisp/thumbs.el
b/lisp/thumbs.el
index
5260d5a
..
f9f97b1
100644
(file)
--- a/
lisp/thumbs.el
+++ b/
lisp/thumbs.el
@@
-1,6
+1,6
@@
;;; thumbs.el --- Thumbnails previewer for images files
;;; thumbs.el --- Thumbnails previewer for images files
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008
, 2009, 2010
Free Software Foundation, Inc.
;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
;; Maintainer: FSF
;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
;; Maintainer: FSF
@@
-8,10
+8,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+19,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-67,13
+65,13
@@
:version "22.1"
:group 'multimedia)
:version "22.1"
:group 'multimedia)
-(defcustom thumbs-thumbsdir (
concat user-emacs-directory
"thumbs")
- "
*
Directory to store thumbnails."
+(defcustom thumbs-thumbsdir (
locate-user-emacs-file
"thumbs")
+ "Directory to store thumbnails."
:type 'directory
:group 'thumbs)
(defcustom thumbs-geometry "100x100"
:type 'directory
:group 'thumbs)
(defcustom thumbs-geometry "100x100"
- "
*
Size of thumbnails."
+ "Size of thumbnails."
:type 'string
:group 'thumbs)
:type 'string
:group 'thumbs)
@@
-102,7
+100,7
@@
When it reaches that size (in bytes), a warning is sent."
"convert.exe"
(or (executable-find "convert")
"/usr/X11R6/bin/convert"))
"convert.exe"
(or (executable-find "convert")
"/usr/X11R6/bin/convert"))
- "
*
Name of conversion program for thumbnails generation.
+ "Name of conversion program for thumbnails generation.
It must be 'convert'."
:type 'string
:group 'thumbs)
It must be 'convert'."
:type 'string
:group 'thumbs)
@@
-114,12
+112,12
@@
It must be 'convert'."
:group 'thumbs)
(defcustom thumbs-relief 5
:group 'thumbs)
(defcustom thumbs-relief 5
- "
*
Size of button-like border around thumbnails."
+ "Size of button-like border around thumbnails."
:type 'integer
:group 'thumbs)
(defcustom thumbs-margin 2
:type 'integer
:group 'thumbs)
(defcustom thumbs-margin 2
- "
*
Size of the margin around thumbnails.
+ "Size of the margin around thumbnails.
This is where you see the cursor."
:type 'integer
:group 'thumbs)
This is where you see the cursor."
:type 'integer
:group 'thumbs)
@@
-336,6
+334,8
@@
smaller according to whether INCREMENT is 1 or -1."
((string-match ".*\\.png\\'" img) 'png)
((string-match ".*\\.tiff?\\'" img) 'tiff)))
((string-match ".*\\.png\\'" img) 'png)
((string-match ".*\\.tiff?\\'" img) 'tiff)))
+(declare-function image-size "image.c" (spec &optional pixels frame))
+
(defun thumbs-file-size (img)
(let ((i (image-size
(find-image `((:type ,(thumbs-image-type img) :file ,img))) t)))
(defun thumbs-file-size (img)
(let ((i (image-size
(find-image `((:type ,(thumbs-image-type img) :file ,img))) t)))