From 9415561a615599cb75e1db5e3679f5551f0da947 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Wed, 20 Nov 2019 20:13:24 -0500 Subject: Remove PSlit --- bin/1sh/1sh.1 | 16 ---------------- bin/1sh/histedit.c | 24 ------------------------ bin/1sh/myhistedit.h | 1 - bin/1sh/var.c | 3 --- 4 files changed, 44 deletions(-) (limited to 'bin/1sh') diff --git a/bin/1sh/1sh.1 b/bin/1sh/1sh.1 index 42d683a8..65e0bda9 100644 --- a/bin/1sh/1sh.1 +++ b/bin/1sh/1sh.1 @@ -1585,22 +1585,6 @@ is active). The default is .Dq Li "+ " . . -.It Va PSlit -Defines the character which may be embedded in pairs, in -.Va PS1 , -.Va PS2 , -.Va RPS1 -or -.Va RPS2 -to indicate to -.Xr editline 7 -that the characters between each pair of occurrences of the -.Va PSlit -character will not appear in the visible prompt, and will not -cause the terminal's cursor to change position, but rather set terminal -attributes for the following prompt character(s) at least one of -which must be present. -. .It Va RPS1 The primary right prompt string. .Va RPS1 diff --git a/bin/1sh/histedit.c b/bin/1sh/histedit.c index 08339a00..0d23e9aa 100644 --- a/bin/1sh/histedit.c +++ b/bin/1sh/histedit.c @@ -223,30 +223,6 @@ sethistsize(const char *hs) } } -void -setpslit(const char *lit_ch) { - wchar_t wc; - - if (!(iflag && editing && el)) - return; - - if (lit_ch == NULL) { - el_set(el, EL_PROMPT, getprompt); - el_set(el, EL_RPROMPT, getrprompt); - return; - } - - mbtowc(&wc, NULL, 1); /* state init */ - - if (mbtowc(&wc, lit_ch, strlen(lit_ch)) <= 0) { - el_set(el, EL_PROMPT, getprompt); - el_set(el, EL_RPROMPT, getrprompt); - } else { - el_set(el, EL_PROMPT_ESC, getprompt, (int)wc); - el_set(el, EL_RPROMPT_ESC, getrprompt, (int)wc); - } -} - void setterm(const char *term) { diff --git a/bin/1sh/myhistedit.h b/bin/1sh/myhistedit.h index 6eebe521..feb4803e 100644 --- a/bin/1sh/myhistedit.h +++ b/bin/1sh/myhistedit.h @@ -41,6 +41,5 @@ extern int displayhist; void histedit(void); void sethistfile(const char *); void sethistsize(const char *); -void setpslit(const char *); void setterm(const char *); diff --git a/bin/1sh/var.c b/bin/1sh/var.c index 83e48732..6cfeefe4 100644 --- a/bin/1sh/var.c +++ b/bin/1sh/var.c @@ -87,7 +87,6 @@ struct varinit { #ifndef NO_HISTORY struct var vhistfile; struct var vhistsize; -struct var vpslit; struct var vterm; #endif struct var venv; @@ -140,8 +139,6 @@ static const struct varinit varinit[] = { { &vrps2, VUNSET, "RPS2=", NULL }, #ifndef NO_HISTORY - { &vpslit, VUNSET, "PSlit=", - setpslit }, { &vterm, VUNSET, "TERM=", setterm }, #endif -- cgit 1.4.1 >unfollow)
Commit message (Collapse)Author
2018-07-22Add map to clientJune McEnroe
2018-07-21Refactor readInput for each modeJune McEnroe
2018-07-19Add ARRAY_LEN macroJune McEnroe
2018-07-17Add server map generationJune McEnroe
2018-07-17Tabify sourceJune McEnroe
And other style changes.
2018-05-13Fix ncurses color pair numberingJune McEnroe
This was dumb. Of course all the color pairs fit in 64, but I was shifting too much because my own representation includes the bright bit.
2018-04-09Use anonymous unionJune McEnroe
2018-04-09Replace #define with enum or const where possibleJune McEnroe
2018-03-31Link against ncursesJune McEnroe
2018-03-05Miscellaneous code cleanupJune McEnroe
2018-03-05Pass message structs by valueJune McEnroe
2018-03-05Use stdio in merge and metaJune McEnroe
2018-03-05Clean up spawn constantsJune McEnroe
2018-03-05Rename Tile timestamps {create,modify,access}TimeJune McEnroe
2018-03-05Pack message type enumsJune McEnroe
2018-03-05Undef COLOR_ constants in torus.hJune McEnroe
2018-03-05Generate tagsJune McEnroe
2017-10-03Simplify Makefile with pattern ruleJune McEnroe
Insert rant about how GNU make handles the .c rule with extra dependencies. Also I don't care that everything links curses now.
2017-09-27Remove leading blank linesJune McEnroe
2017-09-27Add merge.c to READMEJune McEnroe
2017-09-03Assert client coords are valid after movementJune McEnroe
2017-09-03Relicense AGPLJune McEnroe
I know it's already published under a permissive license in what is probably its final form, but I want to license it AGPL anyway on principle following some conversations I had about open source, corporations and copyleft.
2017-09-01Revert "Add client readOnly mode"June McEnroe
This reverts commit 9a6c9c91c8092603b914cc0b3085d059e162ca29.
2017-09-01Remove clientRemove call from clientCastJune McEnroe
If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear.
2017-09-01Add client readOnly modeJune McEnroe
2017-08-31Clean up merge toolJune McEnroe
Choose the version with the most recent access if the modify times are the same.
2017-08-31Choose B for tiles with equal modify timesJune McEnroe
This way newer access counts and times will be preserved.
2017-08-31Add quick data file merge toolJune McEnroe
Hopefully I won't have to use it ever again.
2017-08-30Use only foreground color for selecting spawnJune McEnroe
2017-08-29Add four additional spawnsJune McEnroe
2017-08-28Add respawningJune McEnroe
2017-08-26Move license above includesJune McEnroe
Why was it down there?
2017-08-26Snapshot metadataJune McEnroe
2017-08-26Add meta.c to READMEJune McEnroe
2017-08-26Use MakefileJune McEnroe