diff options
| author | Richard M. Stallman | 1998-06-14 19:01:34 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-06-14 19:01:34 +0000 |
| commit | 5c6f2f2a477cc27374db11077745e62cb30aaeb2 (patch) | |
| tree | 31bc5956de370cb831b53259d355fbd7dee9e1c9 | |
| parent | 7a784f27db9875b8efcb7e71d87769281463f2a0 (diff) | |
| download | emacs-5c6f2f2a477cc27374db11077745e62cb30aaeb2.tar.gz emacs-5c6f2f2a477cc27374db11077745e62cb30aaeb2.zip | |
(jka-compr-insert-file-contents): Don't run
after-insert-file-functions, since caller does that.
| -rw-r--r-- | lisp/jka-compr.el | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 0ee24e94c66..23c4eccf674 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el | |||
| @@ -613,18 +613,22 @@ There should be no more than seven characters after the final `/'." | |||
| 613 | (signal 'file-error | 613 | (signal 'file-error |
| 614 | (cons "Opening input file" (nth 2 notfound)))) | 614 | (cons "Opening input file" (nth 2 notfound)))) |
| 615 | 615 | ||
| 616 | ;; Run the functions that insert-file-contents would. | 616 | ;; This is done in insert-file-contents after we return. |
| 617 | (let ((p after-insert-file-functions) | 617 | ;; That is a little weird, but better to go along with it now |
| 618 | (insval size)) | 618 | ;; than to change it now. |
| 619 | (while p | 619 | |
| 620 | (setq insval (funcall (car p) size)) | 620 | ;;; ;; Run the functions that insert-file-contents would. |
| 621 | (if insval | 621 | ;;; (let ((p after-insert-file-functions) |
| 622 | (progn | 622 | ;;; (insval size)) |
| 623 | (or (integerp insval) | 623 | ;;; (while p |
| 624 | (signal 'wrong-type-argument | 624 | ;;; (setq insval (funcall (car p) size)) |
| 625 | (list 'integerp insval))) | 625 | ;;; (if insval |
| 626 | (setq size insval))) | 626 | ;;; (progn |
| 627 | (setq p (cdr p)))) | 627 | ;;; (or (integerp insval) |
| 628 | ;;; (signal 'wrong-type-argument | ||
| 629 | ;;; (list 'integerp insval))) | ||
| 630 | ;;; (setq size insval))) | ||
| 631 | ;;; (setq p (cdr p)))) | ||
| 628 | 632 | ||
| 629 | (list filename size)) | 633 | (list filename size)) |
| 630 | 634 | ||