(smerge-refine-chopup-region): Add `preproc' argument.
(smerge-refine-highlight-change): Add `props' argument.
(smerge-refine-subst): New function holding most of smerge-refine.
(smerge-refine): Use it.

Remove entry now on 22 branch.

Mention openSUSE bcopy issue.

(free_bitmap_record): Renamed from Free_Bitmap_Record.

(internal_condition_case_2, internal_condition_case_1)
(internal_condition_case): Reenable abort if x_catching_errors (),
to see if that really happens and why.

(gamegrid-setup-default-font): Use face-spec-set.

*** empty log message ***

Remove unused code.

Correct a bug that was revealed during a review of new VC.

* net/tramp.el (tramp-find-foreign-file-name-handler): Check also
host.
(tramp-maybe-send-script): Apply `member' but `memq'.
(tramp-advice-file-expand-wildcards): Simplify implementation.

*** empty log message ***

(follow-mode): Don't run hooks twice.  Use `when'.

(minibuf-depth-indicator-function): New variable.
(minibuf-depth-setup-minibuffer): Use it.

*** empty log message ***

(bad-packages-alist): Clarify Semantic and CEDET version numbers.

Add M-q fill-paragraph-or-region.

(Filling): Document fill-paragraph-or-region.

(Arguments): Replace fill-paragraph with fill-paragraph-or-region.

(Fill Commands): Document fill-paragraph-or-region.
(Fill Prefix, Format Indentation): Replace fill-paragraph with
fill-paragraph-or-region.

(cua-paste): Check if mouse-region-match is fbound
to not fail on mouseless tty.

(delete-selection-pre-hook): Check if mouse-region-match is fbound
to not fail on mouseless tty.

(image-type): Check if image-types is bound to not fail on tty.

(tutorial--default-keys): Replace fill-paragraph
with fill-paragraph-or-region.  Suspend command is now the same
`suspend-frame' on window systems and on tty.

(esc-map): Bind M-q to fill-paragraph-or-region instead of fill-paragraph.

(fill-paragraph-or-region): New function.

Typo and whitespace fixes to reduce the diff with new VC.

* net/tramp.el (top): Move loading of tramp-util.el and
tramp-vc.el to tramp-compat.el.
(tramp-make-tramp-temp-file): Complete rewrite.  Create remote
temporary file if possible, in order to avoid a security hole.
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection): Call `tramp-make-tramp-temp-file'
with DONT-CREATE, because the connection is not setup yet.
(tramp-handle-process-file): Rewrite temporary file handling.
(tramp-completion-mode): New defvar.
(tramp-completion-mode-p): Use it.

* net/tramp-compat.el (top):  Load tramp-util.el and tramp-vc.el.

* net/tramp-fish.el (tramp-fish-handle-process-file): Rewrite
temporary file handling.

* tramp.texi (External packages): New section.

Port various comments from new VC to reduce the noise in the diff.
Rename vc-revert-buffer1 to vc-revert-buffer-internal.
Patch in the new vc-create-repo function to go with the
header comment about it already present.
No changes to existing logic.

More manual updates and additions bringing it current with modern
VCSes.  This includes the workfile version -> focus version
terminology change, but not the UI changes for new VC.

Update manual for 2007 conditions.  None of these changes are
specific to new VC, that wil come later.

Terminology sync, workfile version -> focus version.

(Fwrite_region): Ignore EINVAL error from fsync.

*** empty log message ***

Aaron Hawley  <aaronh at garden.org>

(auto-insert-alist): Add a Texinfo entry.

John W. Eaton  <jwe at octave.org>

(octave-abbrev-table): Add "until".
(octave-begin-keywords): Add "do".
(octave-end-keywords): Remove "end".
(octave-reserved-words): Add "end".  Remove "all_va_args",
"gplot", and 'gsplot".
(octave-text-functions): Remove "gset", "gshow", "set", and "show".
(octave-variables): Remove "IMAGEPATH", "INFO_FILE",
"INFO_PROGRAM", "LOADPATH", "__error_text__", "automatic_replot",
"default_return_value", "define_all_return_values",
"do_fortran_indexing", "empty_list_elements_ok",
"gnuplot_has_multiplot", "implicit_str_to_num_ok",
"ok_to_lose_imaginary_part", "prefer_column_vectors",
"prefer_zero_one_indexing", "propagate_empty_matrices",
"resize_on_range_error", "treat_neg_dim_as_zero",
"warn_assign_as_truth_value", "warn_comma_in_global_decl",
"warn_divide_by_zero", "warn_function_name_clash",
"warn_missing_semicolon", "whitespace_in_literal_matrix".
Add "DEFAULT_EXEC_PATH", "DEFAULT_LOADPATH", "IMAGE_PATH",
"crash_dumps_octave_core", "sighup_dumps_octave_core",
"sigterm_dumps_octave_core".
(octave-block-match-alist): Remove "end" from block-end keywords.
(octave-mode): Update ftp site address.

