Merge from trunk.

diff --cc lib-src/ChangeLog
Simple merge

diff --cc lib-src/makefile.w32-in
Simple merge

diff --cc lisp/ChangeLog
index 86b425b41e4b09980d014865e9782a3a8994d44a,f9d9ad4b03d68631c31bc7f1bf1889a30782d76f,96267eacb8932f9741b074072465c89d5838afe0..41b0135a70807833894ac7cff08439f6d9cda05c
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
--- 3/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@@ -1,3 -1,17 -1,42 +1,42 @@@@
++ 2012-10-20  Arne Jørgensen  <arne@arnested.dk>
++ 
++      * progmodes/flymake.el (flymake-create-temp-inplace): Use
++      file-truename.
++ 
++ 2012-10-20  Eli Zaretskii  <eliz@gnu.org>
++ 
++      * loadup.el: Update comment about uncompiled Lisp files.  (Bug#12395)
++ 
++ 2012-10-20  Jay Belanger  <jay.p.belanger@gmail.com>
++ 
++      * calc/calc-units.el (math-extract-units): Properly extract powers
++      of units.
++ 
++ 2012-10-20  Daniel Colascione  <dancol@dancol.org>
++ 
++      * frame.el (make-frame): Set x-display-name as we used to in order
++      to unbreak creating an X11 frame from an Emacs daemon started
++      without a display.
++ 
++ 2012-10-19  Stefan Monnier  <monnier@iro.umontreal.ca>
++ 
++      * minibuffer.el (minibuffer-force-complete): Make the next completion use
++      the same completion-field (bug@12221).
++ 
+  2012-10-19  Martin Rudalics  <rudalics@gmx.at>
+  
+       * emacs-lisp/debug.el (debug): Record height of debugger window
+       also when debugger will be back (Bug#8789).
+  
+  2012-10-18  Chong Yidong  <cyd@gnu.org>
+  
+       * progmodes/gdb-mi.el (gdb-display-buffer-other-frame-action):
+       Convert to defcustom.
+       (gdb-get-source-file): Don't bind pop-up-windows.
+  
+       * progmodes/gud.el (gud-display-line): Don't specially re-use
+       other frames for the gdb-mi case (Bug#12648).
+  
   2012-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
   
        * emacs-lisp/advice.el: Clean up commentary a bit.

diff --cc src/ChangeLog
Simple merge