(TOOLTIP_SUPPORT, WINDOW_SUPPORT): New definitions.
(WINNT_SUPPORT): Add term/w32-win.elc.
(lisp1, lisp2): Sync with lisp in src/Makefile.in.

* doc.c (Fsnarf_documentation):
* Makefile.in (temacs${EXEEXT}, mostlyclean): Undo last change.

*** empty log message ***

(obj): Sync with src/Makefile.in

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 901)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-273

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 899-900)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 129-130)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 259-260)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-272

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 129-130)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 259-260)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-900

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 259-260)

   - Merge from emacs--rel--22
   - Update from CVS

2007-10-18  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use rmail-dont-reply-to to
   exclude address matching message-dont-reply-to-names.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-130

*** empty log message ***

(diff-auto-refine): New var.
(diff-hunk): Use it.
(diff-ignore-whitespace-hunk): Rename diff-refine-ignore-spaces-hunk.
(diff-refine-change): Rename from diff-fine-change.  Change it.
(diff-refine-preproc): Rename from diff-fine-highlight-preproc.
(diff-refine-hunk): Rename from diff-fine-highlight.

*** empty log message ***

(smerge-auto-refine): New var.
(smerge-next, smerge-prev): Use it.
(smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.

(describe-variable-custom-version-info): New function to return
variable's version or package version note.
(describe-variable): Use it, display result.

(easy-mmode-define-navigation):
Add `body' arg.  Cleanup the check-narrow-maybe/re-narrow-maybe mess.

* vc-bzr.el (vc-bzr-diff-tree):
* vc-git.el (vc-git-diff-tree):
* vc-hg.el (vc-hg-diff-tree):
* vc-mcvs.el (vc-mcvs-diff-tree):
* vc-mtn.el (vc-mtn-diff-tree):
* vc-svn.el (vc-svn-diff-tree): Remove.

(vc-mtn-revision-completion-table):Make it work when the arg is a list of files.

(vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
arg is a list of files.

(vc-git-revision-completion-table, vc-git-revision-table):
Make it work when the arg is a list of files.

(vc-cvs-revision-completion-table): Make it work when the
arg is a list of files.

(vc-arch-revision-completion-table): Make it work when the
arg is a list of files.

(History and Acknowledgements):  Turn comment about integer size into
past tense.
(Time Zones): Remove pointer to Calc author's address.
(Trigonometric and Hyperbolic Functions): Mention cotangent and
hyperbolic cotangent functions.

Remove `diff-tree' operation, now subsumed by `diff'.
Also `revision-completion-table' now takes a list of files.
(vc-deduce-fileset): Remove unused var `regexp'.
Only obey allow-directory-wildcard in dired buffers.
(vc-default-diff-tree): Remove.
(vc-diff-added-files): New var.
(vc-diff-internal): Use it.  Remove arg `backend'.  Update callers.
(vc-version-diff): Revert from `vc-history-diff' to the original name.
Remove the `backend' arg.
(vc-contains-version-controlled-file): Remove.
(vc-diff): Bring it closer to the version in Emacs-22.
(vc-revert): Fix typo in let-binding.
(vc-default-unregister): Remove.
(vc-dired-buffers-for-dir): Remove N^2 behavior.

[HAVE_LIBRESOLV]: Add -lresolv to linker flags.

* Makefile.in [HAVE_LIBRESOLV]: Add -lresolv to linker flags.

* textmodes/two-column.el (2C-split, 2C-merge):
* textmodes/bib-mode.el (bib-find-key, mark-bib):
* progmodes/idlw-shell.el (idlwave-shell-move-or-history):
* progmodes/etags.el (find-tag-in-order, etags-tags-apropos)
* progmodes/ada-xref.el (ada-get-all-references):
* obsolete/mlsupport.el (ml-next-line, ml-previous-line):
* emulation/vi.el (vi-previous-line-first-nonwhite)
(vi-effective-range, vi-put-before):
* emulation/edt.el (edt-next-line, edt-previous-line)
(edt-paragraph-forward): Use forward-line.

* progmodes/etags.el (tags-apropos): Require apropos at compile
time too.

* progmodes/prolog.el: Require comint when compiling.
(inferior-prolog-flavor): Move defvar before use.

(turn-on-font-lock-if-desired):
Renamed from `turn-on-font-lock-if-enabled'.
Fully obey `font-lock-global-modes'.

Whitespace fix.

(Fdocumentation): Check for and handle an advised function.

(diff-fine-highlight-preproc): Stick to minimal changes
which will not affect the behavior of things like forward-word.
(diff-fine-highlight): Preserve point.

(doc-view-mode-map): Use remapping.
Don't rebind C-v, M-v to their default value.
Don't bind mouse-4 and mouse-5: it's mwheel.el's job.

Add word-granularity refinement.
(smerge-refine-forward-function, smerge-refine-ignore-whitespace)
(smerge-refine-weight-hack): New vars.
(smerge-refine-forward): New fun.
(smerge-refine-chopup-region, smerge-refine-highlight-change): Use them.
(smerge-refine-subst): Use them as well.  Preserve point.

*** empty log message ***

*** empty log message ***

(bs-mode): Set mode-class property to special.

(bs--track-window-changes): Don't refresh the whole list.

(follow-unload-function): New function.

(follow-unload-function): New function.

(Fset_process_filter): Doc fix.

(Fset_process_filter): Doc fix.

(unload-function-features-list): Rename from `unload-hook-features-list'.
(unload-hook-features-list): Add as obsolete alias.
(unload-feature): Use `unload-function-features-list'
and new FEATURE-unload-function.

(unload-function-features-list): Rename from `unload-hook-features-list'.
(unload-hook-features-list): Add as obsolete alias.
(unload-feature): Use `unload-function-features-list'
and new FEATURE-unload-function.

Grammar fix.

Grammar fix.

(mouse-minor-mode-menu, minor-mode-menu-from-indicator):
Move here from bindings.el

(mouse-minor-mode-menu)
(minor-mode-menu-from-indicator): Move to mouse.el.

Add C-x v v bug.

Whitespace fix.

(describe-function-1): Don't use the advice origname
if it has no function definition yet.

Fix merge conflicts

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-271

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 890-898)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 122-128)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-270

From_ Johan Bockgrd, <article.gmane.org/gmane.emacs.devel/81056>
* net/tramp.el (tramp-rfn-eshadow-update-overlay): Save excursion.
Use `save-restriction' rather than `widen'.

(read_key_sequence): Undo a change introduced by multi-tty
which caused key-translation-map to applied repeatedly (thus breaking
double-mode).

(display-time-world-time-format): Display day # not month #.

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

2007-10-15  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-util.el (gnus-string<): New function.

   * lisp/gnus/gnus-sum.el (gnus-article-sort-by-author)
   (gnus-article-sort-by-subject): Use it.

2007-10-15  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-win.el (gnus-configure-windows): Focus on the frame for which
   the frame-focus tag is set in gnus-buffer-configuration.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-128

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 128)

   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-897

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 125-127)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-896

