From 2886d2513b836b5ca2732c51a54eda6ad879cfe9 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Wed, 10 Oct 2018 09:57:44 -0700
Subject: [PATCH] Fix typo in merge.

---
 src/runtime/global.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/runtime/global.scm b/src/runtime/global.scm
index ef75663c9..873cac585 100644
--- a/src/runtime/global.scm
+++ b/src/runtime/global.scm
@@ -154,11 +154,11 @@ USA.
 	   (lambda (port) (display "Loading Edwin" port))
 	   (lambda ()
 	     (parameterize ((param:suppress-loading-message? #t))
-		(load-option 'edwin)
-		(if (let ((display (get-environment-variable "DISPLAY")))
-		      (and (string? display)
-			   (not (string-null? display))))
-		    (ignore-errors (lambda () (load-option 'x11-screen))))))))
+	       (load-option 'edwin)
+	       (if (let ((display (get-environment-variable "DISPLAY")))
+		     (and (string? display)
+			  (not (string-null? display))))
+		   (ignore-errors (lambda () (load-option 'x11-screen)))))))
 	  (apply (environment-lookup (->environment '(edwin)) 'edit) args)))))
 
 (define edwin edit)
-- 
2.25.1