comparison lisp/prim/packages.el @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents e121b013d1f0
children b405438285a2
comparison
equal deleted inserted replaced
184:bcd2674570bf 185:3d6bfa290dbd
111 (compressed '(".Z" ".gz" ""))) 111 (compressed '(".Z" ".gz" "")))
112 ;; If autocompression mode is on, 112 ;; If autocompression mode is on,
113 ;; consider all combinations of library suffixes 113 ;; consider all combinations of library suffixes
114 ;; and compression suffixes. 114 ;; and compression suffixes.
115 (if (or (rassq 'jka-compr-handler file-name-handler-alist) 115 (if (or (rassq 'jka-compr-handler file-name-handler-alist)
116 (member 'crypt-find-file-hook find-file-hooks)) 116 (and (boundp 'find-file-hooks)
117 (apply 'nconc 117 (member 'crypt-find-file-hook find-file-hooks)))
118 (mapcar (lambda (compelt) 118 (apply 'nconc
119 (mapcar (lambda (baselt) 119 (mapcar (lambda (compelt)
120 (concat baselt compelt)) 120 (mapcar (lambda (baselt)
121 basic)) 121 (concat baselt compelt))
122 compressed)) 122 basic))
123 basic))))) 123 compressed))
124 basic)))))
124 (or path load-path))) 125 (or path load-path)))
125 (and interactive-call 126 (and interactive-call
126 (if result 127 (if result
127 (message "Library is file %s" result) 128 (message "Library is file %s" result)
128 (message "No library %s in search path" library))) 129 (message "No library %s in search path" library)))
181 (setq data-directory-list 182 (setq data-directory-list
182 (cons (concat package "/etc/") data-directory-list))) 183 (cons (concat package "/etc/") data-directory-list)))
183 ;; Lisp files 184 ;; Lisp files
184 (if (file-directory-p (concat package "/lisp")) 185 (if (file-directory-p (concat package "/lisp"))
185 (progn 186 (progn
186 (setq load-path (cons (concat package "/lisp") load-path)) 187 (setq load-path (cons (concat package "/lisp/") load-path))
187 (let ((dirs (directory-files (concat package "/lisp/") 188 (let ((dirs (directory-files (concat package "/lisp/")
188 t "^[^-.]" nil 'dirs-only)) 189 t "^[^-.]" nil 'dirs-only))
189 dir) 190 dir)
190 (while dirs 191 (while dirs
191 (setq dir (car dirs)) 192 (setq dir (car dirs))
192 (setq load-path (cons dir load-path)) 193 (setq load-path (cons (concat dir "/") load-path))
193 (packages-find-packages-1 dir path-only) 194 (packages-find-packages-1 dir path-only)
194 (setq dirs (cdr dirs))))))) 195 (setq dirs (cdr dirs)))))))
195 196
196 ;; The following function is called from temacs 197 ;; The following function is called from temacs
197 (defun packages-find-packages (pkg-path path-only) 198 (defun packages-find-packages (pkg-path path-only)