Mercurial > hg > xemacs-beta

comparison lisp/packages.el @ 233:52952cbfc5b5 r20-5b15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b15
author cvs
date Mon, 13 Aug 2007 10:14:14 +0200
parents 0e522484dd2a
children 85a06df23a9a
comparison
equal deleted inserted replaced
232:aa6545ea0638 233:52952cbfc5b5
222 (if (fboundp 'load-gc) 222 (if (fboundp 'load-gc)
223 (setq dumped-lisp-packages 223 (setq dumped-lisp-packages
224 (append dumped-lisp-packages package-lisp))))))) 224 (append dumped-lisp-packages package-lisp)))))))
225 225
226 (if user-package 226 (if user-package
227 (condition-case nil 227 (condition-case error
228 (load (concat package "/lisp/" 228 (load (concat package "/lisp/"
229 (file-name-sans-extension autoload-file-name))) 229 (file-name-sans-extension autoload-file-name))
230 (t nil))) 230 t)
231 (error
232 (warn (format "Autoload error in: %s/lisp/:\n\t%s"
233 package
234 (with-output-to-string
235 (display-error error nil)))))))
231 (let ((dirs (directory-files (concat package "/lisp/") 236 (let ((dirs (directory-files (concat package "/lisp/")
232 t "^[^-.]" nil 'dirs-only)) 237 t "^[^-.]" nil 'dirs-only))
233 dir) 238 dir)
234 (while dirs 239 (while dirs
235 (setq dir (car dirs)) 240 (setq dir (car dirs))
252 (if (fboundp 'load-gc) 257 (if (fboundp 'load-gc)
253 (setq dumped-lisp-packages 258 (setq dumped-lisp-packages
254 (append dumped-lisp-packages package-lisp))))))) 259 (append dumped-lisp-packages package-lisp)))))))
255 260
256 (if user-package 261 (if user-package
257 (condition-case nil 262 (condition-case error
258 (progn 263 (progn
259 ; (print 264 ; (print
260 ; (concat dir "/" 265 ; (concat dir "/"
261 ; (file-name-sans-extension autoload-file-name))) 266 ; (file-name-sans-extension autoload-file-name)))
262 (load 267 (load
263 (concat dir "/" 268 (concat dir "/"
264 (file-name-sans-extension autoload-file-name)))) 269 (file-name-sans-extension autoload-file-name))
265 (t nil))) 270 t))
271 (error
272 (warn (format "Autoload error in: %s/:\n\t%s"
273 dir
274 (with-output-to-string
275 (display-error error nil)))))))
266 (packages-find-packages-1 dir path-only append-p user-package) 276 (packages-find-packages-1 dir path-only append-p user-package)
267 (setq dirs (cdr dirs))))))) 277 (setq dirs (cdr dirs)))))))
268 278
269 ;; The following function is called from temacs 279 ;; The following function is called from temacs
270 (defun packages-find-packages-2 (path path-only append-p suppress-user) 280 (defun packages-find-packages-2 (path path-only append-p suppress-user)