;;; Code:
-(defvar riece-debug-standard-output
- (make-string 4096 ?\x0))
-
-(defvar riece-debug-standard-output-index 0)
-
-(defun riece-debug-standard-output (character)
- (let ((length (length riece-debug-standard-output)))
- (if (= riece-debug-standard-output-index length)
- (setq riece-debug-standard-output
- (concat riece-debug-standard-output
- (make-string length ?\x0))))
- (aset riece-debug-standard-output
- riece-debug-standard-output-index
- character)
- (setq riece-debug-standard-output-index
- (1+ riece-debug-standard-output-index))))
+(require 'riece-globals)
+(require 'riece-options)
+
+(defun riece-debug-1 (message detail)
+ (message "riece-debug: %s" message)
+ (save-excursion
+ (set-buffer riece-debug-buffer)
+ (goto-char (point-max))
+ (let ((time (format-time-string "%Y-%m-%d:%H:%M:%S")))
+ (if detail
+ (insert "*** " time ": " message "\n" detail "\n")
+ (insert "*** " time ": " message "\n")))))
+
+(defun riece-debug (message &optional detail)
+ "Print a one-line debug MESSAGE at the bottom of the frame.
+If the optional 2nd argument DETAIL is specified, it is stored into
+`riece-debug-buffer'."
+ (ignore (riece-debug-1 message detail)))
+
+(defun riece-debug-reset-standard-output ()
+ "Reset `riece-temp-buffer' to be used as `standard-output'."
+ (save-excursion
+ (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)
- (setq riece-debug-standard-output-index 0)
- (let ((standard-output #'riece-debug-standard-output))
+ (riece-debug-reset-standard-output)
+ (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)
,@body)
(error
(if riece-debug
- (let ((backtrace (substring riece-debug-standard-output
- 0 riece-debug-standard-output-index)))
- (if (string-match "^ signal(" backtrace)
- (setq backtrace (substring backtrace 0 (match-beginning 0))))
- (message "Error in `%s': %S\n%s" ,location error backtrace)))
+ (save-excursion
+ (set-buffer riece-temp-buffer)
+ (goto-char (point-min))
+ (if (re-search-forward "^ signal(" nil t)
+ (delete-region (point-min) (match-beginning 0)))
+ (riece-debug (format "Error in `%s': %S" ,location error)
+ (buffer-string))))
nil)))
(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