>From 9e0541abe206e1e7409ea575acc824a26c2f62d5 Mon Sep 17 00:00:00 2001 From: Alex Kost
Date: Fri, 24 Jul 2015 18:33:14 +0300 Subject: [PATCH 1/2] emacs: Add development utils. * emacs/guix-guile.el (guix-guile-current-module): New function. * emacs/guix-devel.el: New file. * emacs.am (ELFILES): Add it. * doc/emacs.texi (Emacs Development): New node. (Emacs Interface): Add it. * doc/contributing.texi (The Perfect Setup): Mention it. * doc/guix.texi (Top): Add it. * emacs/guix-init.el: Add 'guix-devel-activate-mode-maybe' to 'scheme-mode-hook'. --- doc/contributing.texi | 3 ++ doc/emacs.texi | 25 +++++++++++++- doc/guix.texi | 3 +- emacs.am | 1 + emacs/guix-devel.el | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ emacs/guix-guile.el | 13 +++++++ emacs/guix-init.el | 2 ++ 7 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 emacs/guix-devel.el diff --git a/doc/contributing.texi b/doc/contributing.texi index ded5434..b2d097d 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -121,6 +121,9 @@ facilities to directly operate on the syntax tree, such as raising an s-expression or wrapping it, swallowing or rejecting the following s-expression, etc. +GNU Guix also comes with a minor mode that provides some additional +functionality for Scheme buffers (@pxref{Emacs Development}). + @node Coding Style @section Coding Style diff --git a/doc/emacs.texi b/doc/emacs.texi index 6777346..d44d329 100644 --- a/doc/emacs.texi +++ b/doc/emacs.texi @@ -12,7 +12,8 @@ Guix convenient and fun. * Popup Interface: Emacs Popup Interface. Magit-like interface for guix commands. * Prettify Mode: Emacs Prettify. Abbreviating @file{/gnu/store/@dots{}} file names. * Build Log Mode: Emacs Build Log. Highlighting Guix build logs. -* Completions: Emacs Completions. Completing @command{guix} shell command. +* Completions: Emacs Completions. Completing @command{guix} shell command. +* Development: Emacs Development. Tools for Guix developers. @end menu @@ -637,3 +638,25 @@ something: @item @code{guix lint --checkers=synopsis,address@hidden @end itemize + + address@hidden Emacs Development address@hidden Development + +By default, when you open a Scheme file, @code{guix-devel-mode} will be +activated (if you don't want it, set @code{guix-devel-activate-mode} to +nil). This minor mode provides the following key bindings: + address@hidden @kbd + address@hidden C-c . k +Copy the name of the current Guile module into kill ring +(@code{guix-devel-copy-module-as-kill}). + address@hidden C-c . u +Use the current Guile module. Often after opening a Scheme file, you +want to use a module it defines, so you switch to the Geiser REPL and +write @code{,use (some module)} there. You may just use this command +instead (@code{guix-devel-use-module}). + address@hidden table diff --git a/doc/guix.texi b/doc/guix.texi index 3ca4cef..eec2821 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -113,7 +113,8 @@ Emacs Interface * Popup Interface: Emacs Popup Interface. Magit-like interface for guix commands. * Prettify Mode: Emacs Prettify. Abbreviating @file{/gnu/store/@dots{}} file names. * Build Log Mode: Emacs Build Log. Highlighting Guix build logs. -* Completions: Emacs Completions. Completing @command{guix} shell command. +* Completions: Emacs Completions. Completing @command{guix} shell command. +* Development: Emacs Development. Tools for Guix developers. Programming Interface diff --git a/emacs.am b/emacs.am index 5d403b2..9f300bf 100644 --- a/emacs.am +++ b/emacs.am @@ -23,6 +23,7 @@ ELFILES = \ emacs/guix-base.el \ emacs/guix-build-log.el \ emacs/guix-command.el \ + emacs/guix-devel.el \ emacs/guix-emacs.el \ emacs/guix-external.el \ emacs/guix-geiser.el \ diff --git a/emacs/guix-devel.el b/emacs/guix-devel.el new file mode 100644 index 0000000..ed82e33 --- /dev/null +++ b/emacs/guix-devel.el @@ -0,0 +1,96 @@ +;;; guix-devel.el --- Development tools -*- lexical-binding: t -*- + +;; Copyright © 2015 Alex Kost + +;; This file is part of GNU Guix. + +;; GNU Guix is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Guix is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see