[Tramp-checkins] CVS: tramp/lisp ChangeLog,2.48,2.49 tramp.el,2.51,2.52

[Kai Gro?j. <ka...@us...>]

Update of /cvsroot/tramp/tramp/lisp
In directory usw-pr-cvs1:/tmp/cvs-serv28103/tramp/lisp

Modified Files:
	ChangeLog tramp.el 
Log Message:
(toplevel): Don't barf if jka-compr is already loaded.
Instead, make sure that jka-compr comes first in
file-name-handler-alist.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v
retrieving revision 2.48
retrieving revision 2.49
diff -C2 -d -r2.48 -r2.49
*** ChangeLog	2001/12/26 19:35:13	2.48
--- ChangeLog	2001/12/27 16:21:26	2.49
***************
*** 1,2 ****
--- 1,8 ----
+ 2001-12-27  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+ 
+ 	* tramp.el (toplevel): Don't barf if jka-compr is already loaded.
+ 	Instead, make sure that jka-compr comes first in
+ 	file-name-handler-alist.
+ 
  2001-12-26  Kai Grossjohann  <ka...@ls...>
  

Index: tramp.el
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v
retrieving revision 2.51
retrieving revision 2.52
diff -C2 -d -r2.51 -r2.52
*** tramp.el	2001/12/26 19:35:13	2.51
--- tramp.el	2001/12/27 16:21:26	2.52
***************
*** 86,96 ****
    (require 'efs))
  
- ;; It does not work to load Tramp after loading jka-compr.  Emacs 21.2
- ;; might have a fix for this, so this code can be disabled in the
- ;; future.
- (when (and (boundp 'auto-compression-mode)
- 	   (symbol-value 'auto-compression-mode))
-   (error "Must load Tramp before enabling `auto-compression-mode'."))
- 
  (eval-when-compile
    (require 'cl)
--- 86,89 ----
***************
*** 1551,1555 ****
  	   (attr (file-attributes f))
  	   (modtime (nth 5 attr)))
!       (if (tramp-get-remote-perl multi-method method user host)
  	  ;; Why does `file-attributes' return a list (HIGH LOW), but
  	  ;; `visited-file-modtime' returns a cons (HIGH . LOW)?
--- 1544,1548 ----
  	   (attr (file-attributes f))
  	   (modtime (nth 5 attr)))
!       (if nil ;(tramp-get-remote-perl multi-method method user host)
  	  ;; Why does `file-attributes' return a list (HIGH LOW), but
  	  ;; `visited-file-modtime' returns a cons (HIGH . LOW)?
***************
*** 2686,2689 ****
--- 2679,2690 ----
  (add-to-list 'file-name-handler-alist
  	     (cons tramp-file-name-regexp 'tramp-file-name-handler))
+ 
+ ;; If jka-compr is already loaded, move it to the front of
+ ;; `file-name-handler-alist'.  On Emacs 21.3 or so this will not be
+ ;; necessary anymore.
+ (let ((jka (rassoc 'jka-compr-handler file-name-handler-alist)))
+   (when jka
+     (setq file-name-handler-alist
+ 	  (cons jka (delete jka file-name-handler-alist)))))
  
  ;;; Interactions with other packages: