opensourcemirror
/
Vim
mirror of https://github.com/vim/vim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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)
This commit is contained in:
Bram Moolenaar 2020-08-13 21:05:39 +02:00
parent c771908681
commit be7529e889
9 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
READMEdir/README_extra.txt
View File

@ -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.

13
src/Makefile
View File

@ -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:

3
src/auto/configure vendored
View File

@ -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

3
src/configure.ac
View File

@ -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

2
src/gui_haiku.cc
View File

@ -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);
}

5
src/os_macosx.m
View File

@ -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. */

4
src/testdir/test_iminsert.vim
View File

@ -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')

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1442,
/**/
1441,
/**/

2
src/vim.h
View File

@ -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