From b3cbff3e4e80aac25f922d7fec4e198c6dde95b3 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Mon, 17 Aug 2020 17:56:52 -0400
Subject: Updated some documentation and use macOS instead of Mac OSX.

---
 src/Makefile    | 2 +-
 src/lua.patch   | 4 ++--
 src/textadept.c | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index 7600d28b..b15da680 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,7 +35,7 @@ ifeq (win, $(findstring win, $(MAKECMDGOALS)))
     CURSES_LIBS = win32curses/lib/pdcurses.a win32curses/lib/libiconv.a
   endif
 else ifeq (osx, $(findstring osx, $(MAKECMDGOALS)))
-  # Cross-compile for Mac OSX.
+  # Cross-compile for macOS.
   CROSS = x86_64-apple-darwin9-
   CFLAGS += -mdynamic-no-pic
   CXXFLAGS += -mdynamic-no-pic
diff --git a/src/lua.patch b/src/lua.patch
index f9f76cfb..05a9253d 100644
--- a/src/lua.patch
+++ b/src/lua.patch
@@ -433,8 +433,8 @@ diff -r 8a23edc91533 src/luaconf.h
 +static int monitoring_fds = 0;
 +/**
 + * Monitors spawned fds when GTK is idle.
-+ * This is necessary because at the moment, using GLib on Mac OSX to spawn
-+ * and monitor file descriptors mostly blocks when attempting to poll those fds.
++ * This is necessary because at the moment, using GLib on macOS to spawn and
++ * monitor file descriptors mostly blocks when attempting to poll those fds.
 + */
 +static int monitor_fds(void *L) {
 +  struct timeval timeout = {0, 1e5}; // 0.1s
diff --git a/src/textadept.c b/src/textadept.c
index ace653ed..2d9c06a8 100644
--- a/src/textadept.c
+++ b/src/textadept.c
@@ -1811,7 +1811,7 @@ static bool exiting(GtkWidget *_, GdkEventAny *__, void *L) {
 
 #if (__APPLE__ && !CURSES)
 /**
- * Signal for opening files from OSX.
+ * Signal for opening files from macOS.
  * Generates an 'appleevent_odoc' event for each document sent.
  */
 static bool open_file(GtkosxApplication*_, char *path, void *L) {
@@ -1819,7 +1819,7 @@ static bool open_file(GtkosxApplication*_, char *path, void *L) {
 }
 
 /**
- * Signal for block terminating Textadept from OSX.
+ * Signal for block terminating Textadept from macOS.
  * Generates a 'quit' event.
  */
 static bool terminating(GtkosxApplication *_, void *L) {
@@ -1827,7 +1827,7 @@ static bool terminating(GtkosxApplication *_, void *L) {
 }
 
 /**
- * Signal for terminating Textadept from OSX.
+ * Signal for terminating Textadept from macOS.
  * Closes the Lua state and releases resources.
  * @see close_lua
  */
-- 
cgit v1.2.3