From 77a47b2c5e7c3243743bd8d7594366f498e9cef7 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 16 Mar 2018 08:18:53 +0000
Subject:  More modifications, and doc change

---
 src/execline/forbacktickx.c    | 6 +++---
 src/execline/multisubstitute.c | 6 +++---
 src/libexecline/exlsn_import.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/execline/forbacktickx.c b/src/execline/forbacktickx.c
index 8b31d92..0ae42e4 100644
--- a/src/execline/forbacktickx.c
+++ b/src/execline/forbacktickx.c
@@ -72,7 +72,7 @@ int main (int argc, char const *const *argv, char const *const *envp)
       if (errno != EBADF) strerr_diefu1sys(111, "dup stdin") ;
     }
     else fmt[uint_fmt(fmt, (unsigned int)fd)] = 0 ;
-    newargv[m++] = EXECLINE_BINPREFIX "pipeline" ;
+    newargv[m++] = EXECLINE_BINPREFIX "|" ;
     newargv[m++] = "--" ;
     while (argv[i] && argv[i][0] != EXECLINE_BLOCK_END_CHAR && (!EXECLINE_BLOCK_END_CHAR || (argv[i][0] && argv[i][1])))
       newargv[m++] = argv[i++] ;
@@ -99,12 +99,12 @@ int main (int argc, char const *const *argv, char const *const *envp)
     newargv[m++] = argv[0] ;
     if (fd < 0)
     {
-      newargv[m++] = EXECLINE_BINPREFIX "fdclose" ;
+      newargv[m++] = EXECLINE_BINPREFIX ">&-" ;
       newargv[m++] = "0" ;
     }
     else
     {
-      newargv[m++] = EXECLINE_BINPREFIX "fdmove" ;
+      newargv[m++] = EXECLINE_BINPREFIX ">&" ;
       newargv[m++] = "0" ;
       newargv[m++] = fmt ;
     }
diff --git a/src/execline/multisubstitute.c b/src/execline/multisubstitute.c
index 444ea47..d140590 100644
--- a/src/execline/multisubstitute.c
+++ b/src/execline/multisubstitute.c
@@ -9,10 +9,10 @@
 
 static char const *const commands[8] =
 {
-  "define",
-  "importas",
+  "=",
+  "$",
   "import",
-  "elglob",
+  "*",
   "elgetpositionals",
   "multidefine",
   0
diff --git a/src/libexecline/exlsn_import.c b/src/libexecline/exlsn_import.c
index 254ab78..61f7cdf 100644
--- a/src/libexecline/exlsn_import.c
+++ b/src/libexecline/exlsn_import.c
@@ -73,7 +73,7 @@ static int exlsn_import_as (int argc, char const **argv, char const *const *envp
 
 int exlsn_import (int argc, char const **argv, char const *const *envp, exlsn_t *info)
 {
-  strerr_warnw1x("the import command and directive are obsolescent, please use importas instead!") ;
+  strerr_warnw1x("the import command and directive are obsolescent, please use $ instead!") ;
   return exlsn_import_as(argc, argv, envp, info, 0) ;
 }
 
-- 
cgit 1.4.1