aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Ryde2009-11-24 23:08:15 +0000
committerKevin Ryde2009-11-24 23:08:15 +0000
commit4cf8971b400ff41bfe3609f0d0626e8119555766 (patch)
treef8797291f87bdd1fe3c75130d3b2140fa353088d
parentd204c46c611f765886f1079d1a93865ba2beacbb (diff)
downloademacs-4cf8971b400ff41bfe3609f0d0626e8119555766.tar.gz
emacs-4cf8971b400ff41bfe3609f0d0626e8119555766.zip
* emacs-lisp/elint.el (elint-add-required-env): Better error message
when .el source file not found or other error.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/elint.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b56f64a5b79..021ae0db2c0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-11-24 Kevin Ryde <user42@zip.com.au>
2
3 * emacs-lisp/elint.el (elint-add-required-env): Better error message
4 when .el source file not found or other error.
5
12009-11-24 Markus Triska <markus.triska@gmx.at> 62009-11-24 Markus Triska <markus.triska@gmx.at>
2 7
3 * linum.el (linum-update-window): Ignore intangible (bug#4996). 8 * linum.el (linum-update-window): Ignore intangible (bug#4996).
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index bcb399c23f3..4cbd6aaa552 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -493,7 +493,7 @@ Return nil if there are no more forms, t otherwise."
493 493
494(defun elint-add-required-env (env name file) 494(defun elint-add-required-env (env name file)
495 "Augment ENV with the variables defined by feature NAME in FILE." 495 "Augment ENV with the variables defined by feature NAME in FILE."
496 (condition-case nil 496 (condition-case err
497 (let* ((libname (if (stringp file) 497 (let* ((libname (if (stringp file)
498 file 498 file
499 (symbol-name name))) 499 (symbol-name name)))
@@ -518,9 +518,10 @@ Return nil if there are no more forms, t otherwise."
518 ;;; (elint-update-env)) 518 ;;; (elint-update-env))
519 ;;; (setq env (elint-env-add-env env elint-buffer-env)))) 519 ;;; (setq env (elint-env-add-env env elint-buffer-env))))
520 ;;(message "Elint processed (require '%s)" name)) 520 ;;(message "Elint processed (require '%s)" name))
521 (error "Unable to find require'd library %s" name))) 521 (error "%s.el not found in load-path" libname)))
522 (error 522 (error
523 (message "Can't get variables from require'd library %s" name))) 523 (message "Can't get variables from require'd library %s: %s"
524 name (error-message-string err))))
524 env) 525 env)
525 526
526(defvar elint-top-form nil 527(defvar elint-top-form nil