X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-debug.el;h=0cad7f4653ad4ba9566cc34824c0430999475142;hb=ab777c723cf34271513f17f15c768e192f9c8db8;hp=2a301a4922f9629fad541e130dc2e0a32618ca80;hpb=f5c32b354870fd4d16eabad94d83e5d4e89ce0fb;p=riece

diff --git a/lisp/riece-debug.el b/lisp/riece-debug.el
index 2a301a4..0cad7f4 100644
--- a/lisp/riece-debug.el
+++ b/lisp/riece-debug.el
@@ -19,51 +19,76 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
 (require 'riece-globals)
+(require 'riece-options)
 
-(defvar riece-debug-standard-output-buffer nil)
+(defun riece-debug-1 (message detail)
+  (message "riece-debug: %s" message)
+  (with-current-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 ()
-  (unless riece-debug-standard-output-buffer
-    (setq riece-debug-standard-output-buffer
-	  (generate-new-buffer " *riece-debug-standard-output*")))
-  (save-excursion
-    (set-buffer riece-debug-standard-output-buffer)
+  "Reset `riece-temp-buffer' to be used as `standard-output'."
+  (with-current-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)
 	 ,@body)
      (error
       (if riece-debug
-	  (save-excursion
-	    (set-buffer riece-debug-standard-output-buffer)
+	  (with-current-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))))
+	    (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