aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2015-09-21 20:11:18 +0300
committerAlex Kost <alezost@gmail.com>2015-09-23 13:36:22 +0300
commit6f05a24df305fc6b79695dd111ec5ff5464ea63e (patch)
tree3db554dad110604abd92dde168e264d73678d06c
parent99d7460d78c0d574a73b79b483a8203bebafcd17 (diff)
downloadguix-6f05a24df305fc6b79695dd111ec5ff5464ea63e.tar.gz
guix-6f05a24df305fc6b79695dd111ec5ff5464ea63e.zip
emacs: Add "View map" action to 'size' popup.
* emacs/guix-command.el (guix-run-view-size-map): New function. (guix-command-additional-execute-arguments, guix-command-special-executors): Add entries for "View map" action.
-rw-r--r--emacs/guix-command.el26
1 files changed, 24 insertions, 2 deletions
diff --git a/emacs/guix-command.el b/emacs/guix-command.el
index 504d5f7ca0..b679ad9b1e 100644
--- a/emacs/guix-command.el
+++ b/emacs/guix-command.el
@@ -503,7 +503,10 @@ to be modified."
:name "log" :char ?l :doc "View build log"))
(("graph")
,(guix-command-make-argument
- :name "view" :char ?v :doc "View graph")))
+ :name "view" :char ?v :doc "View graph"))
+ (("size")
+ ,(guix-command-make-argument
+ :name "view" :char ?v :doc "View map")))
"Alist of guix commands and additional 'execute' action arguments.")
(defun guix-command-execute-arguments (commands)
@@ -525,7 +528,9 @@ to be modified."
(("build")
("log" . guix-run-view-build-log))
(("graph")
- ("view" . guix-run-view-graph)))
+ ("view" . guix-run-view-graph))
+ (("size")
+ ("view" . guix-run-view-size-map)))
"Alist of guix commands and alists of special executers for them.
See also `guix-command-default-executors'.")
@@ -583,6 +588,23 @@ open the log file(s)."
(guix-find-file graph-file)
(error "Couldn't create a graph"))))
+(defun guix-run-view-size-map (args)
+ "Run 'guix ARGS ...' size command, and open the map file."
+ (let* ((wished-map-file
+ (cl-some (lambda (arg)
+ (and (string-match "--map-file=\\(.+\\)" arg)
+ (match-string 1 arg)))
+ args))
+ (map-file (or wished-map-file (guix-png-file-name)))
+ (args (if wished-map-file
+ args
+ (apply #'list
+ (car args)
+ (concat "--map-file=" map-file)
+ (cdr args)))))
+ (guix-command-output args)
+ (guix-find-file map-file)))
+
;;; Generating popups, actions, etc.