aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--text.c10
-rw-r--r--text.h4
-rw-r--r--vis-lua.c10
-rw-r--r--vis.lua2
5 files changed, 14 insertions, 14 deletions
diff --git a/README.md b/README.md
index 1eb5f66..1c7a694 100644
--- a/README.md
+++ b/README.md
@@ -612,7 +612,7 @@ At this time there exists no API stability guarantees.
- `lines_iterator()`
- `name`
- `lines[0..#lines+1]` array giving read/write access to lines
- - `newlines` type of newlines either `"nl"` or `"crnl"`
+ - `newlines` type of newlines either `"lf"` or `"crlf"`
- `size` current file size in bytes
- `modified` whether the file contains unsaved changes
- `window`
diff --git a/text.c b/text.c
index 1333824..2163deb 100644
--- a/text.c
+++ b/text.c
@@ -1319,17 +1319,17 @@ bool text_sigbus(Text *txt, const char *addr) {
enum TextNewLine text_newline_type(Text *txt){
if (!txt->newlines) {
- txt->newlines = TEXT_NEWLINE_NL; /* default to UNIX style \n new lines */
+ txt->newlines = TEXT_NEWLINE_LF; /* default to UNIX style \n new lines */
const char *start = txt->block ? txt->block->data : NULL;
if (start) {
const char *nl = memchr(start, '\n', txt->block->len);
if (nl > start && nl[-1] == '\r')
- txt->newlines = TEXT_NEWLINE_CRNL;
+ txt->newlines = TEXT_NEWLINE_CRLF;
} else {
char c;
size_t nl = lines_skip_forward(txt, 0, 1, NULL);
if (nl > 1 && text_byte_get(txt, nl-2, &c) && c == '\r')
- txt->newlines = TEXT_NEWLINE_CRNL;
+ txt->newlines = TEXT_NEWLINE_CRLF;
}
}
@@ -1338,8 +1338,8 @@ enum TextNewLine text_newline_type(Text *txt){
const char *text_newline_char(Text *txt) {
static const char *types[] = {
- [TEXT_NEWLINE_NL] = "\n",
- [TEXT_NEWLINE_CRNL] = "\r\n",
+ [TEXT_NEWLINE_LF] = "\n",
+ [TEXT_NEWLINE_CRLF] = "\r\n",
};
return types[text_newline_type(txt)];
}
diff --git a/text.h b/text.h
index 392bafd..ee7dd6b 100644
--- a/text.h
+++ b/text.h
@@ -121,8 +121,8 @@ bool text_sigbus(Text*, const char *addr);
/* which type of new lines does the text use? */
enum TextNewLine {
- TEXT_NEWLINE_NL = 1,
- TEXT_NEWLINE_CRNL,
+ TEXT_NEWLINE_LF = 1,
+ TEXT_NEWLINE_CRLF,
};
enum TextNewLine text_newline_type(Text*);
diff --git a/vis-lua.c b/vis-lua.c
index 8431111..7e40585 100644
--- a/vis-lua.c
+++ b/vis-lua.c
@@ -53,7 +53,7 @@ static void window_status_update(Vis *vis, Win *win) {
vis_macro_recording(vis) ? " @": "");
left_count++;
- if (text_newline_type(txt) != TEXT_NEWLINE_NL)
+ if (text_newline_type(txt) != TEXT_NEWLINE_LF)
strcpy(right_parts[right_count++], "␊");
int cursor_count = view_cursors_count(view);
@@ -1085,11 +1085,11 @@ static int file_index(lua_State *L) {
if (strcmp(key, "newlines") == 0) {
switch (text_newline_type(file->text)) {
- case TEXT_NEWLINE_NL:
- lua_pushstring(L, "nl");
+ case TEXT_NEWLINE_LF:
+ lua_pushstring(L, "lf");
break;
- case TEXT_NEWLINE_CRNL:
- lua_pushstring(L, "crnl");
+ case TEXT_NEWLINE_CRLF:
+ lua_pushstring(L, "crlf");
break;
default:
lua_pushnil(L);
diff --git a/vis.lua b/vis.lua
index c8d1bb3..528f7b5 100644
--- a/vis.lua
+++ b/vis.lua
@@ -393,7 +393,7 @@ vis.events.win_status = function(win)
table.insert(left_parts, (file.name or '[No Name]') ..
(file.modified and ' [+]' or '') .. (vis.recording and ' @' or ''))
- if file.newlines ~= "nl" then
+ if file.newlines ~= "lf" then
table.insert(right_parts, "␊")
end