summaryrefslogtreecommitdiff
path: root/lisp/image-dired.el
diff options
context:
space:
mode:
authorSam Steingold <sds@gnu.org>2012-06-26 12:23:01 -0400
committerSam Steingold <sds@gnu.org>2012-06-26 12:23:01 -0400
commitd2c32364fd1873a6e9cfa52d2531dfbe500ad297 (patch)
treef567c36975e6d137b55ecca8ddf856cfe6e7de0d /lisp/image-dired.el
parent62efea5e881407a178c5c291575facc17dca8a3f (diff)
downloademacs-d2c32364fd1873a6e9cfa52d2531dfbe500ad297.tar.gz
* lisp/files.el (file-name-base): New convenience function.
* lisp/autoinsert.el, lisp/cus-dep.el, lisp/doc-view.el, lisp/image-dired.el, * lisp/woman.el, lisp/eshell/esh-cmd.el, lisp/progmodes/ada-xref.el, * lisp/progmodes/cc-defs.el, lisp/progmodes/cperl-mode.el, * lisp/progmodes/flymake.el, lisp/progmodes/gud.el, lisp/progmodes/idlwave.el, * lisp/textmodes/ispell.el, lisp/textmodes/reftex-ref.el, * lisp/textmodes/tex-mode.el: Use it. Did not touch cedet and org because they are maintained elsewhere.
Diffstat (limited to 'lisp/image-dired.el')
-rw-r--r--lisp/image-dired.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 8151985e747..9fc0a2cb51a 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -602,14 +602,14 @@ according to the Thumbnail Managing Standard."
(md5 (file-name-as-directory (file-name-directory f)))))
(format "%s%s%s.thumb.%s"
(file-name-as-directory (expand-file-name (image-dired-dir)))
- (file-name-sans-extension (file-name-nondirectory f))
+ (file-name-base f)
(if md5-hash (concat "_" md5-hash) "")
(file-name-extension f))))
((eq 'per-directory image-dired-thumbnail-storage)
(let ((f (expand-file-name file)))
(format "%s.image-dired/%s.thumb.%s"
(file-name-directory f)
- (file-name-sans-extension (file-name-nondirectory f))
+ (file-name-base f)
(file-name-extension f))))))
(defun image-dired-create-thumb (original-file thumbnail-file)