Remove broken end-of-file comment.

Chris Moore  <dooglus at gmail.com>

(server-kill-new-buffers): Doc fix.

(Auto Faces): Fix typo.

Fix configuring `doc' due to changes in the directory structure.

Update comment to reflect doc directory structure.

(RSVG_LIBS, RSVG_CFLAGS): Edit out.

Reorder functions, no code changes.

* net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
(tramp-do-copy-or-rename-file-directly): Handle tmpfile only in
the cond clauses where needed.
(tramp-handle-write-region): Rearrange code for proper handling of
tmpfile.

* net/tramp-compat.el (tramp-compat-make-temp-file): New defsubst.

* net/tramp.el:
* net/tramp-fish.el:
* net/tramp-ftp.el:
* net/tramp-smb.el: Rename `tramp-make-temp-file' to
`tramp-compat-make-temp-file'.

(syms_of_image) <image-types>: Fix typo in docstring.

(image-dired-image-at-point-p): Fix typo in docstring.

*** empty log message ***

(sieve-manage-interactive-login): Doc fix.
(sieve-manage-open): Use `mapc' instead of `mapcar'.

Fix typos.

*** empty log message ***

(copyright-update): Don't update if the file
already uses a more recent copyright version than the "current" one.

(doc-view-dvi->pdf-sentinel, doc-view-reset-slice)
(doc-view-insert-image): Minor aesthetical docstring changes.

(doc-view): Don't ignore pdf and dvi files when completing filename.
(doc-view-search-internal): Docstring change.

(struct frame): Don't try to GC-mark menu_bar_items_used.

*** empty log message ***

* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
(tramp-file-name-handler-alist): Add
`tramp-handle-insert-file-contents-literally'.  Neded for XEmacs.
(tramp-make-temp-file): Use `make-temp-name'. `make-temp-file',
used before, creates the file already, which is not desired.
(tramp-do-copy-or-rename-file-directly): Simplify handling of
temporary file.
(tramp-handle-insert-file-contents): Assign the result in the
short track case.
(tramp-handle-insert-file-contents-literally): New defun.
(tramp-completion-mode-p): Revert change from 2007-09-24.
Checking for `return' etc as last character is not sufficient, for
example in dired-mode when entering <g> (revert-buffer) or
<s> (dired-sort).

* net/tramp-compat.el (top): Add also compatibility code for loading
appropriate timer package.
(tramp-compat-copy-tree): Check for `subrp' and `symbol-file' in
order to avoid autoloading problems.

* net/tramp-fish.el:
* net/tramp-smb.el: Move further compatibility code to
tramp-compat.el.

* net/tramp-ftp.el (tramp-ftp-file-name-handler): Handle the case
where the second parameter of `copy-file' or `rename-file' is a
remote file but not via ftp.

(mark_terminals): Typo.

* window.h (struct window):
* window.c (struct save_window_data, struct saved_window):
* termhooks.h (struct terminal):
* process.h (struct Lisp_Process):
* frame.h (struct frame):
* buffer.h (struct buffer):
* lisp.h (struct Lisp_Vector, struct Lisp_Char_Table)
(struct Lisp_Bool_Vector, struct Lisp_Subr, struct Lisp_Hash_Table):
The size field of (pseudo)vectors is now unsigned.
(ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG): Simplify accordingly.

* lisp.h (struct Lisp_Hash_Table): Move non-traced elements at the end.
Turn `count' into an integer.
* fns.c (make_hash_table, hash_put, hash_remove, hash_clear)
(sweep_weak_table, sweep_weak_hash_tables, Fhash_table_count):
* print.c (print_object) <HASH_TABLE_P>: `count' is an int.
* alloc.c (allocate_hash_table): Use ALLOCATE_PSEUDOVECTOR.
(mark_object) <HASH_TABLE_P>: Use mark_vectorlike.

(mark_object): Fix typo.

(allocate_pseudovector): New fun.
(ALLOCATE_PSEUDOVECTOR): New macro.
(allocate_window, allocate_terminal, allocate_frame)
(allocate_process): Use it.
(mark_vectorlike): New function.
(mark_object) <FRAMEP, WINDOWP, BOOL_VECTOR_P, VECTORP>: Use it.
(mark_terminals): Use it.
(Fmake_bool_vector, Fmake_char_table, make_sub_char_table)
(Fmake_byte_code): Use XSETPVECTYPE.

(Fget_buffer_create, init_buffer_once): Use XSETPVECTYPE.

(Fframe_parameters): Minor simplification.

(adjust_markers_for_insert): Generalize assertion checks.

(defsubr): Use XSETPVECTYPE.

(Fmarker_buffer): Make test for odd case into a failure.

(Fcurrent_window_configuration): Use XSETPVECTYPE.

