(PTR_TO_OFFSET, POS_AS_IN_BUFFER): Move to a better place.
(ISDIGIT, ISCNTRL, ISXDIGIT) [!emacs]: Remove duplicate definition.
(regex_compile): Use RE_FRUGAL instead of RE_ALL_GREEDY.
(re_compile_pattern): Use size_t for length.
(init_syntax_once): Move to a better place.
* regex.h: Merge changes from GNU libc. Indent cpp directives.
(RE_FRUGAL): Replaces RE_ALL_GREEDY (inverted meaning).
(KEYMAPP): New macro.
(Fkeymap_parent, Fset_keymap_parent): Use it.
(fix_submap_inheritance): Mark it static.
(define_as_prefix, describe_buffer_bindings, describe_command)
(describe_translation, describe_map): Complete prototypes.
Add support for :inherit attribute.
Add support for relative face heights.
(custom-face-attributes-get):
Treat `nil' as being a default value for :inherit (as well as `unspecified').
Update doc string.
(face-attribute-name-alist):
Add :inherit.
(face-valid-attribute-values):
Handle :inherit.
(face-read-string):
Rephrase prompt to be less confusing.
Assume that DEFAULT is a string, since we must return a string.
(face-read-integer):
Use `format' to turn DEFAULT into an acceptable default for face-read-string.
Match NEW-VALUE against the string "unspecified", not the symbol
`unspecified', since that's what face-read-string returns.
(read-face-attribute):
Lookup a name for old-value in valid, and use it as a default if we find one.
Treat all values from face-read-string as strings.
If the default is used, don't do any more processing on the value,
just use the old value directly.
(read-face-and-attribute, modify-face):
Tweak prompt.
(read-face-name):
Don't assume prompt ends with a space.
New variable.
(syms_of_xfaces):
Initialize it.
(LFACE_INHERIT):
New macro.
(Finternal_get_lisp_face_attribute, merge_face_vector_with_property)
(Finternal_set_lisp_face_attribute):
Deal with :inherit attribute.
(check_lface_attrs):
Allow new types of face height. Check inherit attribute.
(CYCLE_CHECK):
New macro.
(merge_face_inheritance):
New function.
(merge_face_vectors):
Merge inherited faces too. Add F and CYCLE_CHECK arguments.
(merge_face_vector_with_property, Finternal_merge_in_global_face)
(lookup_named_face, lookup_derived_face, realize_named_face)
(face_at_string_position, face_at_buffer_position):
Supply new F and CYCLE_CHECK arguments to merge_face_vectors.
(merge_face_heights):
New function.
(merge_face_vectors, merge_face_vector_with_property)
(Finternal_set_lisp_face_attribute):
Call merge_face_heights to handle relative face heights.
(lface_same_font_attributes_p):
Compare heights using EQ.
(POP_FAILURE_REG_OR_COUNT): Renamed from POP_FAILURE_REG.
Handle popping of a register's or a counter's data.
(POP_FAILURE_POINT): Use the new name.
(re_match_2_internal): Push counter data on the stack for succeed_n,
jump_n and set_number_at and remove misleading dead code in succeed_n.
frames, update the display for each frame as soon as possible,
instead of first building all desired matrices for all frames, and
then updating them all.
(try_cursor_movement): Handle case that last_cursor.vpos is -1.
Provide ja-dic-cnv instead of skkdic-cnv.
(ja-dic-filename): Renamed from skkdic-filename. Referers changed
(iso-2022-7bit-short): Add safe-charsets property.
(skkdic-convert-postfix): Search Japanese chou-on character in
addition to Hiragana character.
(skkdic-convert-prefix, skkdic-collect-okuri-nasi): Likewise.
(skkdic-convert): Change file names from skkdic.el to ja-dic.el
(batch-skkdic-convert): Likewise.
