From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christopher Allan Webber Subject: [PATCH] emacs: Fix reference to directory variable Date: Sun, 19 Jul 2015 13:23:02 -0500 Message-ID: <87io9g6m3b.fsf@dustycloud.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGtHb-0006jT-Kp for guix-devel@gnu.org; Sun, 19 Jul 2015 14:25:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZGtHa-0005a2-5J for guix-devel@gnu.org; Sun, 19 Jul 2015 14:25:51 -0400 Received: from [2600:3c02::f03c:91ff:feae:cb51] (port=40832 helo=dustycloud.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZGtHa-0005Zl-0A for guix-devel@gnu.org; Sun, 19 Jul 2015 14:25:50 -0400 Received: from earlgrey (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id C7B7A26745 for ; Sun, 19 Jul 2015 14:25:47 -0400 (EDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Hello, I noticed that guix's emacs mode contained a bug which prevented my full emacs config from loading... turns out it was due to a variable reference to a variable which had recently been renamed, thus turning a small warning message into an unintentional error! :) A small fix is below. - Chris --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-emacs-Fix-reference-to-directory-variable.patch >From c935c76e7e45b3ee3b0f191b3e21e041a6404996 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 19 Jul 2015 13:17:44 -0500 Subject: [PATCH] emacs: Fix reference to directory variable * emacs/guix-emacs.el (guix-emacs-find-autoloads): Fix variable reference to 'elisp-root-dir', which kept the old name of 'dir' despite having been renamed above. This had introduced a bug where a mundane warning would instead cause a variable reference error. --- emacs/guix-emacs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs/guix-emacs.el b/emacs/guix-emacs.el index 4c3aa23..ddcef0a 100644 --- a/emacs/guix-emacs.el +++ b/emacs/guix-emacs.el @@ -69,7 +69,7 @@ Return nil if there are no emacs packages installed in PROFILE." (guix-emacs-subdirs elisp-pkgs-dir)))) (append root-autoloads pkgs-autoloads)) root-autoloads)) - (message "Directory '%s' does not exist." dir) + (message "Directory '%s' does not exist." elisp-root-dir) nil))) ;;;###autoload -- 2.1.4 --=-=-=--