From: Michael D. Lowis <mike.lowis@gentex.com>
Date: Tue, 31 Jan 2017 16:38:21 +0000 (-0500)
Subject: Merge changes from master
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=84112db1d30dbcc31bcb4b6f5890f0ab1f18b78b;p=projs%2Ftide.git

Merge changes from master
---

84112db1d30dbcc31bcb4b6f5890f0ab1f18b78b
diff --cc TODO.md
index bed34ec,448a7c8..d3ee034
--- a/TODO.md
+++ b/TODO.md
@@@ -31,7 -31,7 +30,8 @@@ The Future
  
  # Auxillary Programs
  
 -* Acme-like window manager
 +* Visual diff tool
  * Win-like terminal emulator
  * File browser
 +* Acme-like window manager
+ 
diff --cc inc/x11.h
index e875b13,1abd4fb..604d215
--- a/inc/x11.h
+++ b/inc/x11.h
@@@ -147,5 -141,3 +147,6 @@@ void x11_font_getglyph(XFont font, XGly
  size_t x11_font_getglyphs(XGlyphSpec* specs, const XGlyph* glyphs, int len, XFont font, int x, int y);
  void x11_draw_glyphs(int fg, int bg, XGlyphSpec* glyphs, size_t nglyphs);
  void x11_draw_utf8(XFont font, int fg, int bg, int x, int y, char* str);
 +bool x11_getsel(int selid, void(*cbfn)(char*));
 +bool x11_setsel(int selid, char* str);
++
diff --cc xedit.c
index 9f7602b,5349ee8..f20b921
--- a/xedit.c
+++ b/xedit.c
@@@ -179,12 -179,16 +179,14 @@@ static KeyBinding Bindings[] = 
  
  /* External Commands
   *****************************************************************************/
+ /* The shell: Filled in with $SHELL. Used to execute commands */
+ static char* ShellCmd[] = { NULL, "-c", NULL, NULL };
+ 
  #ifdef __MACH__
  static char* CopyCmd[]  = { "pbcopy", NULL };
 -static char* PasteCmd[] = { "pbpaste", NULL };
  #else
  static char* CopyCmd[]  = { "xsel", "-bi", NULL };
 -static char* PasteCmd[] = { "xsel", "-bo", NULL };
  #endif
- static char* ShellCmd[] = { "/bin/sh", "-c", NULL, NULL };
  static char* PickFileCmd[] = { "xfilepick", ".", NULL };
  static char* PickTagCmd[] = { "xtagpick", "tags", NULL, NULL };
  static char* OpenCmd[] = { "xedit", NULL, NULL };