diff options
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/composite.c b/src/composite.c index 92bedcc5f2b..d0b56d2ec49 100644 --- a/src/composite.c +++ b/src/composite.c @@ -153,15 +153,8 @@ int n_compositions; COMPOSITION-ID. */ Lisp_Object composition_hash_table; -/* Function to call to adjust composition. */ -Lisp_Object Vcompose_chars_after_function; - Lisp_Object Qauto_composed; -Lisp_Object Vauto_composition_mode; -Lisp_Object Vauto_composition_function; Lisp_Object Qauto_composition_function; -Lisp_Object Vcomposition_function_table; - /* Maximum number of characters to look back for auto-compositions. */ #define MAX_AUTO_COMPOSITION_LOOKBACK 3 @@ -1964,7 +1957,7 @@ syms_of_composite (void) Vtext_property_default_nonsticky = Fcons (Fcons (Qcomposition, Qt), Vtext_property_default_nonsticky); - DEFVAR_LISP ("compose-chars-after-function", &Vcompose_chars_after_function, + DEFVAR_LISP ("compose-chars-after-function", Vcompose_chars_after_function, doc: /* Function to adjust composition of buffer text. This function is called with three arguments: FROM, TO, and OBJECT. @@ -1984,12 +1977,12 @@ The default value is the function `compose-chars-after'. */); Qauto_composition_function = intern_c_string ("auto-composition-function"); staticpro (&Qauto_composition_function); - DEFVAR_LISP ("auto-composition-mode", &Vauto_composition_mode, + DEFVAR_LISP ("auto-composition-mode", Vauto_composition_mode, doc: /* Non-nil if Auto-Composition mode is enabled. Use the command `auto-composition-mode' to change this variable. */); Vauto_composition_mode = Qt; - DEFVAR_LISP ("auto-composition-function", &Vauto_composition_function, + DEFVAR_LISP ("auto-composition-function", Vauto_composition_function, doc: /* Function to call to compose characters automatically. This function is called from the display routine with four arguments: FROM, TO, WINDOW, and STRING. @@ -2002,7 +1995,7 @@ string. In this case, the function must compose characters in the string. */); Vauto_composition_function = Qnil; - DEFVAR_LISP ("composition-function-table", &Vcomposition_function_table, + DEFVAR_LISP ("composition-function-table", Vcomposition_function_table, doc: /* Char-table of functions for automatic character composition. For each character that has to be composed automatically with preceding and/or following characters, this char-table contains |