Add --parent-id argument to emacsclient.

* lib-src/emacsclient.c (longopts, decode_options, print_help_and_exit):
New arg `-parent-id'.
(main): Send parent-id to Emacs.

* lisp/server.el (server-process-filter): Receive parent-id argument
from emacsclient.
(server-create-window-system-frame): New arg.  Pass parent-id as
frame parameter.

Regenerate configure.

Add some comments related to how epaths.h gets built.

* ansi-color.el: Delete unused escape sequences (Bug#6085).
(ansi-color-drop-regexp): New constant.
(ansi-color-apply, ansi-color-filter-region)
(ansi-color-apply-on-region): Delete unrecognized control sequences.
(ansi-color-apply): Build string list before calling concat.

Implement bidi-sensitive word movement with arrow keys.

 lisp/subr.el (right-arrow-command, left-arrow-command): Move to bindings.el.
 lisp/bindings.el (right-char, left-char): Move from subr.el and
 rename from right-arrow-command and left-arrow-command.
 (right-word, left-word): New functions.
 (global-map) <right>: Bind to right-char.
 (global-map) <left>: Bind to left-char.
 (global-map) <C-right>: Bind to right-word.
 (global-map) <C-left>: Bind to left-word.

 doc/emacs/basic.texi (Moving Point): Update due to renaming of commands bound
 to arrows.  Document bidi-aware behavior of C-<right> and C-<left>.

Fix cursor motion in bidi-reordered continued lines.

 xdisp.c (try_cursor_movement): Backup to non-continuation line
 only after finding point's row.  Fix the logic.  Rewrite the loop
 over continuation lines in bidi-reordered buffers.  Return
 CURSOR_MOVEMENT_MUST_SCROLL upon failure to find a suitable row,
 rather than CURSOR_MOVEMENT_CANNOT_BE_USED.

Finish debugging of cursor motion in bidi-reordered lines.

 xdisp.c (try_cursor_movement): Fix the logic.  Rewrite the loop
 over continuation lines in bidi-reordered buffers.  Return
 CURSOR_MOVEMENT_MUST_SCROLL upon failure to find a suitable row,
 rather than CURSOR_MOVEMENT_CANNOT_BE_USED.

Fix bug #6294.

 lisp/ls-lisp.el (ls-lisp-classify-file): New function.
 (ls-lisp-insert-directory): Call it if switches include -F.
 (ls-lisp-classify): Call ls-lisp-classify-file.
 (insert-directory): Remove blanks from switches.

* image-dired.el (image-dired-dired-toggle-marked-thumbs):
Replace LOCALP arg of `dired-get-filename' 'no-dir with nil.
(Bug#5270)

* fileio.c (Fdelete_file): Pass TRASH arg to handler call.

* net/tramp.el (tramp-debug-message): Add `tramp-compat-funcall'
to ignored backtrace functions.
(with-progress-reporter): Expand docstring.
(tramp-handle-delete-file): Implement TRASH argument.
(tramp-get-remote-trash): New defun.

* net/tramp-compat.el (tramp-compat-delete-file): Use
`symbol-value' for backward compatibility.

* net/tramp.el (tramp-handle-make-symbolic-link)
(tramp-handle-load)
(tramp-do-copy-or-rename-file-via-buffer)
(tramp-do-copy-or-rename-file-directly)
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-handle-process-file, tramp-handle-call-process-region)
(tramp-handle-shell-command, tramp-handle-file-local-copy)
(tramp-handle-insert-file-contents, tramp-handle-write-region)
(tramp-delete-temp-file-function): Use `delete-file' instead
of `tramp-compat-delete-file'.

* net/tramp-fish.el (tramp-fish-handle-delete-directory)
(tramp-fish-handle-make-symbolic-link)
(tramp-fish-handle-process-file): Use `delete-file' instead
of `tramp-compat-delete-file'.

* net/tramp-ftp.el (tramp-ftp-file-name-handler): Use
`delete-file' instead of `tramp-compat-delete-file'.

* net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg.
(tramp-gvfs-handle-write-region): Use `delete-file' instead of
`tramp-compat-delete-file'.

* net/tramp-imap.el (tramp-imap-do-copy-or-rename-file): Use
`delete-file' instead of `tramp-compat-delete-file'.