(ARRAY_MARK_FLAG, PSEUDOVECTOR_FLAG): Don't allow definition in m/*.h files.
(XCHAR_TABLE, XBOOL_VECTOR): Add assertion checking.
(XSETPVECTYPE): New macro.
(XSETPSEUDOVECTOR): Use it.

* buffer.c (syms_of_buffer) <local-abbrev-table>: Move from abbrev.c.
(DEFVAR_PER_BUFFER, defvar_per_buffer): Move from lisp.h and lread.c.
* lisp.h (defvar_per_buffer, DEFVAR_PER_BUFFER):
* lread.c (defvar_per_buffer):
* abbrev.c (syms_of_abbrev) <local-abbrev-tabl>: Move to buffer.c.

(candidate_window_p): Only consider as visible frames that
are on the same terminal.

(MARKBIT): Remove unused macro.

(gnus-uu-reginize-string, gnus-uu-expand-numbers): Don't hardcode point-min==1.

*** empty log message ***

(cursor-in-non-selected-windows): Doc fix.

(Overlay Properties): Explain nil as priority.  Explain that conflicts
are unpredictable if not resolved by priorities.

(math-largest-emacs-expt): Remove unnecessary condition check.

Add item for MS-Windows implementation of network-interface-*.

(Fload): Fix typo in docstring.

(Fexpt): Manually check for overflows, so that a power
of a non-zero value can't yield zero.

(zone): Let-bind show-trailing-whitespace to nil.

calc-math.el (math-largest-emacs-expt): Handle the cases when expt
doesn't give range errors.

(math-smallest-emacs-expt):  Make the computation more robust.

Add arch tagline

lisp/emacs-lisp/authors.el: revert accidentally committed private change.

lisp/emacs-lisp/authors.el (authors): make non-specific to Emacs.

(gnus-article-reply-with-original)
(gnus-article-followup-with-original): When `transient-mark-mode' is
off, refrain from active-region behavior for followups.

(argv): Alias for `command-line-args-left' to use as
`(pop argv)' inside of --eval command sequences.  Allows for
passing shell commands into Emacs verbatim without need for Lisp
quoting.

(auto-revert-handler): In `auto-revert-tail-mode',
check only for changed size.
(auto-revert-tail-handler): Get size from caller.  If the file has
shrunk, tail the whole file again (the file presumably has been
rewritten).

(woman-topic-all-completions, woman-mini-help): Fix
fallout from 2007-09-07 introduction of `dolist' when the list
actually was being manipulated in the loop.
(woman-Cyg-to-Win, woman-pre-process-region)
(woman-horizontal-escapes, woman-if-body, woman-unescape)
(woman-strings, woman-special-characters, woman1-hc)
(woman-change-fonts, woman-find-next-control-line): Use
`match-beginning' rather than `match-string' when the result is
just used as a flag.

* net/tramp-compat.el: New file.

* net/tramp.el:
* net/tramp-fish.el:
* net/tramp-smb.el:
* net/tramp-uu.el:
* net/trampver.el: Move compatibility code to tramp-compat.el.
Apply `mapc' instead of `mapcar' when the code needs side effects
only.  Move utf-8 coding cookie to the second line.

(x-gtk-stock-map): Add Gnus and MH-E icons.  Improve custom type.
(icon-map-list): Make it customizable.  Document how to disable stock icons.

(zone-hiding-modeline): Use mode-line-format.

(term_clear_mouse_face, term_mouse_highlight)
(tty_write_glyphs_with_face): Only define is HAVE_GPM.

(safe_debug_print): Use XHASH.

(DECL_ALIGN, USE_LSB_TAG): Move logic to before definition of
Lisp elements such as tags.
(XHASH): New macro.
(EQ): Use it.
(SREF, SSET, STRING_COPYIN): Use SDATA.
(VOID_TO_LISP, CVOID_TO_LISP, LISP_TO_VOID, LISP_TO_CVOID): Remove.

(enum mem_type): Replace all vector subtypes -> MEM_TYPE_VECTORLIKE.
(allocate_vectorlike): Remove type argument.  Adjust callers.
(live_vector_p, mark_maybe_pointer, valid_lisp_object_p):
Only handle the one remaining MEM_TYPE_VECTORLIKE.
(mark_terminal): Remove left-over declaration.

(MALLOC_BLOCK_INPUT, MALLOC_UNBLOCK_INPUT): New macros
to avoid unnecessary BLOCK_INPUTs when SYNC_INPUT is used.
(xmalloc, xrealloc, xfree, lisp_malloc, lisp_free, lisp_align_malloc)
(lisp_align_free, make_interval, allocate_vectorlike, allocate_string_data)
(make_float, Fcons, allocate_string, Fmake_symbol, allocate_misc): Use them.

(load_face_font, free_realized_face, clear_face_gcs):
Don't let signal handlers run when a GC is freed but not yet NULL'ed.
(x_free_gc): Remove BLOCK_INPUT since it's now redundant.

(x-gtk-stock-map): Version is 22.2.

*** empty log message ***