This would make ''set -o emacs-usemeta'' a fatal error, which means that
subsequent lines in your kshrc will not be run. I think people were
given enough time to cope with this (6.2 users get a warning).
ok?
Index: misc.c
===================================================================
RCS file: /d/cvs/src/bin/ksh/misc.c,v
retrieving revision 1.59
diff -u -p -r1.59 misc.c
--- misc.c 30 Aug 2017 17:15:36 -0000 1.59
+++ misc.c 18 Oct 2017 19:41:04 -0000
@@ -129,7 +129,6 @@ const struct option options[] = {
{ "csh-history", 0, OF_ANY }, /* non-standard */
#ifdef EMACS
{ "emacs", 0, OF_ANY },
- { "emacs-usemeta", 0, OF_ANY }, /* XXX delete after 6.2 */
#endif
{ "errexit", 'e', OF_ANY },
#ifdef EMACS
@@ -185,13 +184,8 @@ option(const char *n)
int i;
for (i = 0; i < NELEM(options); i++)
- if (options[i].name && strcmp(options[i].name, n) == 0) {
-#ifdef EMACS
- if (i == FEMACSUSEMETA)
- warningf(true, "%s: deprecated option", n);
-#endif
+ if (options[i].name && strcmp(options[i].name, n) == 0)
return i;
- }
return -1;
}
@@ -232,10 +226,6 @@ printoptions(int verbose)
shprintf("Current option settings\n");
for (i = n = oi.opt_width = 0; i < NELEM(options); i++) {
-#ifdef EMACS
- if (i == FEMACSUSEMETA)
- continue;
-#endif
if (options[i].name) {
len = strlen(options[i].name);
oi.opts[n].name = options[i].name;
@@ -250,10 +240,6 @@ printoptions(int verbose)
/* short version ala ksh93 */
shprintf("set");
for (i = 0; i < NELEM(options); i++) {
-#ifdef EMACS
- if (i == FEMACSUSEMETA)
- continue;
-#endif
if (options[i].name)
shprintf(" %co %s",
Flag(i) ? '-' : '+',
Index: sh.h
===================================================================
RCS file: /d/cvs/src/bin/ksh/sh.h,v
retrieving revision 1.64
diff -u -p -r1.64 sh.h
--- sh.h 3 Sep 2017 11:52:01 -0000 1.64
+++ sh.h 18 Oct 2017 16:12:59 -0000
@@ -139,7 +139,6 @@ enum sh_flag {
FCSHHISTORY, /* csh-style history enabled */
#ifdef EMACS
FEMACS, /* emacs command editing */
- FEMACSUSEMETA, /* XXX delete after 6.2 */
#endif
FERREXIT, /* -e: quit on error */
#ifdef EMACS
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
