From c7e2b3836840bf6f3d13cc5b52b050c5353f35a3 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 22 Apr 2018 17:22:07 -0400
Subject: [PATCH] Move core/debug.el => ./debug.el

"debug.el" conflicts with built-in debug package
---
 core/debug.el => debug.el | 13 ++++++-------
 init.el                   |  7 -------
 2 files changed, 6 insertions(+), 14 deletions(-)
 rename core/debug.el => debug.el (52%)

diff --git a/core/debug.el b/debug.el
similarity index 52%
rename from core/debug.el
rename to debug.el
index e627304f9..0aa3970a3 100644
--- a/core/debug.el
+++ b/debug.el
@@ -1,17 +1,16 @@
-;;; debug.el -*- lexical-binding: t; no-byte-compile: t; -*-
+;;; debug.el -*- lexical-binding: t; -*-
 
-;; load me after running Emacs -Q:
+;; To test something in a blank, vanilla Emacs session (Emacs -Q) load me:
 ;;
-;;   (load-file (concat user-emacs-directory "core/debug.el"))
-;;
-;; then you can test packages in isolation.
+;;   emacs -Q -l debug.el
 
-(setq user-emacs-directory (expand-file-name "../" (file-name-directory load-file-name))
+(setq user-emacs-directory (file-name-directory load-file-name)
       package--init-file-ensured t
       package-user-dir (expand-file-name ".local/packages/elpa" user-emacs-directory)
       package-archives
       '(("gnu"   . "https://elpa.gnu.org/packages/")
         ("melpa" . "https://melpa.org/packages/")
         ("org"   . "https://orgmode.org/elpa/")))
-
 (package-initialize)
+
+;; Then you can test packages in isolation here...
diff --git a/init.el b/init.el
index d779d3db8..50621daa5 100644
--- a/init.el
+++ b/init.el
@@ -28,10 +28,3 @@
 ;;; License: MIT
 
 (require 'core (concat user-emacs-directory "core/core"))
-
-;; To test something in a blank, vanilla Emacs session (Emacs -Q) comment the
-;; require above and load core/debug.el instead:
-;;
-;; (load (concat user-emacs-directory "core/debug.el"))
-;;
-;; <-- place debug code here -->