* progmodes/ruby-mode.el (ruby-syntax-propertize-expansion): Declare.

* which-func.el (ediff-window-A, ediff-window-B, (ediff-window-C): Declare.

* pgg-gpg.el, pgg-pgp.el, pgg-pgp5.el: Tweak requires to silence compiler.

Silence sym-comp compilation

* obsolete/sym-comp.el: No need to load hipper-exp when compiling.
(he-search-string, he-tried-table, he-expand-list)
(he-init-string, he-string-member, he-substitute-string)
(he-reset-string): Declare.

* options.el (list-options): Use custom-variable-p, rather than obsolete alias.

* simple.el (shell-command-on-region): Pass the `replace' argument
down to `call-process-region' to comply with he doc as reported on
<http://stackoverflow.com/questions/16720458/emacs-noninteractive-call-to-shell-command-on-region-always-deletes-region>

src/keyboard.c (read_decoded_event_from_main_queue): Improve commentary
 about the w32 console reading non-ASCII characters.

* lisp/emacs-lisp/smie.el (smie-indent-forward-token)
(smie-indent-backward-token): Handle string tokens.

Fixes: debbugs:14381

Don't apply keyboard decoding to unread-command-events.
* src/keyboard.c: Apply keyboard decoding only to events that come directly
from the tty, not from unread-command-events (bug#14368).
(read_event_from_main_queue): New function, extracted from read_char).
(read_decoded_char): Remove.
(read_decoded_event_from_main_queue): New function to replace it.
(read_char): Use it.
(read_key_sequence): Use read_char rather than read_decoded_char.

Fixes: debbugs:14403

* lisp/ielm.el (ielm-menu): New menu.
(inferior-emacs-lisp-mode): Set comment-start.

* lisp/textmodes/reftex.el (reftex-ref-style-toggle): Fix deactivate
  action.

* lisp/textmodes/reftex-vars.el (reftex-ref-style-alist): Add cleveref
  macros.

* lisp/textmodes/reftex-parse.el (reftex-locate-bibliography-files):
  Accept options for bibliography commands.
* lisp/textmodes/reftex-vars.el (reftex-bibliography-commands): Add
  addbibresource.  Basic Biblatex support.

* src/keyboard.c (read_decoded_char): Don't decode under w32.

Fixes: debbugs:14403

merge trunk

test/automated/decoder-tests.el: New file

* net/tramp-gvfs.el (top):
* net/xesam.el (xesam-dbus-unique-names): Suppress D-Bus errors
when loading package.  (Bug#14447)

Silence em-ls compilation

* lisp/eshell/em-ls.el: Adjust requires.
(eshell-glob-regexp): Declare.

Silence gnus-util compilation

* lisp/gnus/gnus-util.el (rmail-swap-buffers-maybe)
(rmail-maybe-set-message-counters, rmail-count-new-messages)
(rmail-summary-exists, rmail-show-message, rmail-summary-displayed)
(rmail-pop-to-buffer, rmail-maybe-display-summary): Declare.

Fix declaration typo

Silence some js compilation warnings

* lisp/progmodes/js.el: No need to load comint when compiling.
(ring-insert, comint-send-string, comint-send-input)
(comint-last-input-end, ido-chop): Declare.

Silence ediff compilation

* lisp/vc/ediff-diff.el, lisp/vc/ediff-merg.el: Require ediff-util at run-time.

* lisp/vc/ediff-mult.el: Adjust requires.
(ediff-directories-internal, ediff-directory-revisions-internal)
(ediff-patch-file-internal): Declare.

* lisp/vc/ediff-ptch.el: Adjust requires.
(ediff-use-last-dir, ediff-buffers-internal): Declare.
(ediff-find-file): Autoload.

* lisp/vc/ediff-util.el: No need to load ediff when compiling.
(ediff-regions-internal): Declare.

* lisp/vc/ediff-wind.el: Adjust requires.
(ediff-compute-toolbar-width): Define when compiling.
(ediff-setup-control-buffer, ediff-make-bottom-toolbar): Declare.

* lisp/vc/ediff.el: No need to load dired, ediff-ptch when compiling.
(dired-get-filename, dired-get-marked-files)
(ediff-last-dir-patch, ediff-patch-default-directory)
(ediff-get-patch-buffer, ediff-dispatch-file-patching-job)
(ediff-patch-buffer-internal): Declare.

Silence some gnus compilation warnings

* gnus/mm-decode.el: No need to load term when compiling.
(term-mode, term-char-mode): Declare.

* gnus/mm-util.el: No need to load jka-compr when compiling.
(jka-compr-acceptable-retval-list, jka-compr-make-temp-name): Declare.

* gnus/nnmaildir.el: Require is automatically eval-and-compile.
(nnmail): Require at run-time too.

* gnus/registry.el (registry-size): Move definition before use.

Silence checkdoc.el compilation

* lisp/emacs-lisp/checkdoc.el: No need to load ispell when compiling.
(ispell-process, ispell-buffer-local-words, lm-summary)
(lm-section-start, lm-section-end): Declare.
(checkdoc-ispell-init): Simplify.

Silence vera-mode compilation

* lisp/progmodes/vera-mode.el (he-init-string, he-dabbrev-beg)
(he-string-member, he-reset-string, he-substitute-string): Declare.

* lisp/url/url.el (mm-dissect-buffer, mm-display-part): Declare.

Silence many eshell compilation warnings

* lisp/eshell/em-tramp.el: Adjust requires.
(eshell-parse-command): Autoload.

* lisp/eshell/em-xtra.el: Adjust requires.
(eshell-parse-command): Autoload.

* lisp/eshell/esh-ext.el: Adjust requires.
(eshell-parse-command, eshell-close-handles): Autoload.

* lisp/eshell/esh-io.el: Adjust requires.
(eshell-output-filter): Autoload.

* lisp/eshell/esh-util.el: No need to load tramp when compiling.
(tramp-file-name-structure, ange-ftp-ls, ange-ftp-file-modtime): Declare.
(eshell-parse-ange-ls): Require ange-ftp and tramp.

* lisp/eshell/em-alias.el, lisp/eshell/em-banner.el, lisp/eshell/em-basic.el:
* lisp/eshell/em-cmpl.el, lisp/eshell/em-glob.el, lisp/eshell/em-pred.el:
* lisp/eshell/em-prompt.el, lisp/eshell/em-rebind.el, lisp/eshell/em-smart.el:
* lisp/eshell/em-term.el, lisp/eshell/esh-arg.el, lisp/eshell/esh-mode.el:
* lisp/eshell/esh-opt.el, lisp/eshell/esh-proc.el:
* lisp/eshell/esh-var.el: Adjust requires.

* lisp/eshell/eshell.el: Do not require esh-util twice.
(eshell-add-input-to-history): Declare.
(eshell-command): Check history module is active before using it.

* lisp/eshell/em-ls.el (eshell-ls-dir): Fix -A handling.

lisp/gnus/gnus-spec.el (gnus-parse-complex-format): Try to maximize compatibility

* src/casetab.c (init_casetab_once): Fix last change.

Fixes: debbugs:14424

* progmodes/octave.el (inferior-octave-startup): Fix bug#14433.

merge trunk

Fix the setting of buffer-file-coding-system on, for instance, C-x RET c unix RET _FILE_OF_DOS_EOL_TYPE_ RET.

* autorevert.el (auto-revert-notify-add-watch)
(auto-revert-notify-handler): Add `attrib' for the inotify case,
it indicates changes in file modification time.

lisp/gnus/mml2015.el (mml2015-epg-sign): Make sure to insert newline after the signed data to conform the standard (Bug#14232)

Tweak byte-compile-file-form-autoload warnings

* emacs-lisp/bytecomp.el (byte-compile-file-form-autoload):
Always delete the autoloaded function from the noruntime and
unresolved functions lists.

Add some declarations to url-handlers.el

* lisp/url/url-handlers.el (mm-save-part-to-file, mm-destroy-parts)
(mm-decode-string, mail-content-type-get): Declare.

Silence allout.el compilation

* lisp/allout.el: No need to load epa, epg, overlay when compiling.
(epg-context-set-passphrase-callback, epg-list-keys)
(epg-decrypt-string, epg-encrypt-string, epg-user-id-string)
(epg-key-user-id-list): Declare.

Small viper clean-up

* lisp/emulation/viper-cmd.el (viper-set-searchstyle-toggling-macros)
(viper-set-parsing-style-toggling-macro)
(viper-set-emacs-state-searchstyle-macros):
Use called-interactively-p on Emacs.
(viper-looking-back): Make it an obsolete alias.  Update callers.
* lisp/emulation/viper-ex.el: Load viper-keym, not viper-cmd.
Use looking-back rather than viper-looking-back.
(viper-tmp-insert-at-eob, viper-enlarge-region)
(viper-read-string-with-history, viper-register-to-point)
(viper-append-to-register, viper-change-state-to-vi)
(viper-backward-char-carefully, viper-forward-char-carefully)
(viper-Put-back, viper-put-back, viper-add-newline-at-eob-if-necessary)
(viper-change-state-to-emacs): Declare.
* lisp/emulation/viper-macs.el: Load viper-mous, viper-ex, not viper-cmd.
(viper-change-state-to-insert, viper-change-state-to-vi): Declare.
* lisp/emulation/viper-mous.el: Do not load viper-cmd.
(viper-backward-char-carefully, viper-forward-char-carefully)
(viper-forward-word, viper-adjust-window): Declare.

* lisp/vc/ediff.el (ediff-version): Use called-interactively-p on Emacs.

* progmodes/idlw-help.el (idlwave-help-fontify): Use called-interactively-p.

Silence w32console.el compilation

* lisp/term/w32console.el (w32-get-console-codepage)
(w32-get-console-output-codepage): Declare.

Small speedbar-related clean-up

* lisp/dframe.el (x-sensitive-text-pointer-shape, x-pointer-shape):
Remove unnecessary declarations.
(dframe-message): Doc fix.

* lisp/info.el (dframe-select-attached-frame, dframe-current-frame):
Declare.

* lisp/speedbar.el (speedbar-message): Make it an obsolete alias.
Update all callers.
(speedbar-with-attached-buffer)
(speedbar-maybee-jump-to-attached-frame): Make these aliases obsolete.
(speedbar-with-writable): Use backquote.

* lisp/emacs-lisp/eieio-opt.el (eieio-describe-class-sb):

* lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-handle-click):
Use dframe-with-attached-buffer, dframe-maybee-jump-to-attached-frame
rather than speedbar- aliases.

* lisp/mail/rmail.el: Load dframe rather than speedbar when compiling.
(speedbar-make-specialized-keymap, speedbar-insert-button)
(dframe-select-attached-frame, dframe-maybee-jump-to-attached-frame)
(speedbar-do-function-pointer): Declare.
(rmail-speedbar-button, rmail-speedbar-find-file)
(rmail-speedbar-move-message):
Use dframe-with-attached-buffer rather than speedbar- alias.

* lisp/progmodes/gud.el: Load dframe rather than speedbar when compiling.
(dframe-message, speedbar-make-specialized-keymap)
(speedbar-add-expansion-list, speedbar-mode-functions-list)
(speedbar-make-tag-line, speedbar-remove-localized-speedbar-support)
(speedbar-insert-button, dframe-select-attached-frame)
(dframe-maybee-jump-to-attached-frame)
(speedbar-change-initial-expansion-list)
(speedbar-previously-used-expansion-list-name): Declare.
(gud-speedbar-item-info, gud-gdb-goto-stackframe):
Use dframe-message, dframe-with-attached-buffer rather than
speedbar- aliases.
(gud-sentinel): Silence compiler.

* lisp/progmodes/vhdl-mode.el (speedbar-refresh)
(speedbar-do-function-pointer, speedbar-add-supported-extension)
(speedbar-add-mode-functions-list, speedbar-make-specialized-keymap)
(speedbar-change-initial-expansion-list, speedbar-add-expansion-list)
(speedbar-extension-list-to-regex, speedbar-directory-buttons)
(speedbar-file-lists, speedbar-make-tag-line)
(speedbar-line-directory, speedbar-goto-this-file)
(speedbar-center-buffer-smartly, speedbar-change-expand-button-char)
(speedbar-delete-subblock, speedbar-position-cursor-on-line)
(speedbar-make-button, speedbar-reset-scanners)
(speedbar-files-item-info, speedbar-line-text)
(speedbar-find-file-in-frame, speedbar-set-timer)
(dframe-maybee-jump-to-attached-frame, speedbar-line-file): Declare.
(speedbar-with-writable): Do not (re)define it.
(vhdl-speedbar-find-file): Use dframe-maybee-jump-to-attached-frame
rather than speedbar- alias.

* lisp/cedet/ede/speedbar.el (ede-file-find, ede-tag-find):
* lisp/cedet/semantic/sb.el (semantic-sb-token-jump):
Use dframe-maybee-jump-to-attached-frame rather than speedbar- alias.

* lisp/mh-e/mh-speed.el (mh-speed-view):
Use dframe-with-attached-buffer rather than speedbar- alias.

ChangeLog fix

Minor fix to last change

* progmodes/octave.el (octave-mode-menu): Update and re-organize
menu items.
(octave-mode): Tweak fill-nobreak-predicate.
(inferior-octave-startup): Check process to avoid infinite loop.
(inferior-octave): Pop to buffer first to show abornmal process
exit information.

* src/search.c (looking_at_1): Only set last_thing_searched if the match
changed the match-data.

Fixes: debbugs:14281

For now, revert previous rmail.el change

Silence printing.el compilation

* lisp/printing.el (pr-menu-bar): Define when compiling.

Silence rmail.el compilation

* lisp/mail/rmail.el (speedbar): No need to load when compiling.
(speedbar-make-specialized-keymap, speedbar-with-attached-buffer)
(speedbar-do-function-pointer): Declare.

Simplify auto fill in Octave mode and some small improvements

Silence some compiler warnings

* calculator.el (electric, ehelp): No need to load when compiling.
(Electric-command-loop, electric-describe-mode): Declare.

* doc-view.el (doc-view-current-converter-processes): Move before use.

* files.el (dired-unmark):
* progmodes/gud.el (gdb-input): Update declarations.

* emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
Move MODE-set-explicitly definition before use.

* erc/erc-log.el (erc-network-name): Declare.

* erc/erc-notify.el (pcomplete--here): Declare.
(pcomplete/erc-mode/NOTIFY): Require pcomplete.

* international/mule-diag.el (mule-diag):
Don't use obsolete window-system-version.

* mail/feedmail.el (smtpmail): No need to load when compiling.
(smtpmail-via-smtp, smtpmail-smtp-server): Declare.

* mail/mail-utils.el (rfc822): No need to load when compiling.
(rfc822-addresses): Autoload it.
(mail-strip-quoted-names): Trivial simplification.

* mail/rmail.el (rmail-mime-message-p, rmail-mime-toggle-raw): Declare.
(rmail-retry-failure): Don't assume that rmail-mime-feature == rmailmm.

* net/snmp-mode.el (tempo): Don't duplicate requires.

* progmodes/prolog.el (info): No need to load when compiling.
(comint): Require before shell requires it.
(Info-goto-node): Autoload it.
(Info-follow-nearest-node): Declare.
(prolog-help-info, prolog-goto-predicate-info): No need to require info.

* textmodes/artist.el (picture-mode-exit): Declare.

* textmodes/reftex-parse.el (reftex-parse-from-file):
Trivial rewrite so the compiler can parse it better.

* url/url-dav.el (url-http): Require it.
(url-http-head-file-attributes): Don't autoload it.

* url/url-proxy.el (url-http): Autoload it.

Make some trivial erc.el functions obsolete

* lisp/erc/erc.el (erc-quit-reason-various-alist)
(erc-part-reason-various-alist): Don't mention zippy.
(erc-quit-reason, erc-part-reason): Remove zippy options.
(erc-quit-reason-zippy, erc-part-reason-zippy): Make obsolete.
If yow is not defined, fall back to -normal versions.

* xdisp.c (reseat_at_previous_visible_line_start):
Already declared in dispextern.h, so remove it here.
(move_it_vertically_backward): Likewise.

* lisp/mh-e/mh-comp.el (mh-regexp-in-field-p): Fix previous change.

Use octave-help-mode for the Octave Help buffer

lisp/gnus/gnus-spec.el (gnus-parse-complex-format): Use unicode escape for left double angle quotation mark

Sync x-server-* and x-display-* functions on NS with those on X11.

* lisp/format-spec.el (format-spec): Allow spec chars with nil values.

Fixes: debbugs:14420

Mention `display-monitor-attributes-list' in docstrings of X11 display measurement functions.

* xfns.c (check_x_display_info): Don't use XINT for terminal object.

lisp/gnus/message.el (message-insert-formatted-citation-line): Handle finding first/lastname when more than 2 names appear

lisp/gnus/shr.el (shr-tag-span): New function

doc/misc/gnus.texi (Fancy Mail Splitting): Fix missing backslash on \\&

* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-heredoc): Leave
point at bol following the heredoc openers.
(ruby-syntax-propertize-expansions): Remove.

* lisp/progmodes/ruby-mode.el (ruby-expression-expansion-re): Allow to
start at point, so that expansion starting right after opening
slash in a regexp is recognized.
(ruby-syntax-before-regexp-re): New defvar, extracted from
ruby-syntax-propertize-function.  Since the value of this regexp
is looked up at runtime now, we should be able to turn
`ruby-syntax-methods-before-regexp' into a defcustom later.
(ruby-syntax-propertize-function): Split regexp matching into two
parts, for opening and closing slashes.  That allows us to skip
over string interpolations and support multiline regexps.
Don't call `ruby-syntax-propertize-expansions', instead use another rule
for them, which calls `ruby-syntax-propertize-expansion'.
(ruby-syntax-propertize-expansions): Move `remove-text-properties'
call to `ruby-syntax-propertize-function'.
(ruby-syntax-propertize-expansion): Extracted from
`ruby-syntax-propertize-expansions'.  Handles one expansion.
(ruby-syntax-propertize-heredoc): Explicitly call
`ruby-syntax-propertize-expansions'.
(ruby-syntax-propertize-percent-literal): Leave point right after
the percent symbol, so that the expression expansion rule can
propertize the contents.

* test/automated/ruby-mode-tests.el (ruby-heredoc-highlights-interpolations)
(ruby-regexp-skips-over-interpolation)
(ruby-regexp-continues-till-end-when-unclosed)
(ruby-regexp-can-be-multiline)
(ruby-interpolation-inside-percent-literal): New tests.

* test/indent/ruby.rb: Add multiline regexp example.

* lisp/man.el (Man-default-man-entry): Remove `-' from the end of the default value.

Fixes: debbugs:14400

comint-password-prompt-regexp tweak

Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-05/msg00401.html

* lisp/comint.el (comint-password-prompt-regexp):
Allow "password for XXX" where XXX contains colons (eg https://...).

Add new files in nt/ to make-dist.

 make-dist (files): Add nt/msysconfig.sh, nt/mingw-cfg.site,
 nt/epaths.nt, and nt/INSTALL.MSYS.

Auto-commit of generated files.

Spelling fixes.

Port --enable-gcc-warnings to clang.

* configure.ac (nw): Remove obsolescent warnings.
These aren't needed for clang, or for gcc for that matter.
(emacs_cv_clang): New var, which tests for clang.
Omit warnings that clang is too picky about.
(GLIB_DISABLE_DEPRECATION_WARNINGS): Define this;
needed for Ubuntu 13.04 + clang + --enable-gcc-warnings.
* lib-src/etags.c: Omit unnecessary forward decls.
(print_version, print_help): Declare _Noreturn.
* lib-src/pop.c (socket_connection) [HAVE_GETADDRINFO]: Simplify.
* src/bytecode.c (exec_byte_code):
* src/regex.c:
Redo diagnostic pragmas to pacify clang, too.
* src/dbusbind.c (xd_retrieve_arg): Do not use uninitialized variable.
* src/editfns.c (Fencode_time):
* src/fileio.c (file_accessible_directory_p):
* src/font.c (font_unparse_xlfd):
Use '&"string"[index]' instead of '"string" + (index)'.
* src/undo.c (user_error): Remove; unused.

* make-dist (files): Add nt/Makefile.in, nt/gnulib.mk.

Otherwise, 'configure; make' fails on non-Windows builds.

Teach inferior-octave-startup to handle Octave > 3.7

* progmodes/octave.el (inferior-octave-startup): Use OCTAVE_SRCDIR
instead.
(octave-source-directories): Don't check process.
(octave-source-directories, octave-find-definition): Doc fix.

* lisp/gnus/message.el (message-mode): Use message-mode-abbrev-table,
with text-mode-abbrev-table as parent.  (Bug#14413)

* vhdl-mode.el (vhdl-mode-map-init): Remove backspace/delete bindings.
(Bug#14392)

* lisp/cus-dep.el (custom-make-dependencies): Sort the output.
(custom-versions-load-alist): Convert comment to doc.

Fix typos in previous subword.el change

* newcomment.el (comment-search-backward): Stricter in finding
comment start.

* progmodes/octave.el (octave-comment-start): Remove the SPC char.
(octave-comment-start-skip): Properly anchored.

Fixes: debbugs:14303

Support invocation of un-installed runemacs.exe.

 nt/runemacs.c (WinMain): Support invocation of un-installed
 nt/runemacs.exe, by looking for src/emacs.exe.

Support invocation of un-installed runemacs.exe.

* emacs-lisp/smie.el (smie-highlight-matching-block-mode): Clean
up when turned off.
(smie--highlight-matching-block-overlay): No longer buffer-local.
(smie-highlight-matching-block): Adjust.

Fixes: debbugs:14395

Doc string fix for "nanoseconds".

* emacs-lisp/timer.el (timer-relative-time, timer-inc-time):
Fix doc string typo that had "nanoseconds" instead of "microseconds".

Fixes: debbugs:14406

* calc/calc-units.el (math-extract-units): Preserve powers of units.

* subr.el (delete-consecutive-dups): New function.
* ido.el (ido-set-matches-1): Use it.
* progmodes/octave.el (inferior-octave-completion-table): Use it.
* ido.el (ido-remove-consecutive-dups): Remove.

* lisp/progmodes/f90.el (f90-keywords-re, f90-keywords-level-3-re)
(f90-hpf-keywords-re, f90-constants-re): Use \\_< rather than
regexp-opt's `words'.

lisp/gnus/message.el (message-expand-group): Decode group names

* emacs-lisp/smie.el (smie-matching-block-highlight): New face.
(smie--highlight-matching-block-overlay)
(smie--highlight-matching-block-lastpos)
(smie--highlight-matching-block-timer): New variables.
(smie-highlight-matching-block): New function.
(smie-highlight-matching-block-mode): New minor mode.
(smie-setup): Conditionally enable smie-blink-matching-open.

Fixes: debbugs:14395

gnus-notifications.el (gnus-notifications-notify): Use photo-file as app-icon

Document arguments of insert_1_both.

Fix bug #14408 with updating *Messages* display.

 src/xdisp.c (message_dolog): If the *Messages* buffer is shown in
 some window, increment windows_or_buffers_changed, so that
 *Messages* display in that window is updated.

Define SIZE_MAX for MSVC, part of bug #14409.

 nt/inc/stdint.h (SIZE_MAX) [!__GNUC__]: Define.

Give recipe in nt/INSTALL.MSYS to uninstall msys-texinfo.

Auto-commit of generated files.

Sync with upstream verilog-mode r840.

* lisp/progmodes/verilog-mode.el (verilog-mode-version)
(verilog-mode-release-date): Update.
(verilog-auto-lineup, verilog-auto-reset): Doc fixes.
(verilog-sig-tieoff): Fix string error on
AUTORESET with colon define, bug594.  Reported by Andrew Hou.
(verilog-read-decls): Fix parameters confusing
AUTOINST interfaces, bug565.  Reported by Leith Johnson.

Fix a typo in nt/INSTALL.MSYS.

Support building Emacs on MS-Windows using the Posix configury.

 lib/Makefile.am: If building for MS-Windows, include
 nt/gnulib.mk instead of lib/gnulib.mk.
 configure.ac: Adapt to MSYS build on MS-Windows.
 Makefile.in (NTDIR): New variable, for the MSYS build on
 MS-Windows.
 (SUBDIR): Add $(NTDIR).
 (.PHONY): Add epaths-force-w32.
 (msys_to_w32): New variable.
 (epaths-force-w32, install-nt, uninstall-nt): New targets.
 (lib-src src): Add $(NTLIB) to prerequisites.
 (lib lib-src lisp leim nt): Add 'nt'.
 (config.status): Use $(CFG).
 (.PHONY): Add install-$(NTDIR) and uninstall-$(NTDIR).
 (install, install-arch-dep): Add install-$(NTDIR).
 (uninstall): Depend on uninstall-$(NTDIR).
 (mostlyclean, clean, distclean, bootstrap-clean): Add 'nt'.
 * GNUmakefile (CFG): New variable, uses mingw-cfg.site as
 CONFIG_SITE for the MSYS build on MS-Windows.
 (Makefile): Use $(CFG).
 .bzrignore: Ignore *.res, *.tmp, and *.map.  Remove
 src/emacs.res.

 etc/NEWS: Advertise the MSYS build on MS-Windows.

 leim/Makefile.in (leim-list.el, check-declare): Use reveal-filename.

 lib-src/update-game-score.c [WINDOWSNT]: Include "ntlib.h".
 lib-src/ntlib.h (sleep): Update prototype.
 (geteuid): Add prototype.
 lib-src/ntlib.c (sleep): Now returns an unsigned value.
 (getgid): New function.
 lib-src/Makefile.in (CLIENTW, LIB_WSOCK32, LIBS_ECLIENT, NTLIB)
 (CLIENTRES, WINDRES, NTINC, NTDEPS): New variables.
 (INSTALLABLES): Add $(CLIENTW).
 (LIBS_MOVE): Use $(LIB_WSOCK32).
 ($(DESTDIR)${archlibdir}): Use $(EXEEXT) on update-game-score.
 (test-distrib${EXEEXT}): Use $(EXEEXT) on test-distrib.
 (etags${EXEEXT}, ebrowse${EXEEXT}, ctags${EXEEXT})
 (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT})
 (emacsclient${EXEEXT}, hexl${EXEEXT}, update-game-score${EXEEXT}):
 Add $(NTLIB) to prerequisites.  Use $(EXEEXT).
 (pop.o): Add pop.h to prerequisites.
 (emacsclientw${EXEEXT}, ntlib.o): New targets.
 (emacsclient.res): New target.

 lisp/subr.el (reveal-filename): New function.
 lisp/loadup.el: Compute Emacs executable versions on MS-Windows,
 where executables have the .exe extension.  Add a hard link
 emacs-XX.YY.ZZ.exe on MS-Windows.
 lisp/Makefile.in (XARGS_LIMIT): New variable.
 (custom-deps, finder-data, autoloads)
 ($(MH_E_DIR)/mh-loaddefs.el, $(TRAMP_DIR)/tramp-loaddefs.el)
 ($(CAL_DIR)/cal-loaddefs.el, $(CAL_DIR)/diary-loaddefs.el)
 ($(CAL_DIR)/hol-loaddefs.el): Use reveal-filename.
 (compile-main): Limit xargs according to $(XARGS_LIMIT).

 nt/msysconfig.sh: New file.
 nt/mingw-cfg.site: New file.
 nt/makefile.w32-in (LOCAL_FLAGS): Add -DOLD_PATHS=1.
 nt/inc/unistd.h: Include pwd.h and sys/types.h.
 nt/inc/sys/time.h (_TIMEVAL_DEFINED, timerisset, timercmp)
 (timerclear): Define.
 (gettimeofday): Adjust signature to be Posix compatible, by using
 the 'restrict' keyword.
 nt/inc/sys/stat.h (UTIME_NOW, UTIME_OMIT): Define.
 (struct _stat, struct _stati64): Define.
 nt/inc/sys/socket.h (timeval): Define only for MSVC.
 (FD_SET, FD_CLR, FD_ISSET, fd_set): Redefine only if
 EMACS_CONFIG_H is defined.
 (timeval): Undefine only for MSVC.
 nt/inc/ms-w32.h (HAVE___BUILTIN_UNWIND_INIT, restrict)
 (HAVE_WINDOW_SYSTEM, HAVE_MENUS, EMACS_CONFIGURATION)
 (EMACS_CONFIG_OPTIONS, HAVE_LONG_LONG_INT)
 (HAVE_UNSIGNED_LONG_LONG_INT): Define only if not already defined.
 (fileno): Move definition after including stdio.h.
 (sigset_t): Guard typedef by _W64.
 nt/gnulib.mk: New file.
 nt/epaths.nt: New file.
 nt/addpm.c [!OLD_PATHS]: Include src/epaths.h, instead of having a
 copy of the file names there.
 <env_vars> [!OLD_PATHS]: Use macros from epaths.h instead of
 literal strings.
 nt/Makefile.in: New file.
 nt/INSTALL.MSYS: New file.
 nt/INSTALL: Mention INSTALL.MSYS.

 src/w32.c: Include epaths.h.
 (init_environment): Use cmdproxy.exe without leading directories.
 Support emacs.exe in src; point SHELL to cmdproxy in ../nt in that
 case.
 (gettimeofday): Adjust signature and return value to Posix
 expectations.
 src/unexw32.c (open_output_file): Delete the existing emacs.exe
 before creating it, to break the hard link to the versioned
 executable.
 src/Makefile.in (EMACS_MANIFEST, CM_OBJ, TEMACS_POST_LINK)
 (ADDSECTION, EMACS_HEAPSIZE, MINGW_TEMACS_POST_LINK)
 (FIRSTFILE_OBJ): New variables.
 (W32_RES): Rename to EMACSRES.  All users changed.
 (base_obj): Use $(CM_OBJ).
 (ALLOBJS): Use $(FIRSTFILE_OBJ).
 (emacs$(EXEEXT)): Depend on $(ADDSECTION).
 (temacs$(EXEEXT)): Use $(TEMACS_POST_LINK), and move
 $(W32_RES_LINK) before $(LIBES).
 (emacs.res): Depend on $(EMACS_MANIFEST).  Put emacs.rc in nt.

Announce the MSYS build in etc/NEWS.

Auto-commit of generated files.