[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: edit: Lift helper procedure.
From: |
Ludovic Courtès |
Subject: |
01/02: edit: Lift helper procedure. |
Date: |
Thu, 05 Nov 2015 11:05:58 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 67c920fa5d9a77543e0e950fdf26e2f502b656d8
Author: Ludovic Courtès <address@hidden>
Date: Thu Nov 5 12:01:26 2015 +0100
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 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm
index 30146af..fa10a16 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)))))