* keymap.c: Remove all NS-specific code.

(where_is_preferred_modifier, Vwhere_is_preferred_modifier): New vars.
(preferred_sequence_p): Rename from ascii_sequence_p; pay attention to
where_is_preferred_modifier, return a different value depending on how
preferred is the binding.
(where_is_internal): Adjust accordingly.
(Fwhere_is_internal): Refresh where_is_preferred_modifier.
Adjust to new preferred_sequence_p.
(syms_of_keymap): Declare `where-is-preferred-modifier'.
* keyboard.c (parse_solitary_modifier): Not static any more.
* keyboard.h (parse_solitary_modifier): Declare.

1 files changed, 1 insertions, 0 deletions

diff --git a/src/keyboard.h b/src/keyboard.h
index e21766273a8..afdcd9d13de 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -438,6 +438,7 @@ extern Lisp_Object parse_modifiers P_ ((Lisp_Object));
 extern Lisp_Object reorder_modifiers P_ ((Lisp_Object));
 extern Lisp_Object read_char P_ ((int, int, Lisp_Object *, Lisp_Object,
                                   int *, EMACS_TIME *));
+extern int parse_solitary_modifier (Lisp_Object symbol);
 
 
 /* Parent keymap of terminal-local function-key-map instances.  */