From: Lars Ingebrigtsen Date: Thu, 24 Dec 2015 21:47:58 +0000 (+0100) Subject: Make prettier unique file names in eww X-Git-Tag: emacs-25.0.90~394 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a7143faf482d9b30c120ff969b1a75f1de7f8017;p=emacs.git Make prettier unique file names in eww (eww-make-unique-file-name): Make unique file names by making files like foo(2).jpg instead of foo(1)(2).jpg. Backport: (cherry picked from commit edfdd0a6cbdfa9e5e4bd0553e2b489401ca39266) --- diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 90ddd05b845..a22664bfbb5 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -1438,13 +1438,14 @@ Differences in #targets are ignored." (setq file "!")) ((string-match "\\`[.]" file) (setq file (concat "!" file)))) - (let ((count 1)) + (let ((count 1) + (stem file) + (suffix "")) + (when (string-match "\\`\\(.*\\)\\([.][^.]+\\)" file) + (setq stem (match-string 1) + suffix (match-string 2))) (while (file-exists-p (expand-file-name file directory)) - (setq file - (if (string-match "\\`\\(.*\\)\\([.][^.]+\\)" file) - (format "%s(%d)%s" (match-string 1 file) - count (match-string 2 file)) - (format "%s(%d)" file count))) + (setq file (format "%s(%d)%s" stem count suffix)) (setq count (1+ count))) (expand-file-name file directory)))