From 67c920fa5d9a77543e0e950fdf26e2f502b656d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 5 Nov 2015 12:01:26 +0100
Subject: [PATCH] edit: Lift helper procedure.

* guix/scripts/edit.scm (package->location-specification): New
  procedure, with code formerly...
  (guix-edit): ... here.  Use it.
---
 guix/scripts/edit.scm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm
index 30146af10b..fa10a16f31 100644
--- a/guix/scripts/edit.scm
+++ b/guix/scripts/edit.scm
@@ -59,6 +59,15 @@ Start $EDITOR to edit the definitions of PACKAGE...\n"))
              file path))
     absolute-file-name))
 
+(define (package->location-specification package)
+  "Return the location specification for PACKAGE for a typical editor command
+line."
+  (let ((loc (package-location package)))
+    (list (string-append "+"
+                         (number->string
+                          (location-line loc)))
+          (search-path* %load-path (location-file loc)))))
+
 
 (define (guix-edit . args)
   (with-error-handling
@@ -71,10 +80,4 @@ Start $EDITOR to edit the definitions of PACKAGE...\n"))
                            (package-full-name package))))
                 packages)
       (apply execlp (%editor) (%editor)
-             (append-map (lambda (package)
-                           (let ((loc (package-location package)))
-                             (list (string-append "+"
-                                                  (number->string
-                                                   (location-line loc)))
-                                   (search-path* %load-path (location-file loc)))))
-                         packages)))))
+             (append-map package->location-specification packages)))))