Mercurial > hg > xemacs-beta
diff lisp/packages.el @ 233:52952cbfc5b5 r20-5b15
Import from CVS: tag r20-5b15
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:14:14 +0200 |
parents | 0e522484dd2a |
children | 85a06df23a9a |
line wrap: on
line diff
--- a/lisp/packages.el Mon Aug 13 10:13:49 2007 +0200 +++ b/lisp/packages.el Mon Aug 13 10:14:14 2007 +0200 @@ -224,10 +224,15 @@ (append dumped-lisp-packages package-lisp))))))) (if user-package - (condition-case nil + (condition-case error (load (concat package "/lisp/" - (file-name-sans-extension autoload-file-name))) - (t nil))) + (file-name-sans-extension autoload-file-name)) + t) + (error + (warn (format "Autoload error in: %s/lisp/:\n\t%s" + package + (with-output-to-string + (display-error error nil))))))) (let ((dirs (directory-files (concat package "/lisp/") t "^[^-.]" nil 'dirs-only)) dir) @@ -254,15 +259,20 @@ (append dumped-lisp-packages package-lisp))))))) (if user-package - (condition-case nil + (condition-case error (progn ; (print ; (concat dir "/" ; (file-name-sans-extension autoload-file-name))) (load (concat dir "/" - (file-name-sans-extension autoload-file-name)))) - (t nil))) + (file-name-sans-extension autoload-file-name)) + t)) + (error + (warn (format "Autoload error in: %s/:\n\t%s" + dir + (with-output-to-string + (display-error error nil))))))) (packages-find-packages-1 dir path-only append-p user-package) (setq dirs (cdr dirs)))))))