(emerge-find-difference): New command. Now on `.'.
(emerge-diff-ok-lines-regexp): Renamed from emerge-diff-ok-lines.
(emerge-diff3-ok-lines-regexp): Renamed from emerge-diff3-ok-lines.
(emerge-command-prefix): Now C-c C-c.
emerge-shadow-key-definition): Deleted.
Callers use substitute-key-definition.
(emerge-recursively-substitute-key-definition): Deleted.
Callers use substitute-key-definition.
(emerge-unselect-hook): Renamed from emerge-unselect-hooks.
(emerge-files-internal): Use file-local-copy to handle remote files.
(emerge-files-with-ancestor-internal): Likewise.
(emerge-remote-file-p): Deleted.
(emerge-abort): New command.
(describe-mode): Deleted.
(emerge-hash-string-into-string): Renamed from hash-string-into-string.
(emerge-unslashify-name): Renamed from unslashify-name.
(emerge-write-and-delete): Don't write-file if file-out is nil.
make callers correct.
* xfaces.c (compute_char_face): Notice the next property change
location correctly.
* xfaces.c (face_name_id_number): Return 0 (the default face) if
the name is undefined.
* xfaces.c (Fset_face_attribute_internal): Do nothing unless FRAME
is an X frame.
(display_text_line): Initialize current_face to zero. Apply it
to characters as we write them to the display matrix.
(display_string): Pass the new argument to copy_rope.
* xdisp.c (display_text_line): Handle the locations of face
changes properly.
All initialization code moved into it.
Call at end of file, if using X frames already.
(x-create-frame-with-faces): Don't use faces if not initialized.
Duplicate the short MAKE_GLYPH loop after the main loop.
If no display table, do obey selective_display_ellipses.
(copy_part_of_rope): Arg FROM is now Lisp_Object *.
(terminal-map, etc.): Use default bindings, not fillarray.
Make the maps sparse.
(terminal-meta-map): New map; lets us make ESC a prefix key.
(terminal-map): Bind ESC to terminal-meta-map.
(te-more-break-unread): Handle non-char as last-input-char.
(te-filter): Delete code that worked with meta-flag.
(terminal-emulator): Don't look at meta-flag.
(terminal-mode): Don't make meta-flag local.
(te-stty-string): Quote the args that have ^. Add pass8.
Changes that esr made in the previous version but didn't describe in detail:
Some defvars moved.
Defvars added for many variables.
(te-stty-string): Specify the characters explicitly--not `stty dec'.
(vc-registration-error): New function.
(vc-next-action, vc-diff, vc-print-log, vc-backend-diff): Use it to
make VC's error messages more uniform.
(vc-directory, vc-revert-buffer1): Quote lambdas with (function ...)
for Emacs 18.
(compilation-old-error-list): Set if undefined, for Emacs 18.
macro here; that's x-specific. Just don't pass the second
argument.
* xfaces.c (compute_glyph_face): Remove the BASIC_FACE argument;
use F's default face.
on HAVE_X_WINDOWS macro. Perhaps this isn't the best approach,
but it'll do for now.
* xdisp.c (display_text_line): We can't use the FRAME_DEFAULT_FACE
macro here; that's x-specific. Just don't pass the second
argument.
* xfaces.c (compute_glyph_face): Remove the BASIC_FACE argument;
use F's default face.
used by any configuration right now, but he's trying to make it
work.
#include "sunos4-1.h" instead of "bsd4-2.h".
(O_NDELAY): Don't define this.
(SYSTEM_MALLOC): Don't define this, either.
(LD_SWITCH_SYSTEM): Remove the definition for this.
according to overlays and text properties; use
compute_char_face and compute_glyph_face to figure out what
face to use, and where a new face starts.
* xterm.c (dumpglyphs): Use the upper bits of the glyphs to decide
which frame face to use. Call GLYPH_FOLLOW_ALIASES to make sure
we're implementing the glyph table properly. If we're not using
the default or mode line face, call intern_face to find a display
face for the frame face selected by the glyph code. Implement
underlining. Remove the `font' argument; we have to derive this
from the frame and face anyway. Change all callers.
* disptab.h (GLYPH_FOLLOW_ALIASES): New macro.
* xterm.c (x_destroy_window): Call free_frame_faces.
init_frame_faces to set up the first two faces.
* xfaces.c (init_frame_faces): Don't just try to copy the default
and mode line faces from some other random frame; instead, consult
the normal_gc and reverse_gc members of the frame, and build the
faces based on their parameters.
* dispextern.h (struct face): Add cached_index member.
* xfaces.c (get_cached_face): Use it to avoid unnecessary
searches of face_vector.
* xfaces.c (intern_face): Renamed from get_display_face.
* xfns.c (x_make_gc): After building the GC's for the frame, call
init_frame_faces to set up the first two faces.
* xfaces.c (init_frame_faces): Don't just try to copy the default
and mode line faces from some other random frame; instead, consult
the normal_gc and reverse_gc members of the frame, and build the
faces based on their parameters.
Adjust the face computation functions to return frame face ID's,
not pointers to display faces; since we call these functions
during display construction, we don't want the display faces yet.
* xfaces.c (intern_frame_face): New function.
(compute_char_face, compute_glyph_face): Apply intern_frame_face
to the computed face, and return the frame face's ID, instead of
calling intern_face and returning a pointer to a display frame.
* xfaces.c: Describe the facial data structures. It took me a
while to figure them out; perhaps this will save someone else the
trouble.
* xfaces.c (get_display_face): Use face_eql instead of writing it out.
* xdisp.c (redisplay_region): New function.
* buffer.c (Fmove_overlay): Call redisplay_region on the areas the
overlay has enclosed or left.
(Fdelete_overlay): Call redisplay_region on the area the overlay
used to occupy.
(Foverlay_put): Call redisplay_region on the area the overlay now
occupies; we may have put a face property on it.
* xdisp.c (redisplay): If we're doing a thorough redisplay (all
windows on all frames involved), go ahead and flush the GC cache -
call clear_face_vector.
* xdisp.c (display_text_line): Apply faces to characters
according to overlays and text properties; use
compute_char_face and compute_glyph_face to figure out what
face to use, and where a new face starts.
* xterm.c (dumpglyphs): Use the upper bits of the glyphs to decide
which frame face to use. Call GLYPH_FOLLOW_ALIASES to make sure
we're implementing the glyph table properly. If we're not using
the default or mode line face, call intern_face to find a display
face for the frame face selected by the glyph code. Implement
underlining. Remove the `font' argument; we have to derive this
from the frame and face anyway. Change all callers.
* disptab.h (GLYPH_FOLLOW_ALIASES): New macro.
defined everywhere this file is #included; merge the two
definitions for defined (SIGIO) and ! defined (SIGIO) into one,
which calls reinvoke_input_signal if interrupt_input_pending is
set.
* keyboard.c (reinvoke_input_signal): New function.
* keyboard.c (syms_of_keyboard): Doc fix for
extra-keyboard-modifiers.
to overlays and text properties; use compute_char_face to figure out
what face to use, and where a new face starts.
* xterm.c (dumpglyphs): Use the upper bits of the glyphs to decide
which frame face to use. Call GLYPH_FOLLOW_ALIASES to make sure
we're implementing the glyph table properly. If we're not using
the default or mode line face, call intern_face to find a display
face for the frame face selected by the glyph code. Implement
underlining. Remove the `font' argument; we have to derive this
from the frame and face anyway. Change all callers.
* disptab.h (GLYPH_FOLLOW_ALIASES): New macro.
