From d56a5dcc385ad4a6d529fb8246bbe56da0e504fb Mon Sep 17 00:00:00 2001
From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Tue, 17 Nov 2009 09:01:14 +0100
Subject: [PATCH] macro hooks: move post_open call in front of -do macro

---
 ewmh-raise.diff   |  2 +-
 macro_hooks.patch | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ewmh-raise.diff b/ewmh-raise.diff
index 336a533..5eaec0a 100644
--- a/ewmh-raise.diff
+++ b/ewmh-raise.diff
@@ -16,7 +16,7 @@ diff --quilt old/source/server.c new/source/server.c
      	    XMapRaised(TheDisplay, XtWindow(window->shell));
      	}
  	return;
-@@ -501,8 +502,10 @@ static void processServerCommandString(c
+@@ -505,8 +506,10 @@ static void processServerCommandString(c
  	    if (*doCommand != '\0') {
  		RaiseDocument(window);
  
diff --git a/macro_hooks.patch b/macro_hooks.patch
index e6fd2aa..56e7223 100644
--- a/macro_hooks.patch
+++ b/macro_hooks.patch
@@ -38,9 +38,9 @@ The following hooks are present:
  source/nedit.h               |    1 
  source/preferences.c         |    3 
  source/selection.c           |   11 ++-
- source/server.c              |   62 ++++++++++----------
+ source/server.c              |   63 ++++++++++----------
  source/window.c              |   22 +++++++
- 16 files changed, 372 insertions(+), 59 deletions(-)
+ 16 files changed, 373 insertions(+), 59 deletions(-)
 
 diff --quilt old/doc/help.etx new/doc/help.etx
 --- old/doc/help.etx
@@ -860,7 +860,7 @@ diff --quilt old/source/server.c new/source/server.c
  	   break;
  	}
  
-@@ -482,12 +477,14 @@ static void processServerCommandString(c
+@@ -482,16 +477,22 @@ static void processServerCommandString(c
  	    }
  	    
  	}
@@ -877,13 +877,16 @@ diff --quilt old/source/server.c new/source/server.c
  
  	    if (lineNum > 0)
  		SelectNumberedLine(window, lineNum);
-@@ -517,10 +514,13 @@ static void processServerCommandString(c
- 	    if (window) {
- 	    	lastFile = window;
- 		lastIconic = iconicFlag;
+ 
++            /* post_open can't close the document */
++            if (needToCallPostOpenHook)
++                PostOpenHook(window);
 +
-+                if (needToCallPostOpenHook)
-+                    PostOpenHook(window);
+ 	    if (*doCommand != '\0') {
+ 		RaiseDocument(window);
+ 
+@@ -519,8 +520,8 @@ static void processServerCommandString(c
+ 		lastIconic = iconicFlag;
  	    }
  	} else {
 -            deleteFileOpenProperty2(filename, pathname);
-- 
2.11.4.GIT