aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorAndreas Schwab2003-12-25 11:06:14 +0000
committerAndreas Schwab2003-12-25 11:06:14 +0000
commit8290faa335bcb23063c9ee355ccfa1b6def202c6 (patch)
treee43dbc44b0321c27b66d33524240780a2fb419a2 /lisp
parent077347180056db5004312e8c095f4d524766bf80 (diff)
downloademacs-8290faa335bcb23063c9ee355ccfa1b6def202c6.tar.gz
emacs-8290faa335bcb23063c9ee355ccfa1b6def202c6.zip
(jka-compr-insert-file-contents): Avoid error when
file not found.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/jka-compr.el9
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c667e0b353..a865e943a11 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-12-25 Andreas Schwab <schwab@suse.de>
2
3 * jka-compr.el (jka-compr-insert-file-contents): Avoid error when
4 file not found.
5
12003-12-08 Miles Bader <miles@gnu.org> 62003-12-08 Miles Bader <miles@gnu.org>
2 7
3 * dired.el (dired-between-files): Always use dired-move-to-filename, 8 * dired.el (dired-between-files): Always use dired-move-to-filename,
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index dd56c9c0f31..aae0f0f85c1 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -590,10 +590,11 @@ There should be no more than seven characters after the final `/'."
590 (file-exists-p local-copy) 590 (file-exists-p local-copy)
591 (delete-file local-copy))) 591 (delete-file local-copy)))
592 592
593 (decode-coding-inserted-region 593 (unless notfound
594 (point) (+ (point) size) 594 (decode-coding-inserted-region
595 (jka-compr-byte-compiler-base-file-name file) 595 (point) (+ (point) size)
596 visit beg end replace) 596 (jka-compr-byte-compiler-base-file-name file)
597 visit beg end replace))
597 598
598 (and 599 (and
599 visit 600 visit