emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 2695b7e 1/2: * configure.ac: Doc fixes related to


From: Glenn Morris
Subject: [Emacs-diffs] emacs-26 2695b7e 1/2: * configure.ac: Doc fixes related to --with-xim.
Date: Mon, 27 Aug 2018 21:46:32 -0400 (EDT)

branch: emacs-26
commit 2695b7e74559318cee2b4e69c2f94ac22421d134
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * configure.ac: Doc fixes related to --with-xim.
---
 configure.ac | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3d39cd0..868930b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -362,7 +362,7 @@ OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text 
shaping])
 
 OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
 OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
-OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
+OPTION_DEFAULT_ON([xim],[at runtime, default X11 XIM to off])
 AC_ARG_WITH([ns],[AS_HELP_STRING([--with-ns],
 [use Nextstep (macOS Cocoa or GNUstep) windowing system.
 On by default on macOS.])],[],[with_ns=maybe])
@@ -3149,11 +3149,12 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
         AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available])],
         HAVE_XIM=no)
 
-dnl '--with-xim' now controls only the initial value of use_xim at run time.
-
+dnl Note this is non-standard.  --with-xim does not control whether
+dnl XIM support is compiled in, it only affects the runtime default of
+dnl use_xim in xterm.c.
 if test "${with_xim}" != "no"; then
   AC_DEFINE(USE_XIM, 1,
-           [Define to 1 if we should use XIM, if it is available.])
+           [Define to 1 to default runtime use of XIM to on.])
 fi
 
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]