Merge cygw32

diff --cc etc/NEWS
index e43775b47dda39ac64299fd70f4f4e66a1c4bd56,ef7ef0c3d380ef0b34833f07bdfc4540d488f6df..81a84e0445b92933761faa8cd82767abe4209767
--- 1/etc/NEWS
--- 2/etc/NEWS
+++ b/etc/NEWS
@@@ -78,6 -60,23 +78,11 @@@ directories to the search path.  You mu
  (from the bin and libexec directories, respectively).  The former is
  no longer relevant, the latter is replaced by lisp (in vc-sccs.el).
  
 -** The configuration option '--enable-use-lisp-union-type' has been
 -renamed to '--enable-check-lisp-object-type', as the resulting
 -Lisp_Object type no longer uses a union to implement the compile time
 -check that this option enables.
 -
+ ---
 -** The default toolkit has been changed to Gtk+ version 3.
 -If you don't pass --with-x-toolkit to configure or if you pass
 ---with-x-toolkit=gtk or --with-x-toolkit=yes, configure will try to build
 -with Gtk+ version 3, and if that fails, try Gtk+ version 2.
 -You can explicitly require a specific version by passing
 ---with-x-toolkit=gtk2 or --with-x-toolkit=gtk3 to configure.
 ---
+ ** The native Windows user interface is available for Cygwin.  Passing
+ --with-w32 will configure a Cygwin emacs to use the Windows user
+ interface instead of the default, X11.
+ 
  \f
  * Startup Changes in Emacs 24.3
  

diff --cc lisp/ChangeLog
index 036205885ff3d8a3fe9705124fbb1b25856a7f69,a4a1d0eeb2bd40141d4a4bd69562809aa656620d..97d24ebf4d6f1b9e1f29bf62a856a8ee7458a8ea
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,35 -1,70 +1,102 @@@
 +2012-10-08  Glenn Morris  <rgm@gnu.org>
 +
 +      * cus-start.el (message-log-max): Set :version.
 +
 +      * calendar/calendar.el (calendar-intermonth-header): Doc fix.
 +
 +2012-10-08  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * emacs-lisp/edebug.el (edebug-pop-to-buffer): Don't try to split
 +      the minibuffer window (Bug#10851).
 +
 +2012-10-08  Fabián Ezequiel Gallina  <fgallina@cuca>
 +
 +      Enhancements on forward-sexp movement.
 +      * progmodes/python.el (python-nav-beginning-of-statement)
 +      (python-nav-end-of-statement): Return point-marker.
 +      (python-nav-forward-sexp): lisp-like forward-sexp behavior.
 +      (python-info-current-symbol)
 +      (python-info-statement-starts-block-p): Rename from
 +      python-info-beginning-of-block-p.
 +      (python-info-statement-ends-block-p): Rename from
 +      python-info-end-of-block-p.
 +      (python-info-beginning-of-statement-p)
 +      (python-info-end-of-statement-p)
 +      (python-info-beginning-of-block-p, python-info-end-of-block-p):
 +      New functions.
 +
 +2012-10-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * comint.el (comint-preinput-scroll-to-bottom): Preserve the
 +      frame-selected-windows.
 +
+ 2012-10-08  Daniel Colascione  <dancol@dancol.org>
+ 
+       * battery.el (battery-status-function): Check for
+       w32-battery-status itself, not system-time windows-nt.
+ 
+       * frame.el: Require cl-lib.
+       (display-format-alist): New variable mapping frame types to
+       functions that initialize them.
+       (window-system-for-display): New function: interprets
+       display-format-alist.
+       (make-frame-on-display): Remove existing display-selection logic
+       and just forward to make-frame, which will now DTRT.
+       (make-frame): Restructure to use window-system-for-display to
+       figure out how to create a frame on a given display.
+       (display-mouse-p): Look for frame-type w32, not a particular
+       system-type.
+ 
+       * loadup.el: Load w32 lisp code when we have the w32 feature.
+ 
+       * mouse.el (mouse-yank-primarY): Look for frame-type w32, not
+       system-type windows-nt.
+ 
+       * server.el (server-create-window-system-frame): Look for window
+       type.
+       (server-proces-filter): Only force a window system when windows-nt
+       _and_ w32.  Explain why.
+ 
+       * simple.el (normal-erase-is-backspace-mode): Add w32 to the list
+       of window systems we configure for the mode.
+ 
+       * startup.el (command-line): Mark window system is initialized
+       after we've done it.
+ 
+       * common-win.el (x-select-text): Look for w32, not windows-nt.
+ 
+       * ns-win.el: Require cl-lib.  Add ourselves to
+       display-format-alist.
+       (ns-initialize-window-system): Assert we're not initialized twice.
+ 
+       * w32-win.el: Enable lexical binding; require cl-lib; add
+       ourselves to display-format-alist.
+       (w32-handle-dropped-file): Convert incoming dropped files from
+       Windows paths to Cygwin ones before passing them on to the rest of
+       Emacs.
+       (w32-drag-n-drop): New paramter new-frame.  Simplify logic.
+       (w32-initialize-window-system): Assert we're not initialized twice.
+ 
+       * x-win.el: Require cl-lib; add ourselves to display-format-alist.
+       (x-initialize-window-system): Assert we're not initialized twice.
+ 
+       * w32-common-fns.el: New File.
+       (w32-version, w32-using-nt, w32-get-clipboard-data)
+       (w32-set-clipboard-data, x-set-selection, x-get-selection)
+       (w32-charset-info-alist, x-last-selected, text)
+       (x-get-selection-value, x-selection-value): Move here.
+ 
+       * w32-fns.el: Require w32-common-fns.
+       (w32-version, w32-using-nt, w32-get-clipboard-data)
+       (w32-set-clipboard-data, x-set-selection, x-get-selection)
+       (w32-charset-info-alist, x-last-selected, text)
+       (x-get-selection-value, x-selection-value): Move to
+       w32-common-fns.
+ 
+       * w32-vars.el:
+       (w32-allow-system-shell, w32-system-shells): Define only in
+       non-cygwin case.
+ 
  2012-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * subr.el (read-passwd-map): Don't use `defconst' (bug#12597).