Add Image Support section.

(auto-mode-alist): Don't use doc-view for PS and EPS.

Remove version keyword.
(doc-view-ghostscript-program, doc-view-dvipdfm-program)
(doc-view-ps2pdf-program): Use executable-find.  Simplify custom type.
(doc-view-ghostscript-options): Improve custom type.
(doc-view-cache-directory, doc-view-conversion-buffer)
(doc-view-conversion-refresh-interval): Simplify custom type.

(doc-view-mode-map): Use the image-mode scrolling commands.  Don't rebind C-x k.

* doc-view.el (doc-view-dvi->pdf-sentinel, doc-view-dvi->pdf)
(doc-view-pdf/ps->png-sentinel, doc-view-pdf/ps->png)
(doc-view-pdf->txt-sentinel, doc-view-pdf->txt)
(doc-view-ps->pdf-sentinel, doc-view-ps->pdf): Remove superfluous
messages.

(doc-view-ghostscript-options, doc-view-ps->pdf):
Add comment about "-dSAFER".

Don't require xt-mouse.
(terminal-init-xterm): Run terminal-init-xterm-hook rather than
calling turn-on-xterm-mouse-tracking-on-terminal directly.

Don't change the global function-key-map anny more.
(xterm-mouse-mode): Use terminal-init-xterm-hook.  Don't use
after-make-frame-functions now that term/xterm.el calls us directly.
(turn-on-xterm-mouse-tracking, turn-off-xterm-mouse-tracking):
Use turn-*-xterm-mouse-tracking-on-terminal.  Only once per terminal.
(turn-on-xterm-mouse-tracking-on-terminal): Make param optional.
Setup input-decode-map and remember that xterm-mouse-mode was
enabled in this terminal.
(turn-off-xterm-mouse-tracking-on-terminal): Only disable on those
terminals where it has been enabled.

