From: Joakim Verona Date: Wed, 4 Jun 2014 21:50:06 +0000 (+0200) Subject: upstream X-Git-Tag: emacs-25.0.90~2640 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce8171797dafbde765170b79e5f154afc4872e86;p=emacs.git upstream --- ce8171797dafbde765170b79e5f154afc4872e86 diff --cc configure.ac index 6deeb045273,e9f5099becd..582b94ee278 --- a/configure.ac +++ b/configure.ac @@@ -2334,42 -2386,8 +2388,44 @@@ if test "${HAVE_GTK}" = "yes"; the term_header=gtkutil.h fi + +HAVE_XWIDGETS=no +HAVE_WEBKIT=no +HAVE_GIR=no + +if test "${with_xwidgets}" != "no"; then + echo "xwidgets enabled, checking webkit, and others" + HAVE_XWIDGETS=yes + AC_DEFINE(HAVE_XWIDGETS, 1, [Define to 1 if you have xwidgets support.]) +#xwidgets +#TODO +# - enable only if gtk/gtk3 enabled +# - webkit +# - only webkit_osr is good so remove plain webkit laterish + +#webkit version for gtk3. + WEBKIT_REQUIRED=1.4.0 + WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED" + + if test "${with_gtk3}" = "yes"; then + PKG_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no) + if test $HAVE_WEBKIT = yes; then + AC_DEFINE(HAVE_WEBKIT_OSR, 1, [Define to 1 if you have webkit_osr support.]) + fi + fi + + GIR_REQUIRED=1.32.1 + GIR_MODULES="gobject-introspection-1.0 >= $GIR_REQUIRED" + PKG_CHECK_MODULES(GIR, $GIR_MODULES, HAVE_GIR=yes, HAVE_GIR=no) + if test $HAVE_GIR = yes; then + AC_DEFINE(HAVE_GIR, 1, [Define to 1 if you have GIR support.]) + fi + + +fi + + CFLAGS=$OLD_CFLAGS + LIBS=$OLD_LIBS dnl D-Bus has been tested under GNU/Linux only. Must be adapted for dnl other platforms. diff --cc lisp/desktop.el index 9667b512e7a,ded73c065f0..2843e8795e7 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@@ -1450,12 -1493,14 +1493,11 @@@ If there are no buffers left to create (let ((key "--no-desktop")) (when (member key command-line-args) (setq command-line-args (delete key command-line-args)) - (setq desktop-save-mode nil))) + (desktop-save-mode 0))) (when desktop-save-mode (desktop-read) - (desktop-auto-save-set-timer) (setq inhibit-startup-screen t)))) -;; So we can restore vc-dir buffers. -(autoload 'vc-dir-mode "vc-dir" nil t) - (provide 'desktop) ;;; desktop.el ends here diff --cc lisp/net/browse-url.el index ea13aa36a70,09d84795f4f..be9e4aa94bf --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@@ -812,7 -807,8 +815,9 @@@ first, if that exists. (interactive (browse-url-interactive-arg "URL: ")) (unless (called-interactively-p 'interactive) (setq args (or args (list browse-url-new-window-flag)))) + (setq url (url-tidy url)) + (when (and url-handler-mode (not (file-name-absolute-p url))) + (setq url (expand-file-name url))) (let ((process-environment (copy-sequence process-environment)) (function (or (and (string-match "\\`mailto:" url) browse-url-mailto-function) diff --cc src/Makefile.in index 3e45a5bfff8,020ecd62a5e..3671b4d912b --- a/src/Makefile.in +++ b/src/Makefile.in @@@ -349,11 -322,11 +328,12 @@@ MKDEPDIR=@MKDEPDIR ## ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG. ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \ - -I$(lib) -I$(srcdir)/../lib \ + -I$(lib) -I$(srcdir)/../lib $(C_HEAP_SWITCH) \ $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ - $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) \ + $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ + $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \ + $(WEBKIT_CFLAGS) $(CLUTTER_CFLAGS) $(GIR_CFLAGS) \ $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) \ @@@ -434,9 -405,8 +414,9 @@@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OB LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ $(LIBX_OTHER) $(LIBSOUND) \ $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \ + $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \ $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ - $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) \ + $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) $(XFIXES_LIBS) \ $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ diff --cc src/buffer.c index 71c01237205,909b3779b06..bc0a796ea71 --- a/src/buffer.c +++ b/src/buffer.c @@@ -44,9 -41,9 +41,12 @@@ along with GNU Emacs. If not, see . */ - #include - #define DISPEXTERN_INLINE EXTERN_INLINE - #include "sysstdio.h" #include @@@ -4046,14 -4076,8 +4081,14 @@@ scrolling_window (struct window *w, boo break; } +#ifdef HAVE_XWIDGETS + //currently this is needed to detect xwidget movement reliably. or probably not. + //printf("scrolling_window\n"); + return 0; +#endif + /* Give up if some rows in the desired matrix are not enabled. */ - if (!MATRIX_ROW (desired_matrix, i)->enabled_p) + if (! MATRIX_ROW_ENABLED_P (desired_matrix, i)) return -1; first_old = first_new = i; diff --cc src/print.c index 03e781cac18,475be9ec285..c6d9f44bdb5 --- a/src/print.c +++ b/src/print.c @@@ -1764,22 -1774,11 +1776,23 @@@ print_object (Lisp_Object obj, Lisp_Obj strout (XSUBR (obj)->symbol_name, -1, -1, printcharfun); PRINTCHAR ('>'); } +#ifdef HAVE_XWIDGETS + else if (XWIDGETP (obj)) + { + strout ("#'); + } + else if (XWIDGET_VIEW_P (obj)) + { + strout ("#'); + } +#endif else if (WINDOWP (obj)) { - void *ptr = XWINDOW (obj); - int len = sprintf (buf, "#sequence_number); strout (buf, len, len, printcharfun); if (BUFFERP (XWINDOW (obj)->contents)) { diff --cc src/window.c index 74b76341446,919cc7b1c4e..7f28ccd19b2 --- a/src/window.c +++ b/src/window.c @@@ -4004,11 -4518,7 +4524,10 @@@ Signal an error when WINDOW is the onl /* Block input. */ block_input (); +#ifdef HAVE_XWIDGETS + xwidget_view_delete_all_in_window(w); +#endif window_resize_apply (p, horflag); - /* If this window is referred to by the dpyinfo's mouse highlight, invalidate that slot to be safe (Bug#9904). */ if (!FRAME_INITIAL_P (f)) diff --cc test/automated/data/decompress/foo-gzipped index a68653fcbb9,a68653fcbb9..00000000000 deleted file mode 100644,100644 Binary files differ diff --cc test/automated/data/package/multi-file-readme.txt index affd2e96fb0,affd2e96fb0..00000000000 deleted file mode 100644,100644 --- a/test/automated/data/package/multi-file-readme.txt +++ /dev/null @@@ -1,1 -1,1 +1,0 @@@ --This is a bare-bones readme file for the multi-file package. diff --cc test/automated/data/package/newer-versions/archive-contents index add5f2909d0,add5f2909d0..00000000000 deleted file mode 100644,100644 --- a/test/automated/data/package/newer-versions/archive-contents +++ /dev/null @@@ -1,13 -1,13 +1,0 @@@ --(1 -- (simple-single . -- [(1 4) -- nil "A single-file package with no dependencies" single]) -- (simple-depend . -- [(1 0) -- ((simple-single (1 3))) "A single-file package with a dependency." single]) -- (new-pkg . -- [(1 0) -- nil "A package only seen after "updating" archive-contents" single]) -- (multi-file . -- [(0 2 3) -- nil "Example of a multi-file tar package" tar])) diff --cc test/automated/data/package/newer-versions/new-pkg-1.0.el index 7251622fa59,7251622fa59..00000000000 deleted file mode 100644,100644 --- a/test/automated/data/package/newer-versions/new-pkg-1.0.el +++ /dev/null @@@ -1,18 -1,18 +1,0 @@@ --;;; new-pkg.el --- A package only seen after "updating" archive-contents -- --;; Author: J. R. Hacker --;; Version: 1.0 -- --;;; Commentary: -- --;; This will only show up after updating "archive-contents". -- --;;; Code: -- --(defun new-pkg-frob () -- "Ignore me." -- (ignore)) -- --(provide 'new-pkg) -- --;;; new-pkg.el ends here diff --cc test/automated/data/package/newer-versions/simple-single-1.4.el index 7d8178c05a5,7d8178c05a5..00000000000 deleted file mode 100644,100644 --- a/test/automated/data/package/newer-versions/simple-single-1.4.el +++ /dev/null @@@ -1,36 -1,36 +1,0 @@@ --;;; simple-single.el --- A single-file package with no dependencies -- --;; Author: J. R. Hacker --;; Version: 1.4 --;; Keywords: frobnicate -- --;;; Commentary: -- --;; This package provides a minor mode to frobnicate and/or bifurcate --;; any flanges you desire. To activate it, type "C-M-r M-3 butterfly" --;; and all your dreams will come true. --;; --;; This is a new, updated version. -- --;;; Code: -- --(defgroup simple-single nil "Simply a file" -- :group 'lisp) -- --(defcustom simple-single-super-sunday nil -- "How great is this? --Default changed to `nil'." -- :type 'boolean -- :group 'simple-single -- :package-version "1.4") -- --(defvar simple-single-sudo-sandwich nil -- "Make a sandwich?") -- --;;;###autoload --(define-minor-mode simple-single-mode -- "It does good things to stuff") -- --(provide 'simple-single) -- --;;; simple-single.el ends here diff --cc test/automated/data/package/simple-depend-1.0.el index b58b658d024,b58b658d024..00000000000 deleted file mode 100644,100644 --- a/test/automated/data/package/simple-depend-1.0.el +++ /dev/null @@@ -1,17 -1,17 +1,0 @@@ --;;; simple-depend.el --- A single-file package with a dependency. -- --;; Author: J. R. Hacker --;; Version: 1.0 --;; Keywords: frobnicate --;; Package-Requires: ((simple-single "1.3")) -- --;;; Commentary: -- --;; Depends on another package. -- --;;; Code: -- --(defvar simple-depend "Value" -- "Some trivial code") -- --;;; simple-depend.el ends here diff --cc test/automated/data/package/simple-single-readme.txt index 25d3034032b,25d3034032b..00000000000 deleted file mode 100644,100644 --- a/test/automated/data/package/simple-single-readme.txt +++ /dev/null @@@ -1,3 -1,3 +1,0 @@@ --This package provides a minor mode to frobnicate and/or bifurcate --any flanges you desire. To activate it, type "C-M-r M-3 butterfly" --and all your dreams will come true.