Merge changes from master

diff --cc libedit/view.c
Simple merge

diff --cc xedit.c
index 22825c90f5beb0389472cce255e5c3d149e0ec42,9832c5161c6e6524a3a03e94725a6241a344af0e..2161177e9c97ae4d0ef15e7a4340dcf4aca60a2c
--- 1/xedit.c
--- 2/xedit.c
+++ b/xedit.c
@@@ -718,3 -736,7 +743,8 @@@ static enum RegionId getregion(size_t x
  static Sel* getsel(enum RegionId id) {
      return &(getview(id)->selection);
  }
+ 
+ static Sel* currsel(void) {
+     return getsel(Focused);
+ }
++