* mail/vms-pmail.el (insert-signature): Don't use end-of-buffer.

* tooltip.el: Use featurep 'xemacs.

* printing.el: Move variable definitions before use, no code
change.

(Fdump_emacs): Fix typo in message.
(syms_of_emacs) <kill-emacs-hook>: Fix typo in docstring.
<installation-directory>: Reflow docstring.

Add a list of minibuffer default values.

(Shell Command Guessing): Default values are now available by typing M-n instead of M-p.

(Text from Minibuffer, Minibuffer Completion, High-Level Completion):
Document a list of default value strings in the DEFAULT argument,
for which minibuffer functions return the first element.

(Minibuffer History): Add text about a list of minibuffer default values.

(dired-guess-shell-command): Put all guesses to the
minibuffer default value list instead of pushing them temporarily
to the history list.

Allow minibuffer default to be a list of default values.
With empty input use the first element of this list as returned default.
(string_to_object):
(read_minibuf_noninteractive):  If defalt is cons, set val to its car.
(read_minibuf): If defalt is cons, set histstring to its car.
(Fread_string): If default_value is cons, set val to its car.
(Fread_buffer): If def is cons, use its car.
(Fcompleting_read): If defalt is cons, set val to its car.

(goto-history-element): Allow minibuffer-default to be
a list of default values accessible by typing M-n in the minibuffer.

(byte-optimize-featurep): Fix paren typo.

* w32-fns.el (w32-quote-process-args):
* dos-w32.el (print-region-function, lpr-headers-switches)
(ps-print-region-function): Pacify byte-compiler.

* emulation/edt-mapper.el (function-key-map):
(edt-map-key): Make it a function instead of using fset. Inline
edt-gnu-map-key and edt-lucid-map-key. Use featurep 'xemacs.
(edt-gnu-map-key, edt-lucid-map-key): Remove.
(edt-x-emacs-p): Remove.
(edt-emacs-variant, edt-window-system, edt-xserver):
Use featurep 'xemacs.

* net/eudc.el: Use (featurep 'xemacs) instead of the string test.
Replace eudc-xemacs-p with its definition.
(eudc-xemacs-p, eudc-emacs-p, eudc-xemacs-mule-p)
(eudc-emacs-mule-p): Remove.
(eudc-install-menu, eudc-mode): Replace eudc-emacs-p and
eudc-xemacs-p with feature tests.

* net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-mail-keymap)
(eudc-bob-url-keymap, eudc-bob-sound-keymap)
(eudc-bob-generic-keymap, eudc-bob-popup-menu)
(eudc-bob-toggle-inline-display):
* net/eudc-hotlist.el (eudc-hotlist-emacs-menu): Replace
eudc-emacs-p and eudc-xemacs-p with feature tests.

* net/eudcb-ph.el (eudc-ph-open-session): Replace
eudc-xemacs-mule-p with its former definition.

