Skip to content

Commit

Permalink
editors/mg: Update to 20240405
Browse files Browse the repository at this point in the history
ChangeLog: https://cvsweb.openbsd.org/src/usr.bin/mg/

 * Reinstate space-to-tabstop entry in manpage
 * Call vttidy in the exit path for batch mode
 * Fix hang for (regexp-replace "^.*$" "")

PR:		278248
Reported by:	cdr.nil@gmail.com
  • Loading branch information
mpwillson authored and fernape committed Apr 11, 2024
1 parent d92c732 commit 37579ae
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
3 changes: 1 addition & 2 deletions editors/mg/Makefile
@@ -1,6 +1,5 @@
PORTNAME= mg
DISTVERSION= 20231016
PORTREVISION= 1
DISTVERSION= 20240405
PORTEPOCH= 1
CATEGORIES= editors
MASTER_SITES= https://hydrus.org.uk/downloads/
Expand Down
6 changes: 3 additions & 3 deletions editors/mg/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1698048672
SHA256 (mg-20231016.tar.gz) = ef16fb32aae1dc132d4250039eb0a057826c7e888beb39bdf4748c0a4b0179e9
SIZE (mg-20231016.tar.gz) = 154296
TIMESTAMP = 1712395301
SHA256 (mg-20240405.tar.gz) = abda55c6c53e8316324d56a9851865ada13f9cd82295f3757de7cb4b83bead57
SIZE (mg-20240405.tar.gz) = 156768
26 changes: 6 additions & 20 deletions editors/mg/files/patch-main.c
@@ -1,4 +1,4 @@
--- main.c.orig 2023-10-20 07:56:18 UTC
--- main.c.orig 2023-10-24 10:26:02 UTC
+++ main.c
@@ -16,7 +16,7 @@
#include <string.h>
Expand All @@ -9,7 +9,7 @@

#include "def.h"
#include "kbd.h"
@@ -43,6 +43,10 @@ struct mgwin *wheadp; /* MGWIN listhead */
@@ -43,6 +43,10 @@ char pat[NPAT]; /* pattern */
struct vhead varhead; /* Variable list head */
char pat[NPAT]; /* pattern */

Expand All @@ -20,28 +20,14 @@
static void edinit(struct buffer *);
static void pty_init(void);
static __dead void usage(void);
@@ -71,10 +75,6 @@ main(int argc, char **argv)
@@ -70,10 +74,6 @@ main(int argc, char **argv)
int o, i, nfiles;
int nobackups = 0;
struct buffer *bp = NULL;
-
- if (pledge("stdio rpath wpath cpath fattr chown getpw tty proc exec",
- NULL) == -1)
- err(1, "pledge");
-
while ((o = getopt(argc, argv, "nRb:f:u:")) != -1)
switch (o) {
case 'b':
@@ -167,9 +167,11 @@ main(int argc, char **argv)
ffclose(ffp, NULL);
}

- if (batch)
+ if (batch) {
+ vttidy();
return (0);
-
+ }
+
/*
* Now ensure any default buffer modes from the startup file are
* given to any files opened when parsing the startup file.
15 changes: 15 additions & 0 deletions editors/mg/files/patch-re_search.c
@@ -0,0 +1,15 @@
--- re_search.c.orig 2024-04-06 09:29:51 UTC
+++ re_search.c
@@ -342,10 +342,9 @@ re_forwsrch(void)
if (tbo == clp->l_used)
/*
* Don't start matching past end of line -- must move to
- * beginning of next line, unless line is empty or at
- * end of file.
+ * beginning of next line, unless at end of file.
*/
- if (clp != curbp->b_headp && llength(clp) != 0) {
+ if (clp != curbp->b_headp) {
clp = lforw(clp);
tdotline++;
tbo = 0;

0 comments on commit 37579ae

Please sign in to comment.