Patch 8.2.1442

[Bram Moolenaar]

Patch 8.2.1442
Problem: Outdated references to the Mac Carbon GUI.
Solution: Remove or update references. (Yee Cheng Chin, closes #6703)
Files: READMEdir/README_extra.txt, src/Makefile, src/configure.ac,
src/auto/configure, src/gui_haiku.cc, src/os_macosx.m,
src/testdir/test_iminsert.vim, src/vim.h


*** ../vim-8.2.1441/READMEdir/README_extra.txt 2020-07-14 23:02:38.180781060 +0200
--- READMEdir/README_extra.txt 2020-08-13 20:11:54.675008899 +0200
***************
*** 16,22 ****
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.
--- 16,21 ----
*** ../vim-8.2.1441/src/Makefile 2020-08-13 18:57:56.558214754 +0200
--- src/Makefile 2020-08-13 20:23:11.072800626 +0200
***************
*** 375,383 ****
#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

--- 375,380 ----
***************
*** 3306,3314 ****
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

--- 3303,3308 ----
***************
*** 3692,3704 ****
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:
--- 3686,3691 ----
*** ../vim-8.2.1441/src/configure.ac 2020-08-11 23:08:44.816637945 +0200
--- src/configure.ac 2020-08-13 20:15:49.258207419 +0200
***************
*** 2433,2440 ****
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 ;;
esac
else

--- 2433,2439 ----
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]) ;;
esac
else

*** ../vim-8.2.1441/src/auto/configure 2020-08-11 23:08:44.820637932 +0200
--- src/auto/configure 2020-08-13 20:16:11.794130617 +0200
***************
*** 9246,9253 ****
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 ;;
esac
else

--- 9246,9252 ----
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; } ;;
esac
else

*** ../vim-8.2.1441/src/gui_haiku.cc 2020-07-17 20:43:37.288617050 +0200
--- src/gui_haiku.cc 2020-08-13 20:17:27.805871838 +0200
***************
*** 654,660 ****
drop_callback(void *cookie)
{
// TODO here we could handle going to a specific position in the dropped
! // file (see src/gui_mac.c)
// Update the screen display
update_screen(NOT_VALID);
}
--- 654,660 ----
drop_callback(void *cookie)
{
// TODO here we could handle going to a specific position in the dropped
! // file (see src/gui_mac.c, deleted in 8.2.1422)
// Update the screen display
update_screen(NOT_VALID);
}
*** ../vim-8.2.1441/src/os_macosx.m 2020-08-11 23:08:44.820637932 +0200
--- src/os_macosx.m 2020-08-13 20:11:54.679008884 +0200
***************
*** 29,39 ****

/*
* 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))

/* Used to identify clipboard data copied from Vim. */

--- 29,36 ----

/*
* Clipboard support for the console.
*/
! #if defined(FEAT_CLIPBOARD)

/* Used to identify clipboard data copied from Vim. */

*** ../vim-8.2.1441/src/testdir/test_iminsert.vim 2020-08-12 18:50:31.879655802 +0200
--- src/testdir/test_iminsert.vim 2020-08-13 20:11:54.679008884 +0200
***************
*** 37,43 ****
func Test_getimstatus()
if has('win32')
CheckFeature multi_byte_ime
! elseif !has('gui_mac')
CheckFeature xim
endif
if has('win32') && has('gui_running')
--- 37,43 ----
func Test_getimstatus()
if has('win32')
CheckFeature multi_byte_ime
! else
CheckFeature xim
endif
if has('win32') && has('gui_running')
***************
*** 87,93 ****
CheckGui
if has('win32')
CheckFeature multi_byte_ime
! elseif !has('gui_mac')
CheckFeature xim
endif
if has('gui_running') && !has('win32')
--- 87,93 ----
CheckGui
if has('win32')
CheckFeature multi_byte_ime
! else
CheckFeature xim
endif
if has('gui_running') && !has('win32')
*** ../vim-8.2.1441/src/vim.h 2020-08-11 21:58:12.585968185 +0200
--- src/vim.h 2020-08-13 20:11:54.679008884 +0200
***************
*** 2155,2162 ****
|| !(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

--- 2155,2160 ----
*** ../vim-8.2.1441/src/version.c 2020-08-13 19:42:36.329326605 +0200
--- src/version.c 2020-08-13 21:04:19.361573036 +0200
***************
*** 756,757 ****
--- 756,759 ----
{ /* Add new patch number below this line */
+ /**/
+ 1442,
/**/

--
hundred-and-one symptoms of being an internet addict:
193. You ask your girlfriend to drive home so you can sit back with
your PDA and download the information to your laptop

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///