(tty-create-frame-with-faces): Make sure not only
tty-run-terminal-initialization but also set-locale-environment
are run only once per terminal.
(tty-run-terminal-initialization): Don't check if the terminal was
already initted.

(encoded-kbd-setup-display): Be careful not to remove keymaps that just
happen to inherit from one of ours.  When setting up our keymap, make sure
it won't be accidentally modified by someone else.

(emerge-setup): Use insert-buffer-substring.
(emerge-prepare-error-list, emerge-setup-with-ancestor): Likewise.

(org-columns-eval): Use forward-line.

Delete eol whitespace; nfc.

(delphi-newline): Use forward-line.

(dired-next-line, dired-previous-line): Use forward-line.

(artist-previous-line, artist-next-line): Use forward-line.

(unload-feature-special-hooks): Update list of special hooks.

(fill-individual-paragraphs): Doc fix.
(adaptive-fill-function): Doc fix.  Remove * from docstring.

(fill-individual-paragraphs): Fix typo in docstring.

(fill-individual-paragraphs): Doc fix.
(adaptive-fill-function): Doc fix.  Remove * from docstring.

(Quitting): Fix typo.

Tom Horsley  <tom.horsley at att.net>:

interprogram-paste-function can return a list.

Tom Horsley  <tom.horsley at att.net>

(interprogram-paste-function): Doc fix.
(current-kill): Accept list of strings as well
as single string from `interprogram-paste-function'.

Regenerate.

(ibuffer-saved-filter-groups): Doc fix.

(ibuffer-saved-filter-groups): Doc fix.

*** empty log message ***

*** empty log message ***

(Mode Line Mouse): Mention minor mode names.

Add mouse-1 in mode-line for minor modes.

Drew Adams  <drew.adams at oracle.com>

(mode-line-minor-mode-keymap): Add mouse-minor-mode-menu on mouse-1.
(mode-line-modes): Add mouse-1 to help-echo text.
(mouse-minor-mode-menu, minor-mode-menu-from-indicator): New functions.
(mode-line-minor-mode-help): Doc fix.

(install): Install COPYING in top-level and bin dirs.

*** empty log message ***

(auto-mode-alist): Add \\. before PDF/PS/DVI extensions.  Regroup.

Remove fill-paragraph-or-region.

(Filling): Update arguments of fill-paragraph.
fill-paragraph operates on the active region in Transient Mark mode.
Remove fill-paragraph-or-region.

(Spelling): ispell-word operates on the active region in Transient Mark mode.

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

(Fill Commands): Undocument fill-paragraph-or-region.
fill-paragraph operates on the active region in Transient Mark mode.
(Fill Prefix, Format Indentation): Replace fill-paragraph-or-region
with fill-paragraph.

(indent-for-tab-command): Change interactive spec from "P" to "p".
(indent-for-tab-command): Add check for interactive arg before
indenting the active region.

(ispell-word): Add interactive arg `region'.  Fix docstring.

(tutorial--default-keys): Replace fill-paragraph-or-region with fill-paragraph.

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

(fill-paragraph-or-region): Remove function at the request of RMS.
(fill-paragraph): Change `arg' to optional `justify'.  Add interactive
arg `region'.  Fix docstring.  At the first `or' branch add call to
`fill-region' if it the region is active in transient-mark-mode.