* emacs.texi: Fix ISBN.
Sync Windows port with autogen/config.in changes.

* nt/config.nt: Sync with autogen/config.in.
(DEVICE_SEP, FLOAT_CHECK_DOMAIN, HAVE_INVERSE_HYPERBOLIC)
(INTERNAL_TERMINAL, IS_ANY_SEP, IS_DEVICE_SEP, IS_DIRECTORY_SEP):
New macros.

* src/s/ms-w32.h (DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP):
Remove; moved to nt/config.nt.
* configure.ac (DOS_NT, MSDOS): New system type templates.
Remove src/s/msdos.h

* msdos/sed2v2.inp (MSDOS, DOS_NT, FLOAT_CHECK_DOMAIN)
(HAVE_INVERSE_HYPERBOLIC, DEVICE_SEP, IS_DIRECTORY_SEP, IS_ANY_SEP)
(INTERNAL_TERMINAL, NULL_DEVICE, SEPCHAR, USER_FULL_NAME)
(_setjmp, _longjmp): Move here from src/s/msdos.h.
(config_opsysfile, config_machfile): Remove.
* msdos/sed1v2.inp (M_FILE, S_FILE): Remove.
* msdos/mainmake.v2 (TAGS tags): Remove src/s/msdos.h.

* src/s/msdos.h: Remove file.
* src/conf_post.h [MSDOS]: New section, moved from s/msdos.h.
* src/Makefile.in (S_FILE): Remove.
(config_h): Remove S_FILE.
* msdos/sed2v2.inp (HAVE_WCHAR_H): Fix typo.
Fix typo in previous
Alphabetical order
Alphabetic order is proving tricky today
calc-mode.el (calc-set-simplify-mode): Use `cond' instead of nested `if's.
Fix fallout from revision 109354 that introduced WVAR.

 src/xdisp.c (try_window_id): Use WVAR in IF_DEBUG code.
ChangeLog fix
Fix .gdbinit for latest INTERNAL_FIELD uses.

 src/.gdbinit (xcar, xcdr, xlist, xwindow, nextcons, xprintsym):
 Adapt to latest changes in field names of the corresponding Lisp
 objects.
Fix typo in src/ChangeLog.
More fixes in .gdbinit.
Update lib-src config.h dependencies

* lib-src/Makefile.in (config_h): New variable.
Use throughout in place of ../src/config.h.
* lwlib/Makefile.in (config_h): Add conf_post.h.
calc.texi (Simplification modes): Mention "basic" simplification.
(The Calc Mode Line): Mention the mode line display for Basic
simplification mode.
(Simplify Formulas): Refer to 'algebraic' rather than 'default'
simplifications.
(Basic Simplifications): Rename from "Limited Simplifications"
Replace "limited" by "basic" throughout.
(Algebraic Simplifications):  Indicate that the algebraic
simplifications are done by default.
(Unsafe Simplifications):  Mention `m E'.
(Simplification of Units): Mention `m U'.
(Trigonometric/Hyperbolic Functions, Reducing and Mapping,
Kinds of Declarations, Functions for Declarations):  Mention
"algebraic simplifications" instead of `a s'. 
* nsterm.m (ns_set_vertical_scroll_bar, ns_redeem_scroll_bar)
  (EmacsWindow-accessibilityAttributeValue, EmacsScroller-initFrame:)
  (EmacsScroller-dealloc):  Adjust to use WVAR.  (Bug#12114)
* nsfns.m (ns_set_name_as_filename): Likewise.
* nsmenu.m (ns_update_menubar): Likewise.
* nsselect.m (symbol_to_nsstring): Adjust to use SVAR.
Use "ASET (a, i, v)" rather than "AREF (a, i) = v".

This how ASET and AREF are supposed to work, and makes
it easier to think about future improvements.  See
<http://lists.gnu.org/archive/html/emacs-devel/2012-08/msg00026.html>.
* charset.h (set_charset_attr): New function.
All lvalue-style uses of CHARSET_DECODER etc. changed to use it.
* lisp.h (ASET): Rewrite so as not to use AREF in an lvalue style.
(aref_addr): New function.  All uses of &AREF(...) changed.
(set_hash_key, set_hash_value, set_hash_next, set_hash_hash)
(set_hash_index): New functions.  All lvalue-style uses of
HASH_KEY etc. changed.
* keyboard.c (set_prop): New function.  All lvalue-style uses
of PROP changed.
calc.texi (Simplification modes, Conversions)
(Operating on Selections, Basic Simplifications)
(Algebraic Simplifications):  Mention "basic" simplifications.
(Algebraic Entry): Remove mention of default simplifications.