2 files changed, 9 insertions, 6 deletions

diff --git a/config b/config
index e837b6a2..bd9b980b 100644
--- a/config
+++ b/config
@@ -44,7 +44,7 @@ set $menu dmenu_run
     bindsym $mod+Shift+e exit
 #
 # Moving around:
-# 
+#
     # Move your focus around with $mod+[h|j|k|l], like vim
     bindsym $mod+h focus left
     bindsym $mod+j focus down
@@ -68,7 +68,7 @@ set $menu dmenu_run
     bindsym $mod+Shift+Right move right
 #
 # Workspaces:
-# 
+#
     # switch to workspace
     bindsym $mod+1 workspace 1
     bindsym $mod+2 workspace 2
@@ -91,7 +91,7 @@ set $menu dmenu_run
     bindsym $mod+Shift+8 move container to workspace 8
     bindsym $mod+Shift+9 move container to workspace 9
     bindsym $mod+Shift+0 move container to workspace 10
-# 
+#
 # Layout stuff:
 #
     # You can "split" the current object of your focus with
@@ -118,10 +118,10 @@ set $menu dmenu_run
     bindsym $mod+a focus parent
 #
 # Scratchpad:
-# 
+#
     # Sway has a "scratchpad", which is a bag of holding for windows.
     # You can send windows there and get them back later.
-    
+
     # Move the currently focused window to the scratchpad
     bindsym $mod+Shift+minus move scratchpad
 
diff --git a/sway/config.c b/sway/config.c
index fc21b2a9..4955c94f 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -238,15 +238,18 @@ bool read_config(FILE *file, bool is_active) {
         bool success = true;
         enum cmd_status block = CMD_BLOCK_END;
 
+        int line_number = 0;
         char *line;
         while (!feof(file)) {
                 line = read_line(file);
+                line_number++;
                 line = strip_comments(line);
                 struct cmd_results *res = config_command(line);
                 switch(res->status) {
                 case CMD_FAILURE:
                 case CMD_INVALID:
-                        sway_log(L_ERROR, "Error on line '%s': %s", line, res->error);
+                        sway_log(L_ERROR, "Error on line %i '%s': %s", line_number, line,
+                                res->error);
                         success = false;
                         break;