Fix "edlib -g"

Obviously this was never tested last time I made a change.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/DOC/TODO.md b/DOC/TODO.md
index 87fc877dfc34def1b26b470e84949d8094ff2699..54550ef56040db60f985216ecfe489576bbce02c 100644 (file)
--- a/DOC/TODO.md
+++ b/DOC/TODO.md
@@ -35,17 +35,6 @@ the file.
       so markup can be tested more directly.
 - [X] in search-replace if you repeat :A-Enter, chars get deleted - if
        replacement string is shorter.  If longer, they get added.
-- [ ] I think I want a "Workspaces" concept, maybe tabbed set of tile
-      collections.  I would have one of mail and one for each project
-      that I might be looking in.  I have lots of documents, but few
-      projects so this would be easier to move between.
-      "grep" and "make" etc don't care which document in a project they
-      are in.
-      "nm" already gets me to the email project quickly.  Getting back
-      is not so easy.
-      Maybe some docs could be marked "project" and so be easy to find?
-      Maybe docs could be associated with a session, and are preferred
-      for select-new-document operations.
 - [ ] path completion in shell command.  If cannot find look for '/'
       following punctuation (=) and try there.
 - [ ] resolve shift-left vs shift_left distinction - add a "fixed" suffix?
@@ -55,9 +44,7 @@ the file.
 - [ ] mergeview command to show diff between "found" and "replacement".
 - [ ] mergeview command to include both found and replacement, discard
   expected
-- [ ] ./edlib -g doesn't work
-- [ ] pop up window to show selection as QR code
-- [ ] text qrcode (qr --ascii foo) don't look right in xcb display
+- [X] ./edlib -g doesn't work
 - [ ] Review the options for editing a merge - it doesn't always do what
       I want.  Maybe have a menu of choices to remind me
 - [ ] Teach render-lines to pad spaces to left/right align text
@@ -213,6 +200,25 @@ Core features
 Module features
 ---------------
 
+### lib-qrcode
+
+- [ ] pop up window to show selection as QR code
+- [ ] text qrcode (qr --ascii foo) don't look right in xcb display
+
+### workspaces
+
+- [ ] I think I want a "Workspaces" concept, maybe tabbed set of tile
+      collections.  I would have one of mail and one for each project
+      that I might be looking in.  I have lots of documents, but few
+      projects so this would be easier to move between.
+      "grep" and "make" etc don't care which document in a project they
+      are in.
+      "nm" already gets me to the email project quickly.  Getting back
+      is not so easy.
+      Maybe some docs could be marked "project" and so be easy to find?
+      Maybe docs could be associated with a session, and are preferred
+      for select-new-document operations.
+
 ### render-stack
 
    My idea is to have a generic rendering pane which draws row or column

diff --git a/python/display-pygtk.py b/python/display-pygtk.py
index e93ddd0d7535e98996952bac8f377604a0612681..6d2367b56344ce67160db0efa16ba4701684d6a0 100644 (file)
--- a/python/display-pygtk.py
+++ b/python/display-pygtk.py
@@ -754,7 +754,7 @@ def new_display(key, focus, comm2, str1, **a):
     disp = EdDisplay(ed, display)
     p = disp.call("editor:activate-display", ret='pane')
     if p and focus != ed:
-        p = focus.call("doc:attach-view", p, 1)
+        p = focus.call("doc:attach-view", p, 1, ret='pane')
     if comm2:
         comm2('callback', p)
     return 1