(xscheme-previous-mode, xscheme-previous-process-state): Add defvars.
(xscheme-last-input-end, xscheme-process-command-line, xscheme-process-name,
xscheme-buffer-name, xscheme-expressions-ring-max, xscheme-expressions-ring,
xscheme-expressions-ring-yank-pointer, xscheme-running-p,
xscheme-control-g-synchronization-p, xscheme-control-g-disabled-p,
xscheme-string-receiver, default-xscheme-runlight, xscheme-runlight,
xscheme-runlight-string, xscheme-process-filter-state, xscheme-allow-output-p,
xscheme-prompt, xscheme-mode-string): Move to beginning of file.
(scheme-interaction-mode-commands-alist, scheme-interaction-mode-map,
scheme-debugger-mode-map): Declare them before use. Note: the initialization
code for the variables has not been moved because it uses functions that
reference the variables.
(xscheme-control-g-message-string, xscheme-process-filter-alist,
xscheme-prompt-for-expression-map): Declare them before use.
(scheme-debugger-mode-commands): "?\ " -> "?\s".
(define-compilation-mode): Doc fix and refill.
(kill-compilation): Use `mode-name' in the error message.
(compilation-find-file): Use `compilation-error' in the
read-file-name's prompt.
(Info-isearch-search): Use LITERAL arg of replace-regexp-in-string.
(Info-escape-percent): Delete function.
(Info-fontify-node): Replace Info-escape-percent by
replace-regexp-in-string with REP arg set to lambda that
duplicates `%' and preserves text properties.
and make an obsolete alias to set-face-underline-p.
(set-face-underline-p): Use docstring of set-face-underline.
(describe-face): Create hyperlink to parent face.
(smerge-auto-leave): Make undo re-enable the mode.
(debug-ignored-errors): Add the user-error of impossible resolution.
(smerge-resolve): Move things around a bit, in preparation for later.
(smerge-diff): Don't fail if the buffer has no associated file.
(ediff-ancestor-buffer, ediff-quit-hook): Quieten byte-compiler.
(smerge-conflict-overlay): New function.
(smerge-match-conflict): Don't add text properties here.
(smerge-find-conflict): Instead, add an overlay here.
Also check for the case where we're inside a conflict already, so as to
obviate the need for font-lock-multiline, which is unbearably slow with
large conflicts and ciomplex font-lock patterns.
(smerge-remove-props): Remove overlay rather than text-properties.
(smerge-mode): Don't set font-lock-multiline.
Remove overlays when turned off.
Run the argument of tex-shell-cd-command through
convert-standard-filename, to get the correct style of slashes on
Windows, and enclose the result in quotes, in case the file name
includes whitespace or other special characters.