(TRES): New macro (copied from nt/makefile.w32-in).
($(TRES)): New rule (copied from nt/makefile.w32-in).
($(BLD)/emacsclientw.exe): Add dependency.

Touch only the parts of the share/emacs directory specific to this
version.

* Makefile.in: Touch only the parts of the share/emacs directory
specific to this version.

(toggle-emacs-lock): Doc fix.  Simplify.
(emacs-lock-check-buffer-lock): Doc fix.  Use `when'.
(check-emacs-lock): Doc fix.  Simplify.

Fix comment and obsolescence string for old functions.
Use `dolist' instead of `while'.

(tmm-add-one-shortcut): "?\ " -> "?\s".

(time-stamp-string-preprocess): "?\ " -> "?\s".

(terminal-cease-edit, te-more-break-unwind, te-newline, te-clear-rest-of-line,
te-clear-rest-of-screen, te-clear-screen, te-insert-lines, te-delete-lines,
te-delete, te-insert-spaces, te-delete-char, te-down-vertically-or-scroll):
"?\ " -> "?\s".

(tar-header-block-summarize, tar-clear-modification-flags): "?\ " -> "?\s".

(momentary-string-display): "?\ " -> "?\s".

(sort-fields-syntax-table): "?\ " -> "?\s".

(disabled-command-function): "?\ " -> "?\s".

(comment-indent): "?\ " -> "?\s".

(mouse-popup-menubar, mouse-buffer-menu-alist): "?\ " -> "?\s".

(copy-from-above-command): "?\ " -> "?\s".

(menu-bar-update-buffers): "?\ " -> "?\s".

(insert-kbd-macro): "?\ " -> "?\s".

(longlines-wrap-line): "?\ " -> "?\s".

(locate-main-listing-line-p, locate-mode, locate-do-setup): "?\ " -> "?\s".

(info-lookup-guess-custom-symbol): "?\ " -> "?\s".

(tab-to-tab-stop, move-to-tab-stop): "?\ " -> "?\s".

(describe-minor-mode-completion-table-for-indicator,
lookup-minor-mode-from-indicator): "?\ " -> "?\s".

(make-help-screen): "?\ " -> "?\s".

(font-lock-mode): "?\ " -> "?\s".

(electric-help-command-loop): "?\ " -> "?\s".

*** empty log message ***

(electric-buffer-list): "?\ " -> "?\s".

(usermanualdir): Define.
(emacs-lisp-intro.dvi): Pass -I options to texi2dvi instead of
using TEXINPUTS.

Input texinfo instead of ../man/texinfo
to fix building outside source directory.

(standard-display-8bit, standard-display-default): "?\ " -> "?\s".

(w32_msg_worker): Define as WINAPI and arg as void pointer.

(w32_msg_worker): Declare correctly.
(w32_initialize): Don't cast w32_msg_worker.

*** empty log message ***

*** empty log message ***

(Customization, Common Keywords)
(Group Definitions, Variable Definitions, Composite Types)
(Type Keywords, Customization Types): Add index entries for various
customization keywords.

($(BLD)/emacsclient.$(O)): Depend on makefile.w32-in.

(Watch Expressions): Mention SPC for expanding/contracting watch expressions.

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 168)

   - Update from CVS

2006-11-21  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mm-util.el (mm-string-to-multibyte): Alias to identity in XEmacs.

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

(gud-install-speedbar-variables): Remove bindings:
speedbar-expand-line-descendants, speedbar-contract-line-descendants.

(speedbar-timer-fn): Revert to old behaviour when not
in GUD mode.

*** empty log message ***

Look for standard libs in /usr/lib64 only if that directory exists.

* m/amdx86-64.h: Look for standard libs in /usr/lib64 only if that
directory exists.

(HAVE_X86_64_LIB64_DIR): New test.

Regenerate.

* configure.in (HAVE_X86_64_LIB64_DIR): New test.

* configure: Regenerate.

(c-backslash-column): Add . at end of sentence.

*** empty log message ***

(ada-which-compiler): Fix typo in docstring.
(ada-compile-goto-error): Adapt to new argument profile of
compilation-goto-locus in Emacs 22.  Don't check if the various compile
functions are defined; we already do "(require 'compile)".

(url-http): Define url-http-response-version.
(url-http-parse-response): Set it.
(url-http-parse-headers): Use it to determine keep-alive behavior.

(url-http-wait-for-headers-change-function): Use `when' instead of
`if' when possible.

(Basic Keyboard Macro): Mention F3/F4 more.

