From 72bba1176cbb13829b271bb028d99abccc506f4f Mon Sep 17 00:00:00 2001 From: Chris Feng Date: Sun, 9 Sep 2018 00:00:00 +0000 Subject: [PATCH] ; Minor fixes for Calvo's patch set. --- exwm-core.el | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/exwm-core.el b/exwm-core.el index 49914d3..365e24b 100644 --- a/exwm-core.el +++ b/exwm-core.el @@ -80,8 +80,8 @@ FORMAT-STRING is a string specifying the message to output, as in `format'. The OBJECTS arguments specify the substitutions." (unless format-string (setq format-string "")) `(when exwm-debug-on - (xcb-debug-message ,(concat "%s:\t" format-string "\n") - (xcb-debug-compile-time-function-name) + (xcb-debug:message ,(concat "%s:\t" format-string "\n") + (xcb-debug:compile-time-function-name) ,@objects) nil)) @@ -199,6 +199,9 @@ least SECS seconds later." (defvar exwm-mode-map (let ((map (make-sparse-keymap))) + (define-key map "\C-c\C-d\C-l" #'xcb-debug:clear) + (define-key map "\C-c\C-d\C-m" #'xcb-debug:mark) + (define-key map "\C-c\C-d\C-t" #'exwm-debug-toggle) (define-key map "\C-c\C-f" #'exwm-layout-set-fullscreen) (define-key map "\C-c\C-h" #'exwm-floating-hide) (define-key map "\C-c\C-k" #'exwm-input-release-keyboard) @@ -300,12 +303,6 @@ least SECS seconds later." (/= ,i exwm-workspace-current-index)]) (number-sequence 0 (1- (exwm-workspace--count)))))))) -(exwm--debug - (let ((map exwm-mode-map)) - (define-key map "\C-c\C-d\C-l" #'xcb-debug-clear) - (define-key map "\C-c\C-d\C-m" #'xcb-debug-mark) - (define-key map "\C-c\C-d\C-t" #'exwm-debug-toggle))) - (define-derived-mode exwm-mode nil "EXWM" "Major mode for managing X windows.