diff --git a/ChangeLog b/ChangeLog index 172f1ae2cf0daa07f0d38cce0d97eedf20dab1f3_Q2hhbmdlTG9n..49159d4e3211281cb1b84de94f847a9618a39616_Q2hhbmdlTG9n 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-07-15 SL Baur <steve@beopen.com> + + * jka-compr.el (jka-compr-install): Only diddle with + file-coding-system-alist in XEmacs with file-coding. + (jka-compr-uninstall): Ditto. + 1999-06-29 SL Baur <steve@miho.m17n.org> * Makefile (ELCS): ps-print.el removed. diff --git a/Makefile b/Makefile index 172f1ae2cf0daa07f0d38cce0d97eedf20dab1f3_TWFrZWZpbGU=..49159d4e3211281cb1b84de94f847a9618a39616_TWFrZWZpbGU= 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ # This XEmacs package contains independent single file lisp packages -VERSION = 1.16 +VERSION = 1.17 AUTHOR_VERSION = MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org> PACKAGE = os-utils diff --git a/jka-compr.el b/jka-compr.el index 172f1ae2cf0daa07f0d38cce0d97eedf20dab1f3_amthLWNvbXByLmVs..49159d4e3211281cb1b84de94f847a9618a39616_amthLWNvbXByLmVs 100644 --- a/jka-compr.el +++ b/jka-compr.el @@ -840,8 +840,9 @@ (setq file-name-handler-alist (cons jka-compr-file-name-handler-entry file-name-handler-alist)) - (setq jka-compr-added-to-file-coding-system-alist nil) + (when (boundp 'file-coding-system-alist) + (setq jka-compr-added-to-file-coding-system-alist nil)) (mapcar (function (lambda (x) ;; Don't do multibyte encoding on the compressed files. @@ -844,10 +845,11 @@ (mapcar (function (lambda (x) ;; Don't do multibyte encoding on the compressed files. + (when (boundp 'file-coding-system-alist) (let ((elt (cons (jka-compr-info-regexp x) '(no-conversion . no-conversion)))) (setq file-coding-system-alist (cons elt file-coding-system-alist)) (setq jka-compr-added-to-file-coding-system-alist (cons elt jka-compr-added-to-file-coding-system-alist))) @@ -848,10 +850,10 @@ (let ((elt (cons (jka-compr-info-regexp x) '(no-conversion . no-conversion)))) (setq file-coding-system-alist (cons elt file-coding-system-alist)) (setq jka-compr-added-to-file-coding-system-alist (cons elt jka-compr-added-to-file-coding-system-alist))) - + ) (and (jka-compr-info-strip-extension x) ;; Make entries in auto-mode-alist so that modes ;; are chosen right according to the file names @@ -916,6 +918,7 @@ (setq auto-mode-alist (cdr ama))) + (when (boundp 'file-coding-system-alist) (let* ((ama (cons nil file-coding-system-alist)) (last ama) entry) @@ -927,7 +930,7 @@ (setq last (cdr last)))) (setq file-coding-system-alist (cdr ama)))) - +) (defun jka-compr-installed-p () "Return non-nil if jka-compr is installed.