*** empty log message ***

Fix commentary.

(gdb): Explain how to run in text command mode
more clearly.  Say in error message that multiple debugging
requires restarting GDB.

*** empty log message ***

(Debugger Operation): Define text command mode.
Clarify how tooltips work.
(GDB Graphical Interface): Explain how to run in text command mode
more clearly.

*** empty log message ***

(create-fontset-from-fontset-spec): Doc fix.

(Defining Fontsets): Fix use of `charset' and `font'.

*** empty log message ***

(set-version): Set version number in lib-src/makefile.w32-in.

(VERSION): New macro.
(ECLIENT_CFLAGS): Add -DVERSION.

*** empty log message ***

(CFLAGS_SOUND): Edit out.

(Fw16_set_clipboard_data): Fix the call to sit_for as per the calling sequence
changed on 2006-07-11.

(flymake-posn-at-point-as-event): New function.
(flymake-popup-menu): Use it instead of posn-at-point.

Mention c-backslash-max-column in documentation for c-backslash-column.

(set_window_buffer): Use BLOCK_INPUT.

* window.c (set_window_buffer): Use BLOCK_INPUT.

(file_name_absolute_p) [WINDOWSNT]: Use isalpha().

Fix email address

*** empty log message ***

(file_name_absolute_p) [WINDOWSNT]: Support absolute file names with forward
slashes.

*** empty log message ***

(substring_both): Add missing address operator.

Fix last change in whitespace.

(tramp-default-method): Under Windows, change from plink to pscp.
(tramp-copy-failed-regexp, tramp-action-copy-failed): Add.
(tramp-actions-copy-out-of-band): Add pair (tramp-copy-failed-regexp tramp-action-copy-failed).
(tramp-action-out-of-band): Move "Permission denied" handling to tramp-action-copy-failed.
(tramp-do-copy-or-rename-file-out-of-band): unwind-protect killing of process buffer.

(pgg-pgp-process-region): Change `args' from a list of
strings to a single string.  Quote `errors-file-name'.
(pgg-pgp-encrypt-region, pgg-pgp-decrypt-region, pgg-pgp-sign-region)
(pgg-pgp-verify-region, pgg-pgp-insert-key, pgg-pgp-snarf-keys-region):
Adjust calls.  Use `shell-quote-argument'.

(load-with-code-conversion, with-category-table): Use with-current-buffer.
(after-insert-file-set-coding): Use restore-buffer-modified-p.

Use AREF/ASIZE macros.
(concat): Provide the full ANSI prototype.

*** empty log message ***

(tabify-regexp): Doc fix.

(syms_of_buffer) <buffer-undo-list>: Doc fix.

(smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Possibly add a MIME header for the message encoding.  Bind
coding-system-for-write around the call to mail-do-fcc.  Use
smtpmail-code-conv-from to encode queued mail messages.

Space/tab mixup.

*** empty log message ***

(gomoku-terminate-game, gomoku-human-takes-back, gomoku-prompt-for-move,
gomoku-human-plays, gomoku-offer-a-draw): Fix typos in output messages.
(gomoku-vector-length, gomoku-init-board): Fix typos in docstrings.

(005): Fix space/tab mixup in docstring.

(erc-after-connect, erc-open-ssl-stream, erc-display-line-1, erc-display-line):
Fix space/tab mixup in docstrings.

(gnus-agent-expire-unagentized-dirs, gnus-agent-regenerate-group):
Fix space/tab mixup in messages.

(gnus-article-x-face-command, gnus-numeric-save-name):
Fix space/tab mixup in docstrings.

(gnus-group-sort-function, gnus-group-line-format, gnus-group-mode,
gnus-group-read-group, gnus-group-delete-group, gnus-group-make-directory-group,
gnus-group-transpose-groups): Fix space/tab mixup in docstring.

(gnus-options-subscribe, gnus-options-not-subscribe, gnus-subscribe-newsgroup,
gnus-1): Fix space/tab mixup in docstrings.

(gnus-summary-make-false-root, gnus-make-threads):
Fix space/tab mixup in docstrings.

(gnus-nntp-server, gnus-use-cross-reference, gnus-valid-select-methods,
total-expire, gnus-summary-line-format, gnus-group-read-only-p):
Fix space/tab mixup in docstrings.

(rcirc-buffer-maximum-lines): Fix space/tab mixup in docstring.

Space/tab mixup.

(jdb): Fix space/tab mixup in docstring.

Whitespace/tab mixups.