From c5bdda95ce704c3c5454220c18e6abf28d4dd105 Mon Sep 17 00:00:00 2001 From: Sameer Rahmani Date: Wed, 11 Nov 2020 12:39:42 +0000 Subject: [PATCH] Fix the merge problem in fpkg --- lib/fpkg.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fpkg.el b/lib/fpkg.el index bee82ad..8386f70 100644 --- a/lib/fpkg.el +++ b/lib/fpkg.el @@ -125,10 +125,10 @@ `(fg42-install-extension ,(eval pkgname)) `(use-package ,(eval pkgname) ,@details))) -;; (defun depends-on (pkgname &rest args) -;; "Install the package PKGNAME with respect to the ARGS." -;; (let ((pkg (apply 'make-fpkg-dependency :name pkgname args))) -;; (puthash pkgname pkg required-packages))) +(defun depends-on (pkgname &rest args) + "Install the package PKGNAME with respect to the ARGS." + (let ((pkg (apply 'make-fpkg-dependency :name pkgname args))) + (puthash pkgname pkg required-packages))) (provide 'fpkg)