Check if make-local-hook exists.

[riece] / lisp / riece-debug.el

diff --git a/lisp/riece-debug.el b/lisp/riece-debug.el
index d3132ce..0cad7f4 100644 (file)
--- a/lisp/riece-debug.el
+++ b/lisp/riece-debug.el
@@ -19,17 +19,32 @@
 
 ;; 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)
+
+(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 ()
   "Reset `riece-temp-buffer' to be used as `standard-output'."
-  (save-excursion
-    (set-buffer riece-temp-buffer)
+  (with-current-buffer riece-temp-buffer
     (buffer-disable-undo)
     (erase-buffer)))
 
@@ -55,12 +70,12 @@ backtrace to standard-output."
         ,@body)
      (error
       (if riece-debug
-         (save-excursion
-           (set-buffer riece-temp-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)