From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 2/3] emacs: Add key bindings for 'guix-build-log-minor-mode'. Date: Thu, 29 Oct 2015 23:33:26 +0300 Message-ID: <877fm5za7d.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrtt4-0000GN-Aw for guix-devel@gnu.org; Thu, 29 Oct 2015 16:33:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zrtsz-0006GF-9G for guix-devel@gnu.org; Thu, 29 Oct 2015 16:33:30 -0400 Received: from mail-lf0-x236.google.com ([2a00:1450:4010:c07::236]:34841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrtsy-0006Fi-UD for guix-devel@gnu.org; Thu, 29 Oct 2015 16:33:25 -0400 Received: by lfbn126 with SMTP id n126so24223304lfb.2 for ; Thu, 29 Oct 2015 13:33:24 -0700 (PDT) Received: from leviafan ([217.107.192.146]) by smtp.gmail.com with ESMTPSA id c7sm632114lfe.22.2015.10.29.13.33.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2015 13:33:23 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain I use (add-hook 'shell-mode-hook 'guix-build-log-minor-mode) and I found that along with phases highlighting, it is useful to have some key bindings available in this minor mode, so this patch adds "C-c M-n/M-p/TAB/S-TAB" keys to it. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-emacs-Add-key-bindings-for-guix-build-log-minor-mode.patch >From fe50e7233fa5144f31f7db583d0289f056dd9dd0 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 29 Oct 2015 21:27:56 +0300 Subject: [PATCH 2/3] emacs: Add key bindings for 'guix-build-log-minor-mode'. * emacs/guix-build-log.el (guix-build-log-mode-map): Move keys to ... (guix-build-log-common-map): ...here. New variable. (guix-build-log-minor-mode-map): New variable. (guix-build-log-minor-mode): Use it. * doc/emacs.texi (Emacs Build Log): Document it. --- doc/emacs.texi | 13 +++++++------ emacs/guix-build-log.el | 24 +++++++++++++++++++++--- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/doc/emacs.texi b/doc/emacs.texi index b36e859..03dc951 100644 --- a/doc/emacs.texi +++ b/doc/emacs.texi @@ -646,12 +646,13 @@ Toggle (show/hide) the bodies of all build phases. @end table There is also @kbd{M-x guix-build-log-minor-mode} which also provides -the same highlighting (but not key bindings). And as it is a minor -mode, it can be enabled in any buffer. For example, if you are building -some package in a shell buffer (@pxref{Interactive Shell,,, emacs, The -GNU Emacs Manual}), you may enable @command{guix-build-log-minor-mode} -to make it more colorful. Guix build output is rather specific, so this -new highlighting shouldn't conflict with the existing one. +the same highlighting. And as it is a minor mode, it can be enabled in +any buffer. For example, if you are building some package in a shell +buffer (@pxref{Interactive Shell,,, emacs, The GNU Emacs Manual}), you +may enable @command{guix-build-log-minor-mode} to make it more colorful. +Guix build output is rather specific, so this new highlighting shouldn't +conflict with the existing one. This mode also provides the same key +bindings as the major mode, but prefixed with @kbd{C-c}. @node Emacs Completions diff --git a/emacs/guix-build-log.el b/emacs/guix-build-log.el index 0e13213..1242607 100644 --- a/emacs/guix-build-log.el +++ b/emacs/guix-build-log.el @@ -178,9 +178,8 @@ STATE is a symbol denoting how a build phase was ended. It should be (3 'guix-build-log-phase-seconds prepend))) "A list of `font-lock-keywords' for `guix-build-log-mode'.") -(defvar guix-build-log-mode-map +(defvar guix-build-log-common-map (let ((map (make-sparse-keymap))) - (set-keymap-parent map special-mode-map) (define-key map (kbd "M-n") 'guix-build-log-next-phase) (define-key map (kbd "M-p") 'guix-build-log-previous-phase) (define-key map (kbd "TAB") 'guix-build-log-phase-toggle) @@ -188,8 +187,24 @@ STATE is a symbol denoting how a build phase was ended. It should be (define-key map (kbd "") 'guix-build-log-phase-toggle-all) (define-key map [(shift tab)] 'guix-build-log-phase-toggle-all) map) + "Parent keymap for 'build-log' buffers. +For `guix-build-log-mode' this map is used as is. +For `guix-build-log-minor-mode' this map is prefixed with 'C-c'.") + +(defvar guix-build-log-mode-map + (let ((map (make-sparse-keymap))) + (set-keymap-parent + map (make-composed-keymap (list guix-build-log-common-map) + special-mode-map)) + map) "Keymap for `guix-build-log-mode' buffers.") +(defvar guix-build-log-minor-mode-map + (let ((map (make-sparse-keymap))) + (define-key map (kbd "C-c") guix-build-log-common-map) + map) + "Keymap for `guix-build-log-minor-mode' buffers.") + (defun guix-build-log-phase-start (&optional with-header?) "Return the start point of the current build phase. If WITH-HEADER? is non-nil, do not skip 'starting phase ...' header. @@ -319,9 +334,12 @@ When Guix Build Log minor mode is enabled, it highlights build log in the current buffer. This mode can be enabled programmatically using hooks: - (add-hook 'shell-mode-hook 'guix-build-log-minor-mode)" + (add-hook 'shell-mode-hook 'guix-build-log-minor-mode) + +\\{guix-build-log-minor-mode-map}" :init-value nil :lighter " Guix-Build-Log" + :keymap guix-build-log-minor-mode-map :group 'guix-build-log (if guix-build-log-minor-mode (font-lock-add-keywords nil guix-build-log-font-lock-keywords) -- 2.5.0 --=-=-=--