(vc-arch-workfile-version): Handle the empty-branch case.

(hack-local-variables): Fix last change.

*** empty log message ***

(calc-edit-macro-finish-edit, calc-finish-formula-edit)
(calc-macro-repeats, calc-edit-macro-adjust-buffer)
calc-edit-format-macro-buffer, calc-edit-macro-pre-finish-edit):
Use calc-edit-top for the beginning of the edited object.
(calc-user-define-edit): Change the header for editing macros.
Remove unnecessary variable.

(calc-embedded-finish-edit): Use calc-edit-top for the beginning of
the edited object.

(calc-finish-selection-edit): Use calc-edit-top for the beginning of
the edited object.

(calc-edit-top): New variable.
(calc-edit-mode): Set calc-edit-top to be the beginning of the edited
object. Change header properties.
(calc-edit-finish, calc-edit-finish-stack-object)
(calc-edit-show-buffer): Use calc-edit-top to find the beginning of the
edited object.

(calc-edit-mode): Make header in italic.

(calc-edit-user-formula, calc-finish-formula-edit): Handle extra line
in header.

(calc-edit-mode): Add a spacer line to the header.
(calc-edit-finish, calc-show-edit-buffer): Handle the spacer line in
the header.

*** empty log message ***

(calc-edit-mode): Change default header.

(calc-edit-variable): Change title to match new header.

(calc-edit-user-syntax): Change title to edit mode to match new
header.
(calc-user-define-edit): Change titles to include names of commands.
(calc-finish-formula-edit): Make sure to start reading formula after
header.
(calc-edit-macro-combine-variable-name): Check for all digits when
looking for quick variable.

*** empty log message ***

(Programming Tutorial): Changed description of how to edit keyboard
macros to match current behavior.

(calc-finish-macro-edit): Remove.
(calc-edit-macro-repeats, calc-edit-macro-adjust-buffer,
calc-edit-macro-command, calc-edit-macro-command-type,
calc-edit-macro-combine-alg-ent, calc-edit-macro-combine-ext-command,
calc-edit-macro-combine-var-name, calc-edit-macro-combine-digits,
calc-edit-format-macro-buffer, calc-edit-macro-pre-finish-edit,
calc-edit-macro-finish-edit): New functions.
(calc-user-define-edit): Use new functions to edit named calc macros.

*** empty log message ***

(hack-local-variables): Cleanup prefix/suffix matching.

(copy-region-as-kill): Deactivate mark.

(occur-1): If the output buffer is also an input, don't kill it, rename it.

Typo.

*** empty log message ***

(Face Attributes): Correct xref to renamed node.

(Graphical Kill): Move up under node Killing,
change @section to @subsection.

*** empty log message ***

(Face Customization): Mention hex color specs.

(set-face-background, set-face-foreground): Doc fix.

(dired-view-command-alist): Variable deleted.
(dired-view-file, dired-mouse-find-file-other-window):
Delete the code to use it.

(custom-face-attributes):
Fix :help-echo strings for :foreground and :background.

(Face Attributes): Describe hex color specs.

(insert-sliced-image): Use t for line-height property.

*** empty log message ***

(Top): Update Killing submenu.

(Killing): Reorganize section.
No more TeX-only text; put the node command at start of chapter.
But the first section heading is used only in TeX.
Rewrite the text to read better in this mode.
(Graphical Kill): New subnode gets some of the text that
used to be in the first section.

(Timers): Update previous change.

(struct it): New element ellipsis_p.
(struct glyph_row): New element ends_in_ellipsis_p.

(setup_for_ellipsis, get_next_display_element):
Set it->ellipsis_p to 1 or 0.
(display_line): Record whether row ends in mid-ellipsis.
(set_cursor_from_row): If ends in ellipsis. find start of it.
(cursor_row_p): If PT's at the end of the ellipsis the row
ends within, don't display cursor on this row.

(BUFFER_POS_REACHED_P): We haven't reached the specified
position if we're reading from something other than the buffer.

*** empty log message ***

(calcVar-digit, calcVar-oper):  Remove need for "var-" at the
beginning of the minibuffer.

* xterm.c (handle_one_xevent): Clear area in expose event for GTK.

*** empty log message ***

(read-face-name): Don't treat an attribute spec as a list of faces.

(undo): Use undo-equiv-table to detect
unexpected changes since previous undo.
(undo-list-saved): Variable deleted.
(buffer-disable-undo): Don't alter undo-list-saved.

(Shell Commands in Dired): Delete the ? example.

(Scrolling): Correct scroll-preserve-screen-position.

(window_scroll_pixel_based): Only look at
Vscroll_preserve_screen_position if the old PT can't be kept.
(syms_of_window) <scroll-preserve-screen-position>: Doc fix.

*** empty log message ***

(Saving): Describe new require-final-newline features
and mode-require-final-newline.

(text-mode): Use mode-require-final-newline.

(texinfo-mode): Use mode-require-final-newline.

(vhdl-mode): Use mode-require-final-newline.

(simula-mode): Use mode-require-final-newline.

(sh-require-final-newline):
Alist value now controls whether to use mode-require-final-newline.
(sh-set-shell): Implement that new meaning.

(python-mode): Use mode-require-final-newline.

(perl-mode): Use mode-require-final-newline.

(modula-2-mode): Use mode-require-final-newline.

(mixal-mode): Use mode-require-final-newline.

(idlwave-mode): Use mode-require-final-newline.

(icon-mode): Use mode-require-final-newline.

(fortran-mode): Use mode-require-final-newline.

(f90-mode): Use mode-require-final-newline.

(cperl-mode): Use mode-require-final-newline.

(cfengine-mode): Use mode-require-final-newline.

(c-require-final-newline): Fix custom type, doc.

(c-common-init): Use mode-require-final-newline.

(antlr-mode): Use mode-require-final-newline.
Delete old-Emacs compatibility code.
(antlr-c-common-init): Function deleted.

(ada-mode): Use mode-require-final-newline.

(snmp-common-mode): Use mode-require-final-newline.

(require-final-newline): Allow `visit' and `visit-save'.
(mode-require-final-newline): New option.
(after-find-file): Handle require-final-newline with new values.
(basic-save-buffer): Handle new values of require-final-newline.

*** empty log message ***

Replace mentions of M-#M-# by C-cC-c to finish editing.

(calc-edit-mode): Mention C-cC-c as the way to finish, C-xk as the way
to cancel the edit.  Add cancel routine to kill-buffer-hook.

(calc-graph-show-dumb): Mention C-cC-c as the way to return to Calc.

*** empty log message ***

Remove obsolete MacEdit code.
(calc-macro-edit-algebraic, calc-macro-edit-variable)
(calc-macro-edit-variable-2, calc-macro-edit-quick-digit):
Remove functions.

(calc-same-interface, calc-quit): Remove obsolete MacEdit code.

(buffer-file-coding-system-explicit):
Renambed for explicit-buffer-file-coding-system.
(after-insert-file-set-coding): Adjusted for the above change.

(revert-buffer): Change
explicit-buffer-file-coding-system to
buffer-file-coding-system-explicit.
(basic-save-buffer-1): Likewise.

(artist-butlast-fn): Var deleted.
(artist-butlast, artist-last): Functions deleted.
(artist-ellipse-mirror-quadrant): Call last and butlast directly.
(artist-compute-key-compl-table): Call remq directly.
(artist-remove-nulls): Function deleted.
(artist-vaporize-lines, artist-flood-fill): Use push and pop directly.
(artist-push, artist-pop): Macro deleted.

(artist-version): 1.2.6
(artist-prev-next-op-alist): New variable.
(artist-select-next-op-in-list): New function.
(artist-select-prev-op-in-list): New function.
(artist-make-prev-next-op-alist): New function.
(artist-is-in-op-list-p): New function.
(artist-get-first-non-nil-op): New function.
(artist-get-last-non-nil-op): New function.
(artist-mode-init): Call artist-get-last-non-nil-op to initialize
   artist-prev-next-op-alist.
(artist-mode-map): Add binding for C-mouse-4 and C-mouse-5 to
   change drawing operation.

(auto-revert-tail-handler): Put in undo boundaries.

* server.el (server-process-filter): Suppress `error', too.

(calc-user-define-edit, calc-finish-macro-edit)
(calc-user-define-permanent, calc-execute-kbd-macro):  Replace
obsolete function MacEdit-parse-keys with edmacro-parse-keys.

*** empty log message ***

(x_produce_glyphs): Fix last change.

*** empty log message ***

(get_line_height_property): New function extracted from
original calc_line_height_property.
(calc_line_height_property): Rework.  Handle t and (nil . ratio).
(x_produce_glyphs): Use them to handle line-height and
line-spacing according to new height spec.
(Qtotal): Remove.
(syms_of_xdisp): Remove defsubr and intern for Qtotal.

(Line Height): Total line-height is now specified
in line-height property of form (HEIGHT TOTAL).  Swap (FACE . RATIO)
in cons cells.  (nil . RATIO) is relative to actual line height.
Use line-height `t' instead of `0' to get minimum height.

(calc-copy-variable): Fix mistyped variable name.  Display variable
name differently in message.

*** empty log message ***

(basic-save-buffer-1): Set
explicit-buffer-file-coding-system to last-coding-system-used.
(revert-buffer): Pay attention to
explicit-buffer-file-coding-system (not buffer-file-coding-system)
on bind coding-system-for-read.

(explicit-buffer-file-coding-system): New
buffer local variable.
(after-insert-file-set-coding): Set it to coding-system-for-read.

(Finsert_file_contents): Don't use
current_buffer->buffer_file_coding_system even if REPLACE is
non-nil.  Call Qafter_insert_file_set_coding with the second arg
VISIT.

(x_new_font): Set FRAME_COLUMN_WIDTH to
fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
fontp-?space_width..
(x_load_font): Calculate fontp->space_width and
fontp->average_width.
(x_term_init): Initialize dpyinfo->Xatom_AVERAGE_WIDTH.

(x_produce_glyphs): Calculate tab width by
FRAME_SPACE_WIDTH, not FRAME_COLUMN_WIDTH.

(struct x_display_info): New member Xatom_AVERAGE_WIDTH.

(struct frame): New member space_width.
(FRAME_SPACE_WIDTH): New macro.

(struct font_info): New members space_width and
average_width.

(auto-revert-tail-mode): Doc fix for defvar.