Commit b1b643f6 authored by bapt's avatar bapt
Browse files

Update to 0.8.0

parent 558c44ce
......@@ -2,9 +2,7 @@
PORTNAME= sc-im
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.0-81
DISTVERSIONSUFFIX= -g9beb5c0
PORTREVISION= 1
DISTVERSION= 0.8.0
CATEGORIES= math
MAINTAINER= bapt@FreeBSD.org
......
TIMESTAMP = 1557829056
SHA256 (andmarti1424-sc-im-v0.7.0-81-g9beb5c0_GH0.tar.gz) = 70aecca365ae382c05088c6fb40736cc1046c62e1ef8868fb2dc72f126b1f5b3
SIZE (andmarti1424-sc-im-v0.7.0-81-g9beb5c0_GH0.tar.gz) = 1114554
TIMESTAMP = 1616600730
SHA256 (andmarti1424-sc-im-v0.8.0_GH0.tar.gz) = edc9b9d2dc5ac37c31a46462a1387605983149a1abba00d47ac22f2726ce6d27
SIZE (andmarti1424-sc-im-v0.8.0_GH0.tar.gz) = 1386374
--- cmds.c.orig 2019-02-22 18:41:46 UTC
+++ cmds.c
@@ -65,7 +65,7 @@
#endif
void syncref(register struct enode *e);
-extern unsigned int shall_quit;
+extern int shall_quit;
char insert_edit_submode;
struct ent * freeents = NULL; // keep deleted ents around before sync_refs
wchar_t interp_line[BUFFERSIZE];
--- cmds_command.c.orig 2019-02-22 18:41:46 UTC
+++ cmds_command.c
@@ -81,7 +81,7 @@ extern char * rev;
extern struct dictionary * user_conf_d;
wchar_t inputline[BUFFERSIZE];
-wchar_t interp_line[BUFFERSIZE];
+extern wchar_t interp_line[BUFFERSIZE];
int inputline_pos; /**< Position in window. Some chars has 2 chars width */
// see https://en.wikipedia.org/wiki/Halfwidth_and_fullwidth_forms
int real_inputline_pos; /**< Real position in inputline */
@@ -853,7 +853,7 @@ void do_commandmode(struct block * sb) {
exec_cmd(line);
} else if ( inputline[0] == L'w' ) {
- if (savefile() == 0 && ! wcscmp(inputline, L"wq")) shall_quit = 1;
+ if (savefile() == 0 && ! wcsncmp(inputline, L"wq", 2)) shall_quit = 1;
} else if ( ! wcsncmp(inputline, L"file ", 5) ) {
--- cmds_normal.c.orig 2019-02-22 18:41:46 UTC
+++ cmds_normal.c
@@ -70,7 +70,7 @@ extern int cmd_multiplier;
extern void start_visualmode(int tlrow, int tlcol, int brrow, int brcol);
extern void ins_in_line(wint_t d);
-wchar_t interp_line[BUFFERSIZE];
+extern wchar_t interp_line[BUFFERSIZE];
#ifdef HISTORY_FILE
extern struct history * commandline_history;
--- cmds_visual.c.orig 2019-02-22 18:41:46 UTC
+++ cmds_visual.c
@@ -440,7 +440,7 @@ void do_visualmode(struct block * buf) {
sc_error("Locked cells encountered. Nothing changed");
return;
}
- wchar_t interp_line[BUFFERSIZE];
+ extern wchar_t interp_line[BUFFERSIZE];
if (buf->value == L'{') swprintf(interp_line, BUFFERSIZE, L"leftjustify %s", v_name(r->tlrow, r->tlcol));
else if (buf->value == L'}') swprintf(interp_line, BUFFERSIZE, L"rightjustify %s", v_name(r->tlrow, r->tlcol));
else if (buf->value == L'|') swprintf(interp_line, BUFFERSIZE, L"center %s", v_name(r->tlrow, r->tlcol));
--- color.c.orig 2019-02-22 18:41:46 UTC
+++ color.c
@@ -60,6 +60,8 @@
#include "conf.h"
#include "cmds.h"
+struct ucolor ucolors[N_INIT_PAIRS] = {};
+
static struct dictionary * d_colors_param = NULL;
struct dictionary * get_d_colors_param() {
--- color.h.orig 2019-02-22 18:41:46 UTC
+++ color.h
@@ -57,7 +57,7 @@ struct ucolor {
int blink;
};
-struct ucolor ucolors[N_INIT_PAIRS];
+extern struct ucolor ucolors[N_INIT_PAIRS];
struct dictionary * get_d_colors_param();
void start_default_ucolors();
--- file.c.orig 2019-05-11 16:23:57 UTC
+++ file.c
@@ -189,21 +189,23 @@ int modcheck() {
int savefile() {
int force_rewrite = 0;
+ int shall_quit = 0;
char name[BUFFERSIZE];
#ifndef NO_WORDEXP
size_t len;
wordexp_t p;
#endif
- if (! curfile[0] && wcslen(inputline) < 3) { // casos ":w" ":w!" ":x" ":x!"
+ if (! curfile[0] && wcslen(inputline) < 3) { // casos ":w" ":w!" ":wq" ":x" ":x!"
sc_error("There is no filename");
return -1;
}
if (inputline[1] == L'!') force_rewrite = 1;
+ if (inputline[1] == L'q') shall_quit = 1;
wcstombs(name, inputline, BUFFERSIZE);
- del_range_chars(name, 0, 1 + force_rewrite);
+ del_range_chars(name, 0, 1 + force_rewrite + shall_quit);
#ifndef NO_WORDEXP
wordexp(name, &p, 0);
@@ -221,7 +223,7 @@ int savefile() {
#endif
if (! force_rewrite && file_exists(name)) {
- sc_error("File already exists. Use \"!\" to force rewrite.");
+ sc_error("File already exists. Use \"w!\" to force rewrite.");
return -1;
}
@@ -235,7 +237,7 @@ int savefile() {
// if it exists and no '!' is set, return.
if (!strlen(curfile) && backup_exists(name)) {
if (!force_rewrite) {
- sc_error("Backup file of %s exists. Use \"!\" to force the write process.", name);
+ sc_error("Backup file of %s exists. Use \"w!\" to force the write process.", name);
return -1;
} else remove_backup(name);
}
--- filter.c.orig 2019-02-22 18:41:46 UTC
+++ filter.c
@@ -61,6 +61,8 @@ static int howmany = 0; /**< how many filters wer
static int active = 0; /**< indicates if those filters are applied or not */
static int * results = NULL; /**< this keeps the results of the applied filters */
+static struct filter_item * filters = NULL;
+
/**
* \brief Add a filter to filters structure
*
--- filter.h.orig 2019-02-22 18:41:46 UTC
+++ filter.h
@@ -44,7 +44,7 @@
struct filter_item {
char * eval;
-} * filters;
+};
void show_filters();
void add_filter(char * criteria);
--- input.c.orig 2019-02-22 18:41:46 UTC
+++ input.c
@@ -64,7 +64,6 @@ static int d; // char read from stdin
int return_value; // return value of getch()
int cmd_multiplier = 0; // Multiplier
int cmd_pending = 0; // Command pending
-int shall_quit; // Break loop if ESC key is pressed
/**
* \brief Reads stdin for a valid command
--- tui.c.orig 2020-09-02 08:06:29 UTC
+++ tui.c
@@ -102,7 +102,6 @@ WINDOW * main_win;
WINDOW * input_win;
SCREEN * sstderr;
SCREEN * sstdout;
-srange * ranges;
/**
* \brief Called to start UI
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment