diff options
| author | Alex Kost <alezost@gmail.com> | 2015-10-01 21:16:18 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2015-10-09 16:17:45 +0300 |
| commit | b94ef11a538e19900c1f570500ac4dee73543844 (patch) | |
| tree | d5043b124a8e994bd89dbbfacaa790d343745de7 | |
| parent | e04741f160e77fe41d02129011bc2bb20ad27669 (diff) | |
| download | patches-b94ef11a538e19900c1f570500ac4dee73543844.tar patches-b94ef11a538e19900c1f570500ac4dee73543844.tar.gz | |
emacs: Add 'guix-devel-lint-package'
Suggested by Ludovic Courtès <ludo@gnu.org>.
* emacs/guix-devel.el (guix-devel-setup-repl): Add a workaround for
'guix-warning-port'.
(guix-devel-lint-package): New command.
(guix-devel-keys-map): Add key binding for it.
* doc/emacs.texi (Emacs Development): Document it.
| -rw-r--r-- | doc/emacs.texi | 4 | ||||
| -rw-r--r-- | emacs/guix-devel.el | 21 |
2 files changed, 22 insertions, 3 deletions
diff --git a/doc/emacs.texi b/doc/emacs.texi index b6f2701bc4..325e14e2a4 100644 --- a/doc/emacs.texi +++ b/doc/emacs.texi @@ -667,6 +667,10 @@ this command---for example, with @kbd{C-M-x} (@pxref{To eval or not to eval,,, geiser, Geiser User Manual}) (@code{guix-devel-build-package-definition}). +@item C-c . l +Lint (check) a package defined by the current variable definition +(@pxref{Invoking guix lint}) (@code{guix-devel-lint-package}). + @end table Unluckily, there is a limitation related to long-running REPL commands. diff --git a/emacs/guix-devel.el b/emacs/guix-devel.el index 7f758f55a8..547044f8af 100644 --- a/emacs/guix-devel.el +++ b/emacs/guix-devel.el @@ -76,11 +76,14 @@ Interactively, use the module defined by the current scheme file." "Setup REPL for using `guix-devel-...' commands." (guix-devel-use-modules "(guix monad-repl)" "(guix scripts)" - "(guix store)") - ;; Without this workaround, the build output disappears. See + "(guix store)" + "(guix ui)") + ;; Without this workaround, the warning/build output disappears. See ;; <https://github.com/jaor/geiser/issues/83> for details. (guix-geiser-eval-in-repl-synchronously - "(current-build-output-port (current-error-port))" + "(begin + (guix-warning-port (current-warning-port)) + (current-build-output-port (current-error-port)))" repl 'no-history 'no-display)) (defvar guix-devel-repl-processes nil @@ -119,6 +122,17 @@ run BODY." guix-use-substitutes) "#:dry-run?" (guix-guile-boolean guix-dry-run))))))) +(defun guix-devel-lint-package () + "Check the current package. +See Info node `(guix) Invoking guix lint' for details." + (interactive) + (guix-devel-with-definition def + (guix-devel-use-modules "(guix scripts lint)") + (when (or (not guix-operation-confirm) + (y-or-n-p (format "Lint '%s' package?" def))) + (guix-geiser-eval-in-repl + (format "(run-checkers %s)" def))))) + ;;; Font-lock @@ -163,6 +177,7 @@ to find 'modify-phases' keywords." (defvar guix-devel-keys-map (let ((map (make-sparse-keymap))) (define-key map (kbd "b") 'guix-devel-build-package-definition) + (define-key map (kbd "l") 'guix-devel-lint-package) (define-key map (kbd "k") 'guix-devel-copy-module-as-kill) (define-key map (kbd "u") 'guix-devel-use-module) map) |