;;; Code:
(require 'riece-globals)
-
-(defvar riece-debug-standard-output-buffer nil)
+(require 'riece-options)
(defun riece-debug-reset-standard-output ()
- (unless riece-debug-standard-output-buffer
- (setq riece-debug-standard-output-buffer
- (generate-new-buffer " *riece-debug-standard-output*")
- riece-buffer-list
- (cons riece-debug-standard-output-buffer
- riece-buffer-list)))
+ "Reset `riece-temp-buffer' to be used as `standard-output'."
(save-excursion
- (set-buffer riece-debug-standard-output-buffer)
+ (set-buffer riece-temp-buffer)
(buffer-disable-undo)
(erase-buffer)))
(defmacro riece-debug-with-backtrace (&rest body)
+ "Execute BODY and send a backtrace to `riece-temp-buffer'."
`(unwind-protect
(progn ,@body)
(riece-debug-reset-standard-output)
- (let ((standard-output riece-debug-standard-output-buffer))
+ (let ((standard-output riece-temp-buffer))
(backtrace))))
(put 'riece-debug-with-backtrace 'lisp-indent-function 0)
(put 'riece-debug-with-backtrace 'edebug-form-spec '(form body))
(defmacro riece-ignore-errors (location &rest body)
+ "Execute BODY; if an error occurs, return nil.
+Otherwise, return result of last FORM.
+If `riece-debug' is non-nil and an error occurred, it sends a
+backtrace to standard-output."
`(condition-case error
(if riece-debug
(riece-debug-with-backtrace ,@body)
(error
(if riece-debug
(save-excursion
- (set-buffer riece-debug-standard-output-buffer)
+ (set-buffer riece-temp-buffer)
+ (goto-char (point-min))
(if (re-search-forward "^ signal(" nil t)
(delete-region (point-min) (match-beginning 0)))
(message "Error in `%s': %S\n%s" ,location error (buffer-string))))
(put 'riece-ignore-errors 'lisp-indent-function 1)
(put 'riece-ignore-errors 'edebug-form-spec '(form body))
+(defun riece-funcall-ignore-errors (location function &rest args)
+ "Call FUNCTION with ARGS; if an error occurs, return nil.
+Otherwise, return result of the function.
+If `riece-debug' is non-nil and an error occurred, it sends a
+backtrace to standard-output."
+ (riece-ignore-errors location
+ (apply function args)))
+
(provide 'riece-debug)
;;; riece-debug.el ends here