Index: head/editors/emacs/Makefile
===================================================================
--- head/editors/emacs/Makefile
+++ head/editors/emacs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs
 DISTVERSION=	26.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	editors
 MASTER_SITES=	GNU
@@ -98,9 +98,9 @@
 PLIST_SUB=	EMACS_VER=${DISTVERSION} \
 		GNU_HOST=${CONFIGURE_TARGET}
 
-OPTIONS_DEFINE=			ACL DBUS GCONF GNUTLS GSETTINGS LCMS2 M17N \
-				MAILUTILS MODULES OTF SCROLLBARS SOURCES \
-				THREADS XFT XIM XML XWIDGETS
+OPTIONS_DEFINE=			ACL DBUS FCITXPATCH GCONF GNUTLS GSETTINGS \
+				LCMS2 M17N MAILUTILS MODULES OTF SCROLLBARS \
+				SOURCES THREADS XFT XIM XML XWIDGETS
 OPTIONS_DEFAULT=		ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG \
 				KQUEUE LCMS2 M17N MAGICK MAILUTILS MODULES OSS \
 				OTF PNG SCROLLBARS SOURCES SVG THREADS TIFF XFT \
@@ -112,15 +112,16 @@
 OPTIONS_RADIO_SOUND=		ALSA OSS
 OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
 .if ${FLAVOR:U} == nox
-OPTIONS_EXCLUDE=		ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 \
-				GTK3 JPEG LCMS2 M17N MAGICK MOTIF OSS OTF PNG \
-				SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM \
-				XWIDGETS
+OPTIONS_EXCLUDE=		ALSA CAIRO DBUS FCITXPATCH GCONF GFILE GIF \
+				GSETTINGS GTK2 GTK3 JPEG LCMS2 M17N MAGICK MOTIF\
+				OSS OTF PNG SCROLLBARS SVG TIFF XAW XAW3D XFT \
+				XIM XPM XWIDGETS
 .endif
 OPTIONS_SUB=			YES
 
 ACL_DESC=		Access control list support
 CAIRO_DESC=		Experimental Cairo library support [implies PNG, XFT]
+FCITXPATCH_DESC=	Patch to workaround issue with Fcitx input method
 FILENOTIFY_DESC=	File notification support
 GFILE_DESC=		File notification via gfile
 GRAPHICS_DESC=		Graphics support
@@ -148,6 +149,7 @@
 CAIRO_CONFIGURE_WITH=		cairo
 DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=		dbus
+FCITXPATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_xfns.c
 GCONF_USE=			GNOME=gconf2
 GCONF_CONFIGURE_WITH=		gconf
 GFILE_USE=			GNOME=glib20
@@ -255,6 +257,5 @@
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION}/src
 	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${DISTVERSION}/src
 	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${DISTVERSION}/site-lisp/site-start.el
-
 
 .include <bsd.port.mk>
Index: head/editors/emacs/files/extra-patch-src_xfns.c
===================================================================
--- head/editors/emacs/files/extra-patch-src_xfns.c
+++ head/editors/emacs/files/extra-patch-src_xfns.c
@@ -0,0 +1,12 @@
+--- src/xfns.c.orig	2020-02-17 01:35:32 UTC
++++ src/xfns.c
+@@ -2237,8 +2237,8 @@ static XIMStyle best_xim_style (XIMStyles *);
+ 
+ static const XIMStyle supported_xim_styles[] =
+ {
+-  XIMPreeditPosition | XIMStatusArea,
+   XIMPreeditPosition | XIMStatusNothing,
++  XIMPreeditPosition | XIMStatusArea,
+   XIMPreeditPosition | XIMStatusNone,
+   XIMPreeditNothing | XIMStatusArea,
+   XIMPreeditNothing | XIMStatusNothing,