(calendar-mode-map): Update for name change.

(calendar-lunar-phases): Rename from calendar-phases-of-moon.  Keep
old name as alias, update callers.
(lunar-phases): Rename from phases-of-moon.  Keep old name as alias.
(diary-lunar-phases): Rename from diary-phases-of-moon.  Keep old name as alias.

Remove unneeded -Defines in the compiler command line (MinGW and MSVC).

* nt/nmake.defs:
* nt/gmake.defs (FONT_CFLAGS): Remove.
(EMACS_EXTRA_C_FLAGS): Don't include FONT_CFLAGS.
(CFLAGS): Don't include WIN32_LEAN_AND_MEAN, _WIN32_WINNT, -D$(ARCH)
and _CRTAPI1.
(ARCH_FLAGS): Don't include _X86_.

* nt/config.nt (_WIN32_WINNT, WIN32_LEAN_AND_MEAN): Define.

* src/makefile.w32-in (LOCAL_FLAGS):
Don't include WINDOWSNT, DOS_NT and _UCHAR_T.

* src/sysdep.c (_spawnlp, _getpid):
Declare with explicit _cdecl instead of _CRTAPI1.

* src/editfns.c (Fget_internal_run_time):
Check for WINDOWSNT with #ifdef, not #if.

(solar-sunrises-buffer): New constant.
(calendar-mode-map): Use cal-menu-sunmoon-menu.
(calendar-buffer-list): Add solar-sunrises-buffer.

(cal-menu-sunmoon-menu): Rename from cal-menu-moon-menu.  Add
calendar-sunrise-sunset-month.
(cal-menu-global-mouse-menu): Add calendar-sunrise-sunset-month.

(cal-menu-goto-menu): Tweak menu name.

(solar-sunrise-sunset-string): Add optional argument `nolocation'.
(calendar-sunrise-sunset-month): New function.

* w32font.h (FONT_HANDLE, FONT_TEXTMETRIC): New macros.

* w32term.c (x_draw_glyph_string_foreground):
(x_draw_composite_glyph_string_foreground): Sync with xterm.c.
Use FONT_HANDLE macro.
(x_draw_glyph_string): Use FONT_TEXTMETRIC macro.

* w32uniscribe.c (uniscribe_otf_capability, uniscribe_shape):
(uniscribe_encode_char): Use FONT_HANDLE macro.

* w32font.c (Fx_select_font): Use FONT_HANDLE macro.
(w32font_text_extents): Use precast w32_font.
(w32font_close): Free cached metrics.
(w32font_open_internal): Allocate space for name on stack.

(extend_face_to_end_of_line): Fix last change.

* xdisp.c (extend_face_to_end_of_line): Fix last change.

Documented shift-select-mode.

Chcked mark.texi

(Shift selection): New node.
(Mark): Copyedits.
(Persistent Mark): Move to the end of the chapter.

* mark.texi (Shift selection): New node.
(Mark): Copyedits.
(Persistent Mark): Move to the end of the chapter.

Add customization types for word-wrap and shift-select-mode.

* cus-start.el: Add customization types for word-wrap and
shift-select-mode.

Add manual checking list.

Rearrange items, and delete some duplicates.

(FONT_AVG_WIDTH): Remove obsolete macro.
(CP_8BIT, CP_UNICODE, CP_UNKNOWN): Remove obsolete constants.

(ibuffer-diff-buffer-with-file-1): New function.
(ibuffer-diff-with-file): Use it.  Do diff on marked buffers
(ibuffer-mark-on-buffer): Don't display message when removing marks.
(ibuffer-mark-by-mode): Use `buffer-local-value'.

* src/Makefile.in (SOME_MACHINE_OBJECTS): Remove w32bdf.o.
* lib-src/makefile.w32-in (obj): Remove w32bdf.o.

* w32bdf.c, w32bdf.h: Remove obsolete files.

* makefile.w32-in: Remove refs to w32bdf.h and w32bdf.c.

* w32gui.h: Don't include w32bdf.h.
(XCharStruct, enum w32_char_font_type, W32FontStruct):
Remove obsolete font support.

* w32font.h (struct w32font_info): Remove compat_w32_font.
Add hfont member.
(FONT_COMPAT): Remove obsolete macro.

* w32font.c (w32font_close): Remove compat code. Delete hfont member.
(w32font_encode_char, w32font_text_extents): Use new hfont member.
(w32font_open_internal): Remove compat code. Set new hfont member.
(Fx_select_font): Use new hfont member.

* w32uniscribe.c (uniscribe_otf_capability, uniscribe_shape):
(uniscribe_encode_char): Use new hfont member.

* w32term.c (x_draw_glyph_string_foreground):
(x_draw_composite_glyph_string_foreground): Use new hfont member.
(x_draw_glyph_string): Use metrics in w32font_info.

Fix typo.

(encode-coding-char): Fix for ASCII characters.

(terminal-composition-function): Fix previous change.

(handle_auto_composed_prop): Fix for the terminal case.

(bookmark-make-record-default): Fix declaration.

(calendar-check-holidays): Declare rather than autoloading.
(diary-show-holidays-flag): Remove unneeded declaration.

(calendar-cursor-to-date): Handle case where event-start is nil.

(cal-menu-moon-menu): Add sunrise/sunset.

(calendar-intermonth-header, calendar-intermonth-text): Move earlier in file.
(calendar-print-other-dates): Store result of calendar-other-dates.

Remove unused defines.

*** empty log message ***

* vc-dir.el (tool-bar): Require.

* vc.el (ewoc, tool-bar): Do no require.

Comment fixes.

(cal-menu-context-mouse-menu): Add some :keys.

(calendar-cursor-holidays): Handle mouse events.

(calendar-mouse-holidays): Remove function.
(cal-menu-context-mouse-menu): Use calendar-cursor-holidays.

* unexnext.c:
* m/ews4800.h:
* m/hp9000s300.h:
* m/ibm370aix.h:
* m/mips-siemens.h:
* m/ncr386.h:
* m/next.h:
* m/pmax.h:
* m/powerpcle.h:
* m/tandem-s2.h:
* s/386bsd.h:
* s/bsd386.h:
* s/bsd4-1.h:
* s/bsd4-2.h:
* s/bsdos2-1.h:
* s/bsdos2.h:
* s/bsdos3.h:
* s/bsdos4.h:
* s/nextstep.h:
* s/ultrix4-3.h:
* s/usg5-0.h:
* s/usg5-2-2.h:
* s/usg5-2.h:
* s/usg5-4-3.h:
* s/ux4800.h:
* s/uxpds.h:
* s/uxpv.h: Remove support for obsolete systems.
* s/hpux.h, s/hpux10.h, s/hpux8.h, s/hpux9.h, s/hpux9shr.h:
Remove, insert contents in s/hpux-10.20.h
* s/aix3-1.h, s/aix3-2-5.h, s/aix3-2.h, s/aix4-1.h, s/aix4.h:
Remove, insert contents in s/aix-4.2.h
* s/usg5-3.h: Remove, insert contents in s/usg5-4.h.
* s/bsd4-3.h: Rename to ..
* s/bsd-common.h: ... this.
* src/data.c:
* src/doc.c:
* src/ecrt0.c:
* src/emacs.c:
* src/fileio.c:
* src/floatfns.c:
* src/keyboard.c:
* src/mem-limits.h:
* src/print.c:
* src/process.c:
* src/sysdep.c:
* src/syssignal.h:
* src/systty.h:
* src/syswait.h:
* src/term.c:
* src/unexec.c:
* src/unexelf.c:
* src/unexhp9k800.c:
* src/m/hp800.h:
* src/m/ibmrs6000.h:
* src/m/mips.h:
* src/m/vax.h:
* src/s/darwin.h:
* src/s/freebsd.h:
* src/s/gnu.h:
* src/s/ms-w32.h:
* src/s/msdos.h:
* src/s/netbsd.h:
* src/s/template.h: Remove references to obsolete variables.

* Makefile.in: Add dependencies for all unexec files.
(admindir): Remove unused variable.
(UNEXEC_SRC): Remove references.

* config.nt: Remove reference to UNEXEC_SRC.

* lwlib.c: Remove references to obsolete variables.

* fakemail.c: Remove references to obsolete variables.

* os.texi: Remove references to obsolete systems.

* configure.in:
* configure: Remove references to obsolete systems.

(terminal-composition-base-character-p): New
funciton.
(terminal-composition-function): Use
terminal-composition-base-character-p.  Include the base character
in the composition.
(auto-compose-chars): Don't check font-object for terminal
display.

(calendar-iso-from-absolute): Add autoload cookie.

(cal-menu-moon-menu, cal-menu-diary-menu, cal-menu-holidays-menu)
(cal-menu-goto-menu, cal-menu-scroll-menu): Add doc strings.

(calendar-mouse-print-dates): Remove function.
(cal-menu-context-mouse-menu): Use calendar-print-other-dates.

(calendar-cursor-to-nearest-date): Use calendar-column-to-segment,
calendar-month-edges, and the 'date property to handle intermonth text.

(calendar-date-echo-text): Doc fix.  Add default :value for sexp type.
(calendar-month-edges): New variable.
(calendar-month-edges): New function.
(calendar-recompute-layout-variables): Set calendar-month-edges.
(calendar-intermonth-header, calendar-intermonth-text): New options.
(calendar-insert-at-column): New function.
(calendar-generate-month): Use calendar-insert-at-column.
Handle intermonth text.  Add 'date property.
(calendar-column-to-month): Remove function.
(calendar-column-to-segment): New function.
(calendar-cursor-to-date): Use calendar-column-to-segment. Check 'date property.

(calendar-print-other-dates): Handle mouse events.

(completion-basic-try-completion): Use the text after
point to consrain the completion candidates.
(completion-basic-all-completions): Adjust accordingly.

(tex-verbatim): Use monospace instead of courier.

(set-face-attribute): Doc fix.

* textmodes/tex-mode.el (tex-verbatim): Use monospace instead of
courier.

* faces.el (set-face-attribute): Doc fix.

Fix last change, using "monospace" rather than "Monospace".

(x_default_font_parameter): If Xft is available, first try
Monospace-12 for the default font.

* xfns.c (x_default_font_parameter): If Xft is available, first
try Monospace-12 for the default font.

(get_glyph_face_and_encoding): Encode invalid glyphs as 0.

(Fbyte_code): Disable debugging code that doesn't compile.

(syms_of_buffer): Remove default-word-wrap.

Add global bindings `M-s o' for `occur', `M-s h r' for `highlight-regexp',
and isearch binding `M-s h r' for `isearch-highlight-regexp'.

(isearch-mode-map): Bind `M-s h r' to `isearch-highlight-regexp'.
(isearch-highlight-regexp): New function.

(goto-map): New variable.  Rebind goto-related
commands to this `M-g' prefix keymap.
(search-map): New variable for `M-s' prefix keymap.
Bind `M-s o' to `occur', `M-shr' to `highlight-regexp', `M-shp' to
`highlight-phrase', `M-shl' to `highlight-lines-matching-regexp',
`M-shu' to `unhighlight-regexp', `M-shf' to `hi-lock-find-patterns',
`M-shw' to `hi-lock-write-interactive-patterns'.

* bookmark.el (bookmark-alist): Allow the 2 slightly different formats
used until now in bookmark.el's code.
(bookmark-get-bookmark): Accept bookmark names or bookmark records.
(bookmark-get-bookmark-record): Allow the 2 slightly different formats
used until now in bookmark.el's code.
(bookmark-set-filename): Remove special code, moved to its only caller.
(bookmark-store): Use the newer format.
(bookmark-make-record-default): Add arg `point-only'.
Rename from bookmark-make-record-for-text-file.
(bookmark--jump-via): New function.
(bookmark-jump, bookmark-jump-other-window, bookmark-bmenu-2-window)
(bookmark-bmenu-other-window, bookmark-bmenu-switch-other-window):
Use it.
(bookmark-jump-noselect, bookmark-default-handler):
Don't return an alist, instead return the data implicitly by changing
current buffer and point.  Signal an error if the file doesn't exist.
* info.el (Info-bookmark-make-record):
Use bookmark-make-record-default.
(Info-bookmark-jump): Use bookmark-default-handler.
* image-mode.el (image-bookmark-make-record):
Use bookmark-make-record-default.
(image-bookmark-jump): Use bookmark-default-handler.
* doc-view.el (doc-view-bookmark-make-record):
Use bookmark-make-record-default.
(doc-view-bookmark-jump): Use bookmark-default-handler.

* Makefile.in (Makefile): Use it for its timestamp value as well, and
make it depend on all other */.in files.
(src/Makefile, src/config.stamp, lib-src/Makefile)
(doc/emacs/Makefile, doc/misc/Makefile, doc/lispref/Makefile)
(doc/lispintro/Makefile, oldXMenu/Makefile, lwlib/Makefile)
(leim/Makefile, lisp/Makefile): Remove those overlapping targets.
(leim, ${SUBDIR}, blessmail): Only depend on Makefile now.
* configure.in: Don't create src/config.stamp any more.

Paren typo.

* buff-menu.el: Use with-current-buffer and inhibit-read-only.
(Buffer-menu-toggle-read-only): Avoid vc-toggle-read-only.
* bs.el: Use with-current-buffer.  Simplify.
(bs-toggle-readonly): Avoid vc-toggle-read-only.

* mm-util.el (mm-with-multibyte, mm-with-unibyte): Remove.
* nnkiboze.el (nnkiboze-generate-group):
Use explicit mm-disable-multibyte rather than mm-with-unibyte.

(eshell-manipulate): Check eshell-debug-command is bound before using it.

Require CL.

Fix typos.

(Fstring_to_unibyte): Fix the previous change.

* xdisp.c (syms_of_xdisp) <truncate-partial-width-windows>: Doc fix.
 <scroll-conservatively>: Fix typo in docstring.

* xselect.c (Fx_send_client_event): Doc fix.

Comment typo.

Remove witness-emacs.

Fix usage typo.

Revert re-ordering and removal of .DS_Store that occurred in unicode merge.

rst-mode got installed.

(Fx_list_fonts): Call Flist_fonts with the arg PREFER.

(font_parse_fcname): Remove unused variables.
(font_sort_entites): Delete the arg SPEC.  Caller changed.  Fix
for the case of ! best_only.
(font_delete_unmatched): Check DPI and AVGWIDTH too.

*** empty log message ***

* vc-hg.el:
* vc-git.el: Require vc-dir when compiling.

*** empty log message ***

(vc-annotate-parent-rev): Pacify byte compiler.
(vc-svn-parse-status): Do not set the vc-backend property.

* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
vc-dir-marked-only-files.  Change the return value.
(vc-dir-child-files-and-states): Rename from vc-dir-child-files.
Change the return value.
(vc-dir-deduce-fileset): New function broken out from ...
* vc.el (vc-deduce-fileset): ... here and ...
(vc-deduce-fileset): ... here.

(Fstring_to_unibyte): Fix typo in docstring.

Mention string-to-unibyte.

(image-jpeg-p): Convert DATA to unibyte at first.

(vc-annotate-parent-rev): Pacify byte compiler.

(Fstring_to_unibyte): EXFUN it.

(str_to_unibyte): Extern it.

(str_to_unibyte): New function.

(Fstring_to_unibyte): New function.
(syms_of_fns): Defsubr it.

(face-font-family-alternatives, variable-pitch): Use
"Sans Serif", not "Sans-Serif".

*** empty log message ***

Fix thinko.

(bootstrap-clean): Do what distclean does but don't remove
Makefile.
(distclean): Depend on bootstrap-clean and remove Makefile.

(${lispsource}/loaddefs.el): Renamed from
../lisp/loaddefs.el.

Document truncate-partial-width-windows change.

(face-font-family-alternatives, variable-pitch): Change "Sans" to the
canonical name "Sans-Serif".

* faces.el (face-font-family-alternatives, variable-pitch): Change
"Sans" to the canonical name "Sans-Serif".

Document `word-wrap'.

(Vtruncate_partial_width_windows): New Lisp_Object, replacing
truncate_partial_width_windows.
(init_iterator): If Vtruncate_partial_width_windows is an integer,
truncate only if the window width is below that integer.
(start_display. resize_mini_window, produce_stretch_glyph)
(display_string, move_it_in_display_line_to): Use line_wrap.
(back_to_previous_visible_line_start, reseat_1): Reset
string_from_display_prop_p.
(display_line): Extend default face to end of line when wrapping.
(display_line, move_it_in_display_line_to): Add ability
to wrap continued lines at word boundaries.

(compute_motion): Obey integer values of truncate-partial-width-windows.

(direct_output_for_insert): Avoid direct output when inserting a space
with word wrap on.

Replace truncate_partial_width_windows with
Vtruncate_partial_width_windows.

(struct it): Replace bool truncate_lines_p with a line_wrap enum
possessing three possible values.