aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-08-07 13:36:14 +0000
committerGerd Moellmann2001-08-07 13:36:14 +0000
commite8421604cdd386af0c32fb7cf698882ec6b74015 (patch)
tree7a274325d0e1ff8523c09cb1b66dcebfda268d9e
parent17fdcfc85dfad70b0e52221bd36bc6a90ec68d33 (diff)
downloademacs-e8421604cdd386af0c32fb7cf698882ec6b74015.tar.gz
emacs-e8421604cdd386af0c32fb7cf698882ec6b74015.zip
(tar-extract): Avoid generating a new buffer
for each file visited. From Markus Rost <rost@math.ohio-state.edu>.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/tar-mode.el18
2 files changed, 11 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0514c8b190b..2cb05fc7fba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12001-08-07 Gerd Moellmann <gerd@gnu.org> 12001-08-07 Gerd Moellmann <gerd@gnu.org>
2 2
3 * tar-mode.el (tar-extract): Avoid generating a new buffer
4 for each file visited. From Markus Rost <rost@math.ohio-state.edu>.
5
3 * textmodes/paragraphs.el (forward-sentence): Avoid building 6 * textmodes/paragraphs.el (forward-sentence): Avoid building
4 a regexp from sentence-end. From Kenichi Handa <handa@etl.go.jp>. 7 a regexp from sentence-end. From Kenichi Handa <handa@etl.go.jp>.
5 8
@@ -8,7 +11,7 @@
8 inserting it. 11 inserting it.
9 12
10 * image.el (image-type-regexps): For JPEG files, use a regexp 13 * image.el (image-type-regexps): For JPEG files, use a regexp
11 derived from the JPEG spec. 14 derived from the JFIF spec.
12 15
13 * image.el (image-type-regexps): Use `\`' instead of `^' in 16 * image.el (image-type-regexps): Use `\`' instead of `^' in
14 most regular expressions. 17 most regular expressions.
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index 86e05ac269e..2e1b8c5d5de 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -682,21 +682,17 @@ appear on disk when you save the tar-file's buffer."
682 (let* ((tar-buffer (current-buffer)) 682 (let* ((tar-buffer (current-buffer))
683 (tar-buffer-multibyte enable-multibyte-characters) 683 (tar-buffer-multibyte enable-multibyte-characters)
684 (tarname (buffer-name)) 684 (tarname (buffer-name))
685 (bufname (generate-new-buffer-name 685 (bufname (concat (file-name-nondirectory name)
686 (concat (file-name-nondirectory name) 686 " ("
687 " ("
688 tarname 687 tarname
689 ")"))) 688 ")"))
690 (read-only-p (or buffer-read-only view-p)) 689 (read-only-p (or buffer-read-only view-p))
691 (buffer (get-buffer bufname))
692 (just-created nil)
693 (new-buffer-file-name (expand-file-name 690 (new-buffer-file-name (expand-file-name
694 ;; `:' is not allowed on Windows 691 ;; `:' is not allowed on Windows
695 (concat tarname "!" name)))) 692 (concat tarname "!" name)))
696 (if (and buffer 693 (buffer (get-file-buffer new-buffer-file-name))
697 ;; Check that the buffer is visiting the same file 694 (just-created nil))
698 (equal (buffer-file-name buffer) new-buffer-file-name)) 695 (unless buffer
699 nil
700 (setq buffer (generate-new-buffer bufname)) 696 (setq buffer (generate-new-buffer bufname))
701 (setq bufname (buffer-name buffer)) 697 (setq bufname (buffer-name buffer))
702 (setq just-created t) 698 (setq just-created t)