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/READMEdir/README_extra.txt b/READMEdir/README_extra.txt
index c12827e41fd2c04fff9620f898d3ff72afab1d78..4f22d1bcc2662180045ea6a17f73bad7a031b451 100644 (file)
--- a/READMEdir/README_extra.txt
+++ b/READMEdir/README_extra.txt
@@ -16,7 +16,6 @@ src/os_amiga.*                Files for the Amiga port.
 src/os_msdos.*
 src/os_dos.*           Files for the MS-DOS port.
 
-src/gui_mac.*
 src/os_mac.*           Files for the Mac port.
 
 src/os_vms*            Files for the VMS port.

diff --git a/src/Makefile b/src/Makefile
index b025a9486b700bd5a46be1ef6618ff479a1761a8..fbb917334c71c9958ec931f55aa29d938df80def 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -375,9 +375,6 @@ CClink = $(CC)
 #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_xim.o: gui_xim.c
 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 @@ bundle-rsrc: os_mac.rsr.hqx
        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 5cef5554850b618b7d0538f863e39b34eb920811..c85dec9dacc14feeb2a7e42a12ef247b7e7719cc 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -9246,8 +9246,7 @@ $as_echo "yes - automatic GUI support" >&6; }
     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 e17a74c9a76e5fe69e071267769903ec6c080c64..a2683a6b1070ddd58ace8fa80f9af8fe0cf29683 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2433,8 +2433,7 @@ elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then
     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 60926f9be2de2a6b54a7fb40e8d02062959a81ed..c9294093c7a857d3ce1325eb95f6e628fd7b9ec0 100644 (file)
--- a/src/gui_haiku.cc
+++ b/src/gui_haiku.cc
@@ -654,7 +654,7 @@ docd(BPath &path)
 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 0ac59b4ccde9ec79d895a8c9864ca73db05ae09f..0299fe413483e6f995ba6fc77b8f90f3e12fd9e6 100644 (file)
--- 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 92af227345dad4d7ce911a09e1d0eed81ab97e47..d0991c33d232d72084fda40fa9c0a129ab29610c 100644 (file)
--- a/src/testdir/test_iminsert.vim
+++ b/src/testdir/test_iminsert.vim
@@ -37,7 +37,7 @@ endfunc
 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 @@ func Test_iminsert_toggle()
   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 877ba49020e43040ee46b7baea3250537436be86..95337c70e191bb15f28fdedd68ea6bd7b33f9e03 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1442,
 /**/
     1441,
 /**/

diff --git a/src/vim.h b/src/vim.h
index a780ec9feff24158074ea82dc8ffe4a687e8456f..6377dab7a1269b16a345dfff7f6e8ebcc176f8fa 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -2155,8 +2155,6 @@ typedef enum {
             || !(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