* progmodes/octave-mod.el (octave-xemacs-p): Remove.
(octave-abbrev-start): Replace octave-xemacs-p with
(featurep 'xemacs).

* progmodes/vera-mode.el (vera-xemacs): Remove.
(vera-mode-syntax-table): Replace vera-xemacs with
(featurep 'xemacs).

* progmodes/vhdl-mode.el (vhdl-xemacs): Remove.
(vhdl-doc-mode, vhdl-doc-variable, vhdl-compile-init)
(vhdl-speedbar-initialize, vhdl-ps-print-init)
(vhdl-forward-comment, vhdl-mode-map-init, vhdl-show-messages)
(vhdl-emacs-22, vhdl-emacs-21): Replace vhdl-xemacs
with (featurep 'xemacs).

* progmodes/antlr-mode.el (cond-emacs-xemacs-macfn, defunx)
(save-buffer-state-x):
* obsolete/fast-lock.el (fast-lock-verbose):
* emulation/viper-init.el (viper-xemacs-p)
(viper-cond-compile-for-xemacs-or-emacs):
* emacs-lisp/checkdoc.el (checkdoc-minor-mode-map):
* ps-print.el (case-fold-search):
* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs):
* calculator.el (calculator-help): Use featurep 'xemacs.

* progmodes/prolog.el: Undo previous change.
(comint-prompt-regexp, comint-process-echoes): Pacify
byte-compiler.

* progmodes/dcl-mode.el:
* play/yow.el:
* calendar/todo-mode.el:
* calendar/cal-hebrew.el:
* vc-hg.el: Undo previous change.

* vms-patch.el: Likewise.
(print-region-function): Pacify byte-compiler.

* tramp.texi (Cleanup remote connections): New section.
(Password caching): Remove `tramp-clear-passwd'.  It's not a command
anymore.
(Bug Reports): Add `tramp-bug' to function index.
(Function Index, Variable Index): New nodes.
(Remote shell setup): Describe `tramp-password-prompt-regexp'.

* trampver.texi: Update release number.

* net/tramp.el (top): Put load of all tramp-* files into a dolist.
Require tramp-cmds.el.
(tramp-make-tramp-temp-file): We can get rid of DONT-CREATE.
(tramp-handle-file-name-all-completions): Expand DIRECTORY.
 (tramp-do-copy-or-rename-file-directly): Make more rigid checks.
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection): Use `make-temp-name'.  This is
possible, because we don't need to create the temporary file, but
we need a prefix for ssh, which has its own temporary file
handling.
(tramp-handle-delete-directory): Add "-f" to rmdir.
(tramp-handle-dired-recursive-delete-directory): Call "rm -rf".
(tramp-handle-insert-file-contents): Don't raise a tramp-error but
a signal, in order to give the callee a chance to suppress.
(tramp-handle-write-region): Set owner also in case of short
track.  Don't use compatibility calls for `write-region' anymore.
(tramp-clear-passwd): Add parameter VEC.  Adapt all callees.
(tramp-append-tramp-buffers): Apply `tramp-list-tramp-buffers'.

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

* net/tramp-gw.el (tramp-gw-basic-authentication): Apply VEC to
`tramp-clear-passwd'.

* net/trampver.el: Update release number.

*** empty log message ***

* fileio.c (Fcopy_file): Call file name handler with preserve_uid_gid.

* files.el (backup-buffer-copy): Call `copy-file' with non-nil
preserve-uid-gid.

* net/ange-ftp.el (ange-ftp-copy-file): Add PRESERVE-UID-GID for
compatibility.  It is not used, though.

*** empty log message ***

* progmodes/gud.el (gud-target-name): Move definition before use.

* progmodes/dcl-mode.el: Require imenu at compile time.

* progmodes/cc-engine.el (c-maybe-stale-found-type): Pacify
byte-compiler.

* obsolete/fast-lock.el: Use featurep test instead of
string-match.

* eshell/esh-mode.el (eshell-handle-ansi-color): Require
ansi-color at compile time too.

* eshell/em-unix.el (eshell/info): Require info at compile time
too.

* w32-fns.el: Require w32-vars.

* diff-mode.el (diff-refine-hunk): Require smerge-mode at compile
time too.

Undo previous change.

([ignore]): Use ignore.
(double-setup): Inline into double-mode.
(double-mode): Use define-minor-mode.

* textmodes/reftex.el: Move require easymenu before first use.
(reftex-info): Require info at compile too.

* textmodes/org-publish.el (org-publish-org-to-html)
(org-publish-org-to): Require org at compile time too.
(org-publish-attachment): Require at compile time too.

* term/tty-colors.el (w32-tty-standard-colors): Pacify
byte-compiler.

* term/pc-win.el (frame-creation-function-alist): Add to this
instead of setting frame-creation-function.

* play/blackbox.el (bb-up, bb-down): Use forward-line.

* net/rcirc.el (rcirc-markup-text-functions): Move definition
earlier.

* calendar/todo-mode.el: Require calendar at compile time.

* calendar/cal-islam.el: Require diary-lib at compile time.

* calendar/cal-hebrew.el: Require diary-lib and holidays at
compile time.

* w32-vars.el: Provide w32-vars.

* term/w32-win.el: Require w32-vars.
(w32-color-map): Pacify byte-compiler.

* loadup.el: Load w32-wars before term/w32-win.

(fill-paragraph): When the region is active, don't try other `or' branches
regardless of the value returned by fill-region; just return t.

*** empty log message ***

Restore vc-next-action functionality of registering files.

(Fdocumentation): Check for advice in all cases.

*** empty log message ***

Condition out a misleading message.

Add some recent news.

(Trigonometric and Hyperbolic Functions): Fix typo.

(info-nmake): Change into correct directories.

A better solution for the last change:
(docflags, doldflags): New variables.
(genmakefiles): Use them to work around problems with whitespace in
arguments of the `if' command.

(usercflags, userldflags): Quote %1.

* play/decipher.el (decipher-keypress): Use forward-line.

* term/x-win.el (x-gtk-stock-map, icon-map-list)
(x-gtk-map-stock): Delete duplicated definitions from merge.

* progmodes/octave-mod.el: Require octave-inf at compile time

* progmodes/compile.el (compilation-skip-to-next-location)
(compilation-skip-threshold, compilation-skip-visited): Move
definitions earlier.

* play/zone.el (zone-fall-through-ws):
* play/landmark.el (lm-move-down, lm-move-up):
* play/handwrite.el (handwrite):
* mail/mspools.el (mspools-visit-spool):
* wdired.el (wdired-next-line, wdired-previous-line):
* tar-mode.el (tar-subfile-save-buffer):
* scroll-lock.el (scroll-lock-next-line)
(scroll-lock-previous-line):
* image-dired.el (image-dired-next-line)
(image-dired-previous-line):
* ediff-help.el (ediff-help-message-line-length): Use
forward-line.

* smerge-mode.el (smerge-auto-refine):
* diff-mode.el (diff-auto-refine): Add :group.

* play/yow.el: Require doctor at compile time.

* vmsproc.el: Provide vmsproc.
(command-send-input): Use forward-line.

* vms-patch.el: Require ps-print and vmsproc at compile time.

* vc-mtn.el (log-view-message-re, log-view-file-re)
(log-view-font-lock-keywords): Pacify byte-compiler.

* vc-hg.el: Require log-view at compile time.

("\\qed"): Add this rule.

Adapt log-view-diff for new VC API.

Disambiguate two slightly different uses of the term 'filesets'.

(f90-font-lock-keywords-2, f90-looking-at-type-like): Fix regexp typos.

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.

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.