patch 8.2.1442: outdated references to the Mac Carbon GUI
Problem: Outdated references to the Mac Carbon GUI.
Solution: Remove or update references. (Yee Cheng Chin, closes #6703)
diff --git a/src/Makefile b/src/Makefile
index b025a94..fbb9173 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -375,9 +375,6 @@
#CONF_OPT_GUI = --enable-gui=athena
#CONF_OPT_GUI = --enable-gui=nextaw
-# Carbon GUI for Mac OS X
-#CONF_OPT_GUI = --enable-gui=carbon
-
# Uncomment this line to run an individual test with gvim.
#GUI_TESTARG = GUI_FLAG=-g
@@ -3306,9 +3303,6 @@
objects/gui_photon.o: gui_photon.c
$(CCC) -o $@ gui_photon.c
-objects/gui_mac.o: gui_mac.c
- $(CCC) -o $@ gui_mac.c
-
objects/highlight.o: highlight.c
$(CCC) -o $@ highlight.c
@@ -3692,13 +3686,6 @@
rm -f gui_mac.rsrc
mv gui_mac.rsrc.rsrcfork $(RESDIR)/$(VIMNAME).rsrc
-# po/Make_osx.pl says something about generating a Mac message file
-# for Ukrainian. Would somebody using Mac OS X in Ukrainian
-# *really* be upset that Carbon Vim was not localised in
-# Ukrainian?
-#
-#bundle-language: bundle-dir po/Make_osx.pl
-# cd po && perl Make_osx.pl --outdir ../$(RESDIR) $(MULTILANG)
bundle-language: bundle-dir
$(APPDIR)/Contents:
diff --git a/src/auto/configure b/src/auto/configure
index 5cef555..c85dec9 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -9246,8 +9246,7 @@
auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto - disable GUI support for Mac OS" >&5
$as_echo "auto - disable GUI support for Mac OS" >&6; } ;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5
-$as_echo "Sorry, $enable_gui GUI is not supported" >&6; }
- SKIP_CARBON=YES ;;
+$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } ;;
esac
else
diff --git a/src/configure.ac b/src/configure.ac
index e17a74c..a2683a6 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2433,8 +2433,7 @@
yes|"") AC_MSG_RESULT(yes - automatic GUI support)
gui_auto=yes ;;
auto) AC_MSG_RESULT(auto - disable GUI support for Mac OS) ;;
- *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported])
- SKIP_CARBON=YES ;;
+ *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;;
esac
else
diff --git a/src/gui_haiku.cc b/src/gui_haiku.cc
index 60926f9..c929409 100644
--- a/src/gui_haiku.cc
+++ b/src/gui_haiku.cc
@@ -654,7 +654,7 @@
drop_callback(void *cookie)
{
// TODO here we could handle going to a specific position in the dropped
- // file (see src/gui_mac.c)
+ // file (see src/gui_mac.c, deleted in 8.2.1422)
// Update the screen display
update_screen(NOT_VALID);
}
diff --git a/src/os_macosx.m b/src/os_macosx.m
index 0ac59b4..0299fe4 100644
--- a/src/os_macosx.m
+++ b/src/os_macosx.m
@@ -29,11 +29,8 @@
/*
* Clipboard support for the console.
- * Don't include this when building the GUI version, the functions in
- * gui_mac.c are used then. TODO: remove those instead?
- * But for MacVim we do need these ones.
*/
-#if defined(FEAT_CLIPBOARD) && (!defined(FEAT_GUI_ENABLED))
+#if defined(FEAT_CLIPBOARD)
/* Used to identify clipboard data copied from Vim. */
diff --git a/src/testdir/test_iminsert.vim b/src/testdir/test_iminsert.vim
index 92af227..d0991c3 100644
--- a/src/testdir/test_iminsert.vim
+++ b/src/testdir/test_iminsert.vim
@@ -37,7 +37,7 @@
func Test_getimstatus()
if has('win32')
CheckFeature multi_byte_ime
- elseif !has('gui_mac')
+ else
CheckFeature xim
endif
if has('win32') && has('gui_running')
@@ -87,7 +87,7 @@
CheckGui
if has('win32')
CheckFeature multi_byte_ime
- elseif !has('gui_mac')
+ else
CheckFeature xim
endif
if has('gui_running') && !has('win32')
diff --git a/src/version.c b/src/version.c
index 877ba49..95337c7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1442,
+/**/
1441,
/**/
1440,
diff --git a/src/vim.h b/src/vim.h
index a780ec9..6377dab 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -2155,8 +2155,6 @@
|| !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)))
// Whether IME is supported by im_get_status() defined in mbyte.c.
// For Win32 GUI it's in gui_w32.c when FEAT_MBYTE_IME or GLOBAL_IME is defined.
-// for Mac it is in gui_mac.c for the GUI or in os_mac_conv.c when
-// MACOS_CONVERT is defined.
# define IME_WITHOUT_XIM
#endif