GitLab

	set point, instead of setting point to a potentially invalid
	position.

	(OVERLAYP): New predicate.
	(CHECK_OVERLAY): New type-checker.
	(Qoverlayp): New extern declaration.
	* buffer.c (Foverlayp): New function.
	(Qoverlayp): New atom.
	(overlays_at, recenter_overlay_lists): Abort if we encounter an
	invalid overlay.
	(syms_of_buffer): defsubr Soverlayp; initialize Qoverlayp.
	(Fdelete_overlay): Set the overlay's markers to point nowhere.
	Use CHECK_OVERLAY instead of signalling a special error.
	(Fmove_overlay, Foverlay_put): Use CHECK_OVERLAY instead of
	signalling a special error.
	(Foverlay_get): Use CHECK_OVERLAY.
	* fns.c (internal_equal): Define this for overlays.
	* buffer.h (OVERLAY_VALID): Define in terms of OVERLAYP.
	* print.c (print): Give overlays their own print syntax.
	* alloc.c (mark_object): Treat overlays like conses.

	* buffer.c (Foverlay_get): Return Qnil if the requested property
	is missing from the property list.

is a list; it might be t.

(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.

ignore files without extant buffers.
(visit-tags-table-buffer): Call tags-table-including first with
CORE-ONLY set, and then afterwards with it clear.

	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.

They are now called directly.

	Fprevious_single_property_change): Pass arguments to textget in
	the right order.

Call face-initialize.
(normal-top-level): Call frame-notice-user-settings explicitly.

Put the map directly in the alist, not a variable name.

can be used in place of actual maps.

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 *.

(Fwhere_is_internal): Likewise.
(describe_vector): Likewise.

(kill-this-buffer, x-new-frame)
(sensitize-file-and-edit-menus-hook, format-buffers-menu-line)
(buffers-menu-max-size, complex-buffers-menu-p)
(buffers-menu-switch-to-buffer-function, buffer-menu-save-buffer)
(buffer-menu-write-file, build-buffers-menu-internal)
(build-buffers-menu-hook): Functions and variables deleted.

(vc-cancel-version): Ask whether to revert buffer.

(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'.

(keymap_panes): Allocate that vector.
(single_keymap_panes): Fill in that vector.
(xmenu_show): Return a list of events, not just one event.

(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.

        filesystem being ro, since Solaris 2.1 doesn't.
        (file-writable-p): Call ro_fsys.
	* s/sol2.h (SOLARIS_BROKEN_ACCESS): Define this.

	combination of <time.h> and <sys/time.h>.

variable.

	instead of "9x15" or whatever it was.