* net/tramp-smb.el (tramp-smb-handle-copy-file)
(tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file)
(tramp-smb-handle-write-region): Use `delete-file' instead of
`tramp-compat-delete-file'.
(tramp-smb-handle-delete-directory): Use 'trash as arg.

Prevent unnecessary scrolling in bidi-reordered buffers.

 xdisp.c (try_cursor_movement): back up to non-continuation line only
 after finding point's row..

merge trunk

Handle face-ignored-fonts

* configure.in: Simplify some of the *bsd $canonical tests.

Move some old ChangeLog entries to the right files.

* configure.in: Simplify some of the $canonical tests.

* src/Makefile.in (LIBES): Remove $LOADLIBES, it is never set.

* etc/MACHINES: Remove some old information no longer of relevance.
Switch to outline-mode.

* etc/PROBLEMS: Remove some more obsolete information.
Also some re-filling.

Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.

* src/fileio.c (Fdelete_file): Change meaning of optional arg to mean
whether to trash.
(internal_delete_file, Frename_file): Callers changed.
(delete_by_moving_to_trash): Doc fix.
(Fdelete_directory_internal): Don't move to trash.

* src/callproc.c (delete_temp_file):
* src/buffer.c (Fkill_buffer): Callers changed.

* src/lisp.h: Update prototype.

* lisp/diff.el (diff-sentinel):
* lisp/epg.el (epg--make-temp-file, epg-decrypt-string)
(epg-verify-string, epg-sign-string, epg-encrypt-string):
* lisp/jka-compr.el (jka-compr-partial-uncompress)
(jka-compr-call-process, jka-compr-write-region):
* lisp/server.el (server-sentinel): Remove optional arg from
delete-file, reverting 2010-05-03 change.

* lisp/dired.el (dired-delete-file): New arg TRASH.
(dired-internal-do-deletions): New arg TRASH.  Use progress
reporter.
(dired-do-flagged-delete, dired-do-delete): Use trash.

* lisp/files.el (delete-directory): New arg TRASH.

* lisp/speedbar.el (speedbar-item-delete): Allow trashing.

* lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file)
(ange-ftp-rename-remote-to-remote)
(ange-ftp-rename-local-to-remote)
(ange-ftp-rename-remote-to-local, ange-ftp-load)
(ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from
`delete-file'.
(ange-ftp-delete-directory): Add optional arg to `delete-file', to
allow trashing.

* lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to
handle new TRASH arg of `delete-file'.

* lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory)
(tramp-fish-handle-delete-file)
(tramp-fish-handle-make-symbolic-link)
(tramp-fish-handle-process-file): Use null TRASH arg in
`tramp-compat-delete-file' call.

* lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH
arg in `tramp-compat-delete-file' call.

* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg.
(tramp-gvfs-handle-write-region): Use null TRASH arg in
`tramp-compat-delete-file' call.

* lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg.
(tramp-imap-do-copy-or-rename-file): Use null TRASH arg in
`tramp-compat-delete-file' call.

* lisp/net/tramp-smb.el (tramp-smb-handle-copy-file)
(tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file)
(tramp-smb-handle-write-region): Use null TRASH arg in
tramp-compat-delete-file call.
(tramp-smb-handle-delete-directory): Use tramp-compat-delete-file.
(tramp-smb-handle-delete-file): Rename arg.

* lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH.
(tramp-handle-make-symbolic-link, tramp-handle-load)
(tramp-do-copy-or-rename-file-via-buffer)
(tramp-do-copy-or-rename-file-directly)
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-handle-process-file, tramp-handle-call-process-region)
(tramp-handle-shell-command, tramp-handle-file-local-copy)
(tramp-handle-insert-file-contents, tramp-handle-write-region)
(tramp-delete-temp-file-function): Use null TRASH arg in
tramp-compat-delete-file call.

Fix redisplay crash (Bug#6177).

* xdisp.c (redisplay_window): After redisplay, check if point is
still valid before setting it (Bug#6177).

Let htmlfontify recognize face aliases (Bug#6279).

* progmodes/verilog-mode.el (verilog-type-font-keywords): Use
font-lock-constant-face, not obsolete font-lock-reference-face.

* htmlfontify.el (hfy-face-resolve-face): New function.
(hfy-face-to-style): Use it (Bug#6279).

merge trunk

* etc/PROBLEMS: Remove some more old information.

* etc/PROBLEMS: Remove old information no longer of relevance.

Do not preprocess src/Makefile.in.

* configure.in: Do not preprocess src/Makefile.in.
(cpp_undefs, CPP_NEED_TRADITIONAL): Remove.
(AC_EGREP_CPP): Test no longer needed.
* configure: Regenerate.

* config.bat: Do not preprocess src/Makefile.in.

* make-dist: No more Makefile.c files.

* INSTALL, src/README: Makefiles are not preprocessed.

* src/Makefile.in, src/autodeps.mk, src/deps.mk, src/ns.mk:
Convert comments to Makefile format.

* lib-src/Makefile.in (distclean): No more Makefile.c.
* src/Makefile.in (bootstrap-clean): No more Makefile.c.

* admin/notes/cpp: Remove file.

* admin/quick-install-emacs (AVOID): No more Makefile.c files.

* etc/PROBLEMS, etc/MACHINES: Remove details of cpp problems which can
no longer occur.

Provide hooks to use a different tokenizer in SMIE.
* lisp/emacs-lisp/smie.el (smie-forward-token-function)
(smie-backward-token-function): New vars.
(smie-backward-sexp, smie-forward-sexp)
(smie-indent-hanging-p, smie-indent-calculate): Use them.
(smie-default-backward-token): Rename from smie-backward-token and
skip comments.
(smie-default-forward-token): Rename from smie-forward-token and
skip comments.
(smie-next-sexp): Handle nil results from next-token.
(smie-indent-calculate): Add a new case for special `fixindent' comments.

language/hebrew.el (hebrew-shape-gstring): Check if a glyph element of GSTRING is nil.

Avoid (expand-file-name ".").
* org.el (org-file-complete-link):
* progmodes/ada-xref.el (ada-gnat-parse-gpr):
* emulation/edt.el (edt-load-keys): Avoid (expand-file-name ".").

* eshell.texi (Built-ins): Describe, how to disable a built-in command
by an alias.

* configure.in: Comments.

Replace YMF_PASS_LDFLAGS with autoconf.

* configure.in (YMF_PASS_LDFLAGS): Remove.
(PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables.
* configure: Regenerate.

* src/Makefile.in (YMF_PASS_LDFLAGS): Remove.
(temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS.

* msdos/sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing.

* lisp/emulation/edt.el (edt-load-keys): Use locate-library.
This simplifies the code, and handles compressed .el.gz files, which
the previous version did not.

* configure, configure.in: Fix typo in previous.

Regenerate configure.

Add GNUSTEP_LOCAL_HEADERS/LIBRARIES to build flags.
* configure.in (CPPFLAGS, CFLAGS, REAL_CFLAGS):
Add $GNUSTEP_LOCAL_HEADERS.
(LDFLAGS, LD_SWITCH_SYSTEM_TEMACS): Add $GNUSTEP_LOCAL_LIBRARIES.

Remove some NS_IMPL_GNUSTEP build dead code.

* configure.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS)
(GNUSTEP_MAKEFILES): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Move NS_IMPL_GNUSTEP_TEMACS_LDFLAGS
stuff to here.

* src/Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
Remove.
(TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.

* msdos/sed1v2.inp (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
No longer present.

Comments:
See http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00846.html.
Nothing from gui.make was used at all in src/Makefile.in.  The only
thing used from base.make was $CONFIG_SYSTEM_LIBS, but because we only
set shared _after_ sourcing base.make, it was always empty.  We can
move the remaining flags, set in configure, to the standard variable
LD_SWITCH_SYSTEM_TEMACS.

* src/Makefile.in: Fix comment typo.

Fix for finding a static composition.

Rename relative filenames in ChangeLog entries according to root.

* lisp/log-edit.el (log-edit-strip-single-file-name): Default to nil.
(log-edit-changelog-entries): Doc fix.
(log-edit-changelog-insert-entries): Args changed.  Rename
relative filenames in ChangeLog entries.  Delete tabs.
(log-edit-insert-changelog-entries): Reorganize return value of
`log-edit-changelog-entries' to pass filenames to
log-edit-changelog-insert-entries.

lisp/ChangeLog: Fix typos.

* dired.el (dired-mode-map): Rebind "\C-t\C-t" from
`image-dired-dired-insert-marked-thumbs' to
`image-dired-dired-toggle-marked-thumbs'.

* image-dired.el: Require cl when compiling.
(image-dired-dired-toggle-marked-thumbs): Rename from
`image-dired-dired-insert-marked-thumbs'.  Add ARG.  Doc fix.
Use interactive spec "P".  Set LOCALP arg of `dired-get-filename'
to 'no-dir.  Skip files whose names don't match
`image-file-name-regexp'.  When file has a thumbnail overlay,
delete it.  (Bug#5270)

* image-mode.el (image-mode): Add image-after-revert-hook to after-revert-hook.
(image-after-revert-hook): New function.  (Bug#5669)

* image.el (image-animated-p): When delay between animated images is 0,
set it to 10 (0.1 sec).  (Bug#6258)

* net/tramp.el (tramp-handle-insert-directory): Don't use
`forward-word', it's default syntax could be changed.

* net/tramp.el (tramp-progress-reporter-update): New defun.
(with-progress-reporter): Use it.
(tramp-process-actions):
* net/tramp-gvfs.el (tramp-gvfs-handler-askquestion): Preserve
current message, in order to let progress reporter continue
afterwards.  (Bug#6257)

Relocate NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.

* src/Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
Move before TEMACS_LDFLAGS.
(TEMACS_LDFLAGS): Use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
(temacs${EXEEXT}): Do not use $NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.

Do not include config.h in src/Makefile.in.
* src/Makefile.in (NOT_C_CODE): No longer define.
(config.h): No longer include.

Regenerate configure.

Move some stuff from LD_SWITCH_SYSTEM to LD_SWITCH_SYSTEM_TEMACS.

* configure.in (LD_SWITCH_SYSTEM): Move some gnu-linux stuff...
(LD_SWITCH_SYSTEM_TEMACS): ... to here.

* src/Makefile.in (LD_SWITCH_SYSTEM_TEMACS): Move definition after some
variables it may reference.

Remove LD_SWITCH_SYSTEM_EXTRA.

* configure.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(LD_SWITCH_SYSTEM_TEMACS): Put darwin stuff from LD_SWITCH_SYSTEM_EXTRA
here instead.

* src/Makefile.in (LD_SWITCH_SYSTEM_EXTRA): Remove.
(TEMACS_LDFLAGS): Remove LD_SWITCH_SYSTEM_EXTRA.

* msdos/sed1v2.inp (LD_SWITCH_SYSTEM_EXTRA): No longer present.

* net/rcirc.el (rcirc-default-user-name, rcirc-default-full-name): Add :version.

rcirc update.
* lisp/net/rcirc.el (rcirc-server-alist): Add :pass.
(rcirc-default-user-name): Change to "user".
(rcirc-default-full-name): Change to "unknown".
(rcirc-user-name-history): Add variable.
(rcirc): When prompting for connection paramaters, also prompt for
username and password.
(rcirc-connect): Take a PASS argument. If PASS is non-nil, send
value to server when connecting.

* emacs-lisp/smie.el (smie-set-prec2tab): Check override before use.
(smie-merge-prec2s): Pass the tables as separate args.
(smie-bnf-precedence-table): Adjust call accordingly.
(smie-prec2-levels): Set levels at the end.

Replace Lisp calls to delete-backward-char by delete-char.
* bs.el, expand.el, ido.el, image-dired.el, lpr.el, pcomplete.el,
skeleton.el, term.el, time.el, wid-edit.el, woman.el,
calc/calc-graph.el, calc/calc-help.el, calc/calc-incom.el,
calc/calc.el, emacs-cl-extra.el, emacs-cl-loaddefs.el,
emulation/cua-rect.el, emulation/viper-ex.el, eshell/esh-test.el,
eshell/eshell.el, gnus/gnus-uu.el, gnus/nndoc.el, gnus/nnrss.el,
gnus/rfc2047.el, gnus/utf7.el, international/utf-7.el,
language/ethio-util.el, mh-e/mh-alias.el, mh-e/mh-search.el,
net/imap.el, net/rcirc.el, obsolete/complete.el, play/decipher.el,
progmodes/ada-mode.el, progmodes/cc-awk.el, progmodes/dcl-mode.el,
progmodes/ps-mode.el, progmodes/verilog-mode.el,
progmodes/vhdl-mode.el, textmodes/bibtex.el, textmodes/fill.el,
textmodes/reftex-auc.el, textmodes/rst.el, textmodes/sgml-mode.el,
textmodes/table.el, textmodes/texinfmt.el: Replace Lisp calls to
delete-backward-char by calls to delete-char.

Add Hebrew shaper.

merge trunk

Merge from emacs-23

merge trunk

Fix bidi-composition interaction in backward scanning..

* emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Add delete-backward-char.

Mention multi-planes text-properties

* process.c (Fmake_network_process): Set :host to nil if it's not used.
Suggested by Masatake YAMATO <yamato@redhat.com>.

Adapt make-dist to new version location.

* make-dist: Look for version in src/emacs.c.
Use lisp/subr.el rather than lisp/version.el for location check.

* dispextern.h: Fix typo in previous change.

dispextern.h (init_iterator): Sync prototype with changed definition.

Redesign bidi-aware edge positions of glyph rows, fix bug #6036.

 dispextern.h (struct glyph_row): New members minpos and maxpos.
 (MATRIX_ROW_START_CHARPOS, MATRIX_ROW_START_BYTEPOS)
 (MATRIX_ROW_END_CHARPOS, MATRIX_ROW_END_BYTEPOS): Reference minpos
 and maxpos members instead of start.pos and end.pos, respectively.
 xdisp.c (display_line): Compare IT_CHARPOS with the position in
 row->start.pos, rather than with MATRIX_ROW_START_CHARPOS.
 (cursor_row_p): Use row->end.pos rather than MATRIX_ROW_END_CHARPOS.
 (try_window_reusing_current_matrix, try_window_id): Use
 ROW->minpos rather than ROW->start.pos.
 (init_from_display_pos, init_iterator): Use EMACS_INT for
 character and byte positions.
 (find_row_edges): Renamed from find_row_end.  Accept additional
 arguments for minimum and maximum buffer positions seen by
 display_line for this row.  Don't use iterator to find the
 position following the maximum one; instead, increment the
 position found by display_line directly.  Fix logic; eol_pos
 should be tested before the rest.  Handle the case of characters
 delivered from display vector (bug#6036).  Fix tests related to
 it->method.  Handle the truncated_on_right_p rows.
 (RECORD_MAX_MIN_POS): New macro.
 (display_line): Use it to record the minimum and maximum buffer
 positions for glyphs in the row being assembled.  Record the
 position of the newline that terminates the line.  If word wrap is
 in effect, restore minimum and maximum positions seen up to the
 wrap point, when iterator returns to it.
 (try_window_reusing_current_matrix): Give up if in bidi-reordered
 row and cursor not already at point.  Restore original pre-bidi
 code for unidirectional buffers.
 dispnew.c (increment_row_positions, check_matrix_invariants):
 Increment and check row->start.pos and row->end.pos, in addition
 to MATRIX_ROW_START_CHARPOS and MATRIX_ROW_END_CHARPOS.
 .gdbinit (prowlims): Display row->minpos and row->maxpos.
 Display truncated_on_left_p and truncated_on_right_p flags.
 Formatting fixes.
 (pmtxrows): Display the ordinal number of each row.  Don't display
 rows beyond the last one.
 bidi.c (bidi_cache_iterator_state): Don't zero out new_paragraph:
 it is not copied by bidi_copy_it.

Fix bug #6237.

 w32.c (sys_write): Break writes into chunks smaller than 32MB.

* admin/notes/bugtracker: More about recovering from moderation mistakes.

Add ChangeLog change missing in last checkin.

Rename image-refresh to image-flush.

* image.c (Fimage_flush): Rename from image-refresh.

* image.el (image-refresh): Define as an alias for image-flush.

* image-mode.el (image-toggle-display-image): Caller changed.

* display.texi (Image Cache): Update documentation about image
caching.

Handle lines truncated on right.

 xdisp.c (find_row_edges): Handle the truncated_on_right_p rows.

Test and debug find_row_edges on TTY display.

 xdisp.c (find_row_edges): Handle the case of characters
 delivered from display vector.  Fix tests related to it->method.

Remove cirsular dependency when using separate build dir (Bug #6246).

 * Makefile.in (STAMP_INST_SCRIPTS, STAMP_SCRIPS): New (Bug #6246).
 (all): Depend onSTAMP_INST_SCRIPTS, STAMP_SCRIPS (Bug #6246).
 (stamp-rcs2log, stamp-rcs-checkin, stamp-grep-changelog, stamp-vcdiff):
 New rules (Bug #6246).
 (clean): Remove stamp-* (Bug #6246).

Regenerate configure

* progmodes/grep.el (grep-read-files): Fix multi-pattern aliases.
Remove "all" from grep-files-aliases.  Split grep-files-aliases by
whitespace, call wildcard-to-regexp on substrings and concat them
with "\\|".  (Bug#6114)

Fix a bug which happens when doing (c-parse-state) in a CPP construct:
Exclude any "new" CPP construct from taking part in the scanning.

Improve image cache clearing logic (Bug#6230).

* xdisp.c (redisplay_internal): Clear caches even if redisplaying
just one window.

* image.c (Vimage_cache_eviction_delay): Decrease to 300.
(clear_image_cache): If the number of cached images is unusually
large, decrease the cache eviction delay.

* configure.in (MKDEPDIR): Parallel build tweak.
* src/Makefile.in: Comment.

* net/tramp.el (tramp-do-copy-or-rename-file)
(tramp-handle-file-local-copy, tramp-maybe-open-connection): Tune
`with-progress-reporter' messages.
(tramp-handle-vc-registered):
* net/tramp-fish.el (tramp-fish-handle-file-local-copy)
(tramp-fish-handle-insert-file-contents)
(tramp-fish-maybe-open-connection):
* net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* net/tramp-imap.el (tramp-imap-do-copy-or-rename-file)
(tramp-imap-handle-insert-file-contents)
(tramp-imap-handle-file-local-copy): Use `with-progress-reporter'.

Backport from trunk: close bug#6190.
* src/s/netbsd.h: If terminfo is found, use it in preference to termcap.

* add-log.el: Highlight all authors in multi-author ChangeLog entries.

* src/Makefile.in: Comment fix.

Revert previous change.
I misunderstood EXEEXT (I don't think it can be working though).

Minor Makefile fix.
* src/Makefile.in (temacs${EXEEXT}, prefix-args, mostlyclean):
prefix-args neither gets nor needs the $EXEEXT extension.

Derive Fortran modes from prog-mode.
* progmodes/fortran.el (fortran-mode):
* progmodes/f90.el (f90-mode): Derive from prog-mode.

* smerge-mode.el: Fix typos.

* src/Makefile.in: Fix comment format in cpp section.

Regenerate configure.

Handle some HAVE_NS Makefile conditionals with configure.

* configure.in (ns_frag): New output file.

* src/Makefile.in (${ns_appdir}, ${ns_appbindir}Emacs, ns-app):
Move these rules to ns.mk.
* ns.mk: New file.  Copyright years based on date of nextstep merge.

* msdos/sed1v2.inp(@ns_frag@): Edit to nothing.

Build simplifications for oldxmenu.

* configure.in (OLDXMENU): Set to "nothing" if !HAVE_X11 || USE_GTK.
(OLDXMENU_TARGET): Set to empty if USE_GTK.

* src/Makefile.in (../src/$(OLDXMENU), $(OLDXMENU)): Always define rules.

* msdos/sed1x.inp (OLDXMENU): Replace any initial value.
* msdos/sed1v2.inp (OLDXMENU): Edit to "nothing".

* msdos/mainmake.v2: Comment fix.

Handle CANNOT_DUMP (partially) with configure.

* configure.in (cannot_dump): New output variable.

* src/Makefile.in (CANNOT_DUMP): New, set by configure.
(emacs${EXEEXT}, bootstrap-emacs${EXEEXT}): Use $CANNOT_DUMP.

* msdos/sed1v2.inp (CANNOT_DUMP): Edit to no.

Minor loadup.el fix.
* lisp/loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer
having a relative path in src/Makefile.in.

* help-mode.el (help-make-xrefs): For Info node links turn
newlines into spaces.  Link node names with newlines are matched
by help-xref-info-regexp and buttonized, this change ensures they
can be followed successfully with RET.  (Bug#6206)

* gnus-start.el (gnus-level-unsubscribed): Doc fix.  (Bug#6206)

* fileio.c (Fdelete_file): Change interative spec to use
`read-file-name' like in `find-file-read-args' where the default
value is `default-directory' instead of `buffer-file-name'.
http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00533.html

* locate.el (locate): Use pop-to-buffer instead of
switch-to-buffer-other-window.  (Bug#6204)