aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-09-09 19:19:23 -0700
committerGlenn Morris2012-09-09 19:19:23 -0700
commitfa05bfe0525d75bde4c94c3cbbd90c5fa7a5a7dc (patch)
tree0d2ae275f5d69c3e5663e6b885f83f3e1e65f3b2
parent48e8c8aad6a03b6b20a781b29da8d3e445ab2af7 (diff)
downloademacs-fa05bfe0525d75bde4c94c3cbbd90c5fa7a5a7dc.tar.gz
emacs-fa05bfe0525d75bde4c94c3cbbd90c5fa7a5a7dc.zip
* mail/emacsbug.el (report-emacs-bug): Trap load-path-shadows errors.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mail/emacsbug.el11
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34e391a8c57..5d0d00be9dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-09-10 Glenn Morris <rgm@gnu.org>
2
3 * mail/emacsbug.el (report-emacs-bug): Trap load-path-shadows errors.
4
12012-09-08 Alan Mackenzie <acm@muc.de> 52012-09-08 Alan Mackenzie <acm@muc.de>
2 6
3 AWK Mode: make auto-newline work when there's "==" in the pattern. 7 AWK Mode: make auto-newline work when there's "==" in the pattern.
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 1a02ae7c519..742c05bc8d5 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -304,9 +304,14 @@ usually do not have translators for other languages.\n\n")))
304 (insert "\n")) 304 (insert "\n"))
305 (insert "\n") 305 (insert "\n")
306 (insert "Load-path shadows:\n") 306 (insert "Load-path shadows:\n")
307 (message "Checking for load-path shadows...") 307 (let* ((msg "Checking for load-path shadows...")
308 (let ((shadows (list-load-path-shadows t))) 308 (result "done")
309 (message "Checking for load-path shadows...done") 309 (shadows (progn (message "%s" msg)
310 (condition-case nil (list-load-path-shadows t)
311 (error
312 (setq result "error")
313 "Error during checking")))))
314 (message "%s%s" msg result)
310 (insert (if (zerop (length shadows)) 315 (insert (if (zerop (length shadows))
311 "None found.\n" 316 "None found.\n"
312 shadows))) 317 shadows)))