[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108132: * mail/emacsbug.el (report-emacs-bug): Trap load-path-shadows errors.

[Glenn Morris]

------------------------------------------------------------
revno: 108132
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2012-09-09 19:19:23 -0700
message:
  * mail/emacsbug.el (report-emacs-bug): Trap load-path-shadows errors.
modified:
  lisp/ChangeLog
  lisp/mail/emacsbug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-09 01:56:38 +0000
+++ b/lisp/ChangeLog    2012-09-10 02:19:23 +0000
@@ -1,3 +1,7 @@
+2012-09-10  Glenn Morris  <address@hidden>
+
+       * mail/emacsbug.el (report-emacs-bug): Trap load-path-shadows errors.
+
 2012-09-08  Alan Mackenzie  <address@hidden>
 
        AWK Mode: make auto-newline work when there's "==" in the pattern.

=== modified file 'lisp/mail/emacsbug.el'
--- a/lisp/mail/emacsbug.el     2012-04-04 01:05:29 +0000
+++ b/lisp/mail/emacsbug.el     2012-09-10 02:19:23 +0000
@@ -304,9 +304,14 @@
       (insert "\n"))
     (insert "\n")
     (insert "Load-path shadows:\n")
-    (message "Checking for load-path shadows...")
-    (let ((shadows (list-load-path-shadows t)))
-      (message "Checking for load-path shadows...done")
+    (let* ((msg "Checking for load-path shadows...")
+          (result "done")
+          (shadows (progn (message "%s" msg)
+                          (condition-case nil (list-load-path-shadows t)
+                            (error
+                             (setq result "error")
+                             "Error during checking")))))
+      (message "%s%s" msg result)
       (insert (if (zerop (length shadows))
                   "None found.\n"
                 shadows)))