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.

(follow-unload-function): New function.

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

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.

From_ Johan Bockgrd, <http://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 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 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 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.

Don't require loadhist.

* xselect.c (x_own_selection, x_handle_selection_clear)
(x_clear_frame_selections):
* w32menu.c (list_of_panes, list_of_items):
* w32fns.c (w32_color_map_lookup, Fx_create_frame, Fx_display_list):
* textprop.c (validate_plist, interval_has_all_properties)
(interval_has_some_properties, interval_has_some_properties_list)
(add_properties, text_property_list):
* process.c (Fget_buffer_process, list_processes_1, status_notify):
* minibuf.c (Fassoc_string):
* macselect.c (x_own_selection, x_clear_frame_selections)
(Fx_disown_selection_internal):
* keymap.c (Fcommand_remapping, where_is_internal, describe_map_tree):
Use CONSP rather than !NILP and XC[AD]R rather than Fc[ad]r.

Include COPYING in top level directory of all distributed archives.

(feature-symbols, file-provides, file-requires, file-set-intersect,
file-dependents): Simplify.
(unload-feature-special-hooks): Update list of special hooks.

display-world-time does not work on Windows.

* bindings.el (completion-ignored-extensions): Remove pdf and dvi
extensions since they can be viewed with doc-view.

* files.el (auto-mode-alist): Make doc-view-mode the default mode
for pdf, ps and dvi files.

* doc-view.el: Make doc-view-mode the standard mode for viewing
pdf, [e]ps and dvi files and add binding C-c C-c to toggle between
text and image display.  Add binding C-c C-e to switch to an
editing mode.
(doc-view-ghostscript-options, doc-view-ps->pdf): Add "-dSAFER" to
avoid security problems when rendering files untrusted sources.

Display message when tutorial position is not saved

Display message when tutorial position is not saved

Mention xpdf.  Fix spelling of Ghostscript.
(doc-view-ghostscript-options): Fix typo in doc string.

Fix wording of the SPC non-completion of file names entry.

(compilation-next-error-function): Fix timestamp
handling, so compilation-fake-loc works again.

(server-select-display): Nop if we do not support m-f-o-d.
(server-process-filter): Revert last change.

(vc-diff-sentinel, vc-diff-internal): Revert some changes in the
behavior unrelated to filesets.

Regenerate.

Link to libs for calling res_init() if available.
(Fmake_network_process): Call res_init() before getaddrinfo or
gethostbyname, if possible.

* process.c: Link to libs for calling res_init() if available.
(Fmake_network_process): Call res_init() before getaddrinfo or
gethostbyname, if possible.

(HAVE_RES_INIT): Define if res_init() exists.
(HAVE_LIBRESOLV): Also define if we are using res_init().

* configure.in (HAVE_RES_INIT): Define if res_init() exists.
(HAVE_LIBRESOLV): Also define if we are using res_init().

Doc fix.

(read1): Set pvectype for char_tables.

*** empty log message ***

(Glossary): Use "key binding" consistently.

(Init Non-ASCII): Use "key binding" consistently.

building.texi (Source Buffers): Use "key binding" consistently.

(Glossary): Use "key binding" consistently.

(Init Non-ASCII): Use "key binding" consistently.

(Source Buffers): Use "key binding" consistently.

*** empty log message ***

*** empty log message ***

(Diary): Fix directive.

(Diary): Fix directive.

(longlines-wrap-follows-window-size): Integer value
specifies wrapping margin.
(longlines-mode, longlines-window-change-function): Set
window-specific wrapping margin based on the above.

* longlines.el (longlines-wrap-follows-window-size): Integer value
specifies wrapping margin.
(longlines-mode, longlines-window-change-function): Set
window-specific wrapping margin based on the above.

(longlines-wrap-follows-window-size): Integer value
specifies wrapping margin.
(longlines-mode, longlines-window-change-function): Set
window-specific wrapping margin based on the above.

* longlines.el (longlines-wrap-follows-window-size): Integer value
specifies wrapping margin.
(longlines-mode, longlines-window-change-function): Set
window-specific wrapping margin based on the above.

(XMISCANY, XMARKER, XINTFWD, XBOOLFWD, XOBJFWD, XOVERLAY, XBUFFER_OBJFWD)
(XBUFFER_LOCAL_VALUE, XKBOARD_OBJFWD, XSAVE_VALUE): Add type checks.
(SOME_BUFFER_LOCAL_VALUEP, GC_SOME_BUFFER_LOCAL_VALUEP): Remove.

(free_misc): Use XMISCTYPE.
(live_misc_p, gc_sweep): Use Lisp_Misc_Any.

** ams@gnu.org, 9 July: eshell and external commands
Fixed.

Correct typo.

(eshell-complex-commands): Add "ls".