[PATCH] emacs: Fix reference to directory variable

[PATCH] emacs: Fix reference to directory variable

[Christopher Allan Webber]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-emacs-Fix-reference-to-directory-variable.patch --]
[-- Type: text/x-diff, Size: 1117 bytes --]

From c935c76e7e45b3ee3b0f191b3e21e041a6404996 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
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

Re: [PATCH] emacs: Fix reference to directory variable

[Mathieu Lirzin]

Christopher Allan Webber <cwebber@dustycloud.org> writes:

> Subject: [PATCH] emacs: Fix reference to directory variable
                                                             ^
Missing a dot here. :)

> * 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.

What about using a reference to the commit which introduces the change
instead of explaining what has been done previously?

--
Mathieu Lirzin

Re: [PATCH] emacs: Fix reference to directory variable

[Alex Kost]

Christopher Allan Webber (2015-07-19 21:23 +0300) wrote:

> 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

My bad, thank you!  Pushed.  I've changed the commit message to
reference the commit introduced this bug, as Mathieu suggested.

-- 
Alex