From: Joakim Verona <joakim@verona.se>
Date: Sat, 20 Oct 2012 16:14:08 +0000 (+0200)
Subject: upstream
X-Git-Tag: emacs-25.0.90~3273
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6d3ae671153437538da2d1b41af0d1589ec8148b;p=emacs.git

upstream
---

6d3ae671153437538da2d1b41af0d1589ec8148b
diff --cc lisp/emacs-lisp/cl-loaddefs.el
index 5827c745199,d05fbc42060,d05fbc42060..22e22a386f8
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@@@ -260,7 -260,7 -260,7 +260,7 @@@@ Remove from SYMBOL's plist the propert
   ;;;;;;  cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when
   ;;;;;;  cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp
   ;;;;;;  cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*)
-  ;;;;;;  "cl-macs" "cl-macs.el" "8c5b0c97239c3e29cebbf1406534a6d3")
 --;;;;;;  "cl-macs" "cl-macs.el" "885919e79dbcd11081cfb2e039b470c7")
+++;;;;;;  "cl-macs" "cl-macs.el" "d257add5929b6a681d1c3f6642f5c648")
   ;;; Generated autoloads from cl-macs.el
   
   (autoload 'cl--compiler-macro-list* "cl-macs" "\
diff --cc lisp/emacs-lisp/edebug.el
index f147fba167d,483ed64de20,483ed64de20..b1662ef7af3
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@@@ -372,10 -368,10 -368,10 +372,10 @@@@ Return the result of the last expressio
   	 ((eq (window-buffer (selected-window)) buffer)
   	  ;; Selected window already displays BUFFER.
   	  (selected-window))
 --	 ((get-buffer-window buffer 0))
 ++	 ((edebug-get-buffer-window buffer))
   	 ((one-window-p 'nomini)
   	  ;; When there's one window only, split it.
-  	  (split-window))
+  	  (split-window (minibuffer-selected-window)))
   	 ((let ((trace-window (get-buffer-window edebug-trace-buffer)))
   	    (catch 'found
   	      (dolist (elt (window-list nil 'nomini))
diff --cc src/Makefile.in
index c129da58fff,c24e421bbbc,c24e421bbbc..20e9366592d
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@@ -350,13 -344,11 -344,11 +354,13 @@@@ base_obj = dispnew.o frame.o scroll.o x
   	process.o gnutls.o callproc.o \
   	region-cache.o sound.o atimer.o \
   	doprnt.o intervals.o textprop.o composite.o xml.o \
 ++	xwidget.o \
   	profiler.o \
   	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
-  	$(WINDOW_SYSTEM_OBJ)
+  	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ)
   obj = $(base_obj) $(NS_OBJC_OBJ)
   
 ++xwidget.o: xwidget.c xwidget.h
   ## Object files used on some machine or other.
   ## These go in the DOC file on all machines in case they are needed.
   ## Some of them have no DOC entries, but it does no harm to have them
@@@@ -397,10 -389,11 -389,11 +401,12 @@@@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OB
   ## Note that SunOS needs -lm to come before -lc; otherwise, you get
   ## duplicated symbols.  If the standard libraries were compiled
   ## with GCC, we might need LIB_GCC again after them.
-  LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
-     $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) $(LIB_TIMER_TIME) \
+  LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \
+     $(LIBX_OTHER) $(LIBSOUND) \
+     $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
 ++   $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \
-     $(DBUS_LIBS) $(LIB_EXECINFO) \
+     $(LIB_TIMER_TIME) $(DBUS_LIBS) \
+     $(LIB_EXECINFO) \
      $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
      $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
      $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \