GitLab

* leim/makefile.w32-in (RUN_EMACS):
* leim/Makefile.in (RUN-EMACS): -batch implies --no-init-file.

* lisp/makefile.w32-in (EMACSOPT): -batch implies --no-init-file.

* src/makefile.w32-in ($(EMACS)):
* src/Makefile.in (emacs$(EXEEXT)): -batch implies -q.

* makefile.w32-in (TLIB2): Rename from TLIBW32.
  (OBJ2): New macro.
  (WIN32OBJ, FONTOBJ): Remove.
  (OBJ1): Redistribute object files with OBJ2.
  (LIBS, $(TEMACS)): Use TLIB2.
  (make-buildobj-CMD, make-buildobj-SH): Use OBJ2.
  ($(TLIB2), TAGS, TAGS-LISP, TAGS-gmake): Depend on OBJ2.

* lib-src/makefile.w32-in (tags): Remove target.
* src/makefile.w32-in (tags): Rename target to full-tags.

 nt/makefile.w32-in (frc, TAGS, TAGS-gmake, TAGS-nmake): New targets.
 emacs-src.tags: New file.
 src/makefile.w32-in (TAGS, frc, TAGS-LISP, ../nt/TAGS, tags)
 (TAGS-gmake, TAGS-nmake, TAGS-LISP-gmake, TAGS-LISP-nmake)
 (nt-TAGS-gmake, nt-TAGS-nmake): New targets.
 lisp/makefile.w32-in (DEST, TAGS, TAGS-LISP, TAGS-nmake)
 (TAGS-LISP-nmake, TAGS-gmake, TAGS-LISP-gmake, TAGS-SH)
 (TAGS-LISP-SH, TAGS-CMD, TAGS-LISP-CMD): New targets.
 lib-src/makefile.w32-in (tags, TAGS): New targets.

 sysselect.h [WINDOWSNT]: Don't define the FD_* and select stuff for w32.
 s/ms-w32.h (HAVE_SYS_TIMEB_H): Don't #undef HAVE_SYS_SELECT_H, it's done
 in nt/config.nt.
 makefile.w32-in ($(BLD)/sysdep.$(O)): Depend on sysselect.h.

 admin/unidata/bidimirror.awk: New file.
 admin/unidata/BidiMirroring.txt: New file from
 http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring-6.0.0d1.txt.
 admin/unidata/Makefile.in: (../../src/bidimirror.h): New target.
 (all): Depend on ../../src/biditype.h and ../../src/bidimirror.h.
 admin/unidata/makefile.w32-in (../../src/bidimirror.h): New target.
 (all): Depend on ../../src/biditype.h and ../../src/bidimirror.h.
 src/makefile.w32-in ($(BLD)/bidi.$(O)): Depend on biditype.h and
 bidimirror.h.
 src/deps.mk (bidi.o): Depend on biditype.h and bidimirror.h.
 src/bidi.c (bidi_initialize): Initialize bidi_mirror_table.
 (bidi_mirror_char): Use bidi_mirror_table.

 makefile.w32-in ($(BLD)/w32fns.$(O)): Depend on $(SRC)/w32.h.
 w32fns.c: Include w32.h.
 (Fw32_shell_execute): Decode the error message before passing it
 to `error'.

* makefile.w32-in (OBJ1): Remove cm.$(O) and termcap.$(O).
  ($(BLD)/cm.$(O), $(BLD)/termcap.$(O)): Remove.
* w32console.c (current_tty, cost): New vars; lifted from cm.c.
  (evalcost, cmputc, cmcheckmagic, cmcostinit, cmgoto, Wcm_clear)
  (sys_tputs, sys_tgetstr): New stubs.
* s/ms-w32.h (chcheckmagic, cmcostinit, cmgoto, cmputc, Wcm_clear)
  (tputs, tgetstr): New; define to sys_*.

 doc/emacs/mule.texi (International): Mention support of
 bidirectional editing.
 (Bidirectional Editing): New section.
 etc/HELLO: Reorder Arabic and Hebrew into logical order, and
 insert RLM before the opening paren, to make the display more
 reasonable.  Add setting for bidi-display-reordering in the local
 variables section.
 lisp/files.el: Make bidi-display-reordering safe variable for
 boolean values.
 src/xdisp (append_glyph): If the glyph row is reversed, prepend the
 glyph rather than appending it.
 src/makefile.w32-in (OBJ1): Add $(BLD)/bidi.$(O).
 ($(BLD)/bidi.$(O)): New target.

(make-buildobj-CMD, make-buildobj-SH): Create buildobj.h, not
$(SRC)/buildobj.h.
($(BLD)/doc.$(O)): Depend on buildobj.h, not on $(SRC)/buildobj.h.

($(SRC)/buildobj.h, make-buildobj-CMD, make-buildobj-SH): Fix last change.

(doc.o): Depend on it.
(temacs${EXEEXT}): Don't generate buildobj.lst.
(mostlyclean): Delete buildobj.h, not buildobj.lst.
* makefile.w32-in ($(SRC)/buildobj.h): New target.
($(BLD)/doc.$(O)): Depend on it.
(make-buildobj-CMD, make-buildobj-SH): New targets.  (Syntax help
provided by Eli Zaretskii.)
($(TEMACS)): Don't generate buildobj.lst.
* doc.c: Include buildobj.h.
(buildobj): New static variable.
(Fsnarf_documentation): Use it, instead of opening and reading
buildobj.lst.

  (CONFIG_H): Add $(EMACS_ROOT)/nt/inc/sys/time.h.

  It was accidentally restored by the Unicode merge.

* 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.

* 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.

(OBJ1): Include it.

(maintainer-clean): New target.

dependencies.
(w32uniscribe.$(O)): New file to build.
(FONT_OBJ): Include w32uniscribe.$(O).
(LIBS): Add uniscribe libraries.

* makefile.w32-in (w32term.o): Don't depend on gnu.h

* gnu.h: Rename to ...
* emacs-icon.h: ... this.
* xterm.c: Use emacs-icon.h instead of gnu.h.
* Makefile (xterm.o): Depend on emacs-icon.h, not gnu.h.

(FONTOBJ) [USE_FONTBACKEND]: Instead of here.