getline -> get_line

This commit is contained in:
naddy 2012-03-18 17:02:00 +00:00
parent 9702f4a3db
commit a87d2df940
7 changed files with 86 additions and 1 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.24 2011/11/13 09:22:31 jasper Exp $
# $OpenBSD: Makefile,v 1.25 2012/03/18 17:02:00 naddy Exp $
COMMENT= Jonathan's Own Version of Emacs
V= 4.16.0.73
DISTNAME= jove${V}
PKGNAME= jove-${V}
REVISION= 0
CATEGORIES= editors
# BSD

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-insert_c,v 1.1 2012/03/18 17:02:00 naddy Exp $
--- insert.c.orig Sun Mar 18 10:53:30 2012
+++ insert.c Sun Mar 18 10:53:39 2012
@@ -504,7 +504,7 @@ Buffer *whatbuf;
atchar = 0;
}
- getline(atline->l_dline, genbuf);
+ get_line(atline->l_dline, genbuf);
atchar += tchar;
linecopy(genbuf, atchar, save);
atline->l_dline = putline(genbuf);

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-io_c,v 1.3 2012/03/18 17:02:00 naddy Exp $
--- io.c.orig Sun Mar 18 10:52:54 2012
+++ io.c Sun Mar 18 10:53:09 2012
@@ -1356,9 +1356,9 @@ int Jr_Len; /* length of Just Read Line */
void
#ifdef USE_PROTOTYPES
-getline proto((daddr addr, register char *buf))
+get_line proto((daddr addr, register char *buf))
#else
-getline(addr, buf)
+get_line(addr, buf)
daddr addr;
register char *buf;
#endif

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-io_h,v 1.1 2012/03/18 17:02:00 naddy Exp $
--- io.h.orig Sun Mar 18 10:52:30 2012
+++ io.h Sun Mar 18 10:52:42 2012
@@ -40,7 +40,7 @@ extern void
close_file proto((File *fp)),
d_cache_init proto((void)),
file_write proto((char *fname, bool app)),
- getline proto((daddr addr, char *buf)),
+ get_line proto((daddr addr, char *buf)),
lsave proto((void)),
putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)),
read_file proto((char *file, bool is_insert)),

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-recover_c,v 1.1 2012/03/18 17:02:00 naddy Exp $
--- recover.c.orig Sun Mar 18 10:53:47 2012
+++ recover.c Sun Mar 18 10:54:19 2012
@@ -166,7 +166,7 @@ size_t n;
private char *getblock proto((daddr atl));
void
-getline(tl, buf)
+get_line(tl, buf)
daddr tl;
char *buf;
{
@@ -597,7 +597,7 @@ FILE *out;
Nchars = Nlines = 0L;
while (--nlines >= 0) {
addr = getaddr(ptrs_fp);
- getline(addr, buf);
+ get_line(addr, buf);
Nlines += 1;
Nchars += 1 + strlen(buf);
fputs(buf, out);

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-util_c,v 1.1 2012/03/18 17:02:00 naddy Exp $
--- util.c.orig Sun Mar 18 10:54:56 2012
+++ util.c Sun Mar 18 10:55:05 2012
@@ -280,7 +280,7 @@ char *buf;
strcpy(buf, linebuf);
Jr_Len = strlen(linebuf);
} else
- getline(line->l_dline, buf);
+ get_line(line->l_dline, buf);
return buf;
}

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-util_h,v 1.1 2012/03/18 17:02:00 naddy Exp $
--- util.h.orig Sun Mar 18 10:54:54 2012
+++ util.h Sun Mar 18 10:55:11 2012
@@ -18,7 +18,7 @@ extern int
#define eobp() (lastp(curline) && eolp())
#define eolp() (linebuf[curchar] == '\0')
#define firstp(line) ((line) == curbuf->b_first)
-#define getDOT() getline(curline->l_dline, linebuf)
+#define getDOT() get_line(curline->l_dline, linebuf)
#define lastp(line) ((line) == curbuf->b_last)
extern UnivPtr