X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-debug.el;h=c2ba3c6c7abd1a39368b8885fadecc316ae2ffef;hb=1d93da31ebf937e79bbb252a7190a56ee1fc82d1;hp=5473d1fa2aadc95d705bea4a3d57890e8a304fad;hpb=deee2c444fb26a3e2ea4a4ccb913ea695f1d7087;p=riece

diff --git a/lisp/riece-debug.el b/lisp/riece-debug.el
index 5473d1f..c2ba3c6 100644
--- a/lisp/riece-debug.el
+++ b/lisp/riece-debug.el
@@ -19,38 +19,53 @@
 
 ;; 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)
+  (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 ()
-  (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)
@@ -58,15 +73,25 @@
      (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))))
+	    (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