~ruther/guix-local

a05c06720a32220ab4b688fd2496746099a6da39 — Mark H Weaver 10 years ago bd90127
emacs-build-system: Fix 'package-name-version->elpa-name-version'.

Fixes a regression introduced in b7c7c03eb5e37fc3455e4e17b0898ffc4bca29c3.

* guix/build/emacs-build-system.scm (package-name-version->elpa-name-version):
  Remove unused 'name' binding.  Do not abuse 'strip-store-file-name' to
  remove the "emacs-" prefix, which worked before b7c7c03eb5 but not after.
1 files changed, 3 insertions(+), 4 deletions(-)

M guix/build/emacs-build-system.scm
M guix/build/emacs-build-system.scm => guix/build/emacs-build-system.scm +3 -4
@@ 138,10 138,9 @@ DIRS."
(define (package-name-version->elpa-name-version name-ver)
  "Convert the Guix package NAME-VER to the corresponding ELPA name-version
format.  Essnetially drop the prefix used in Guix."
  (let ((name (strip-store-file-name name-ver)))
    (if (emacs-package? name-ver)
        (strip-store-file-name name-ver)
        name-ver)))
  (if (emacs-package? name-ver)  ; checks for "emacs-" prefix
      (string-drop name-ver (string-length "emacs-"))
      name-ver))

(define (store-directory->elpa-name-version store-dir)
  "Given a store directory STORE-DIR return the part of the basename after the