NEWS entry and Changelog xwidgets

diff --git a/etc/NEWS b/etc/NEWS
index 4b0a268d8f2f30eec0d4add514cbd202c79e4ed8..4371a01ec7ccbbb9997e3b720fd59383f706375d 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -65,7 +65,9 @@ so if you want to use it, you can always take a copy from an older Emacs.
 
 \f
 * Changes in Emacs 25.1
-
+** Xwidgets : A new feature for embedding native widgets
+inside Emacs buffers. If you have gtk3 and webkit-devel installed,
+you can try the embedded webkit browser with m-x xwidget-webkit-browse-url.
 ** `package-install-from-buffer' and `package-install-file' work on directories.
 This follows the same rules as installing from a .tar file, except the
 -pkg file is optional.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9e564ea6414d7f4a3d8a28bad2256e6448f5fed0..c103ca3b034a98dbfdbaadb46a09a9c203ca0e1f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2015-02-01  Joakim Verona  <joakim@verona.se>
+       Support for the new Xwidget feature.
+       * window.c, Makefile.in, buffer.c, dispextern.h, dispnew.c, emacs.c:
+       * emacsgtkfixed.c, emacsgtkfixed.h, keyboard.c, lisp.h, print.c:
+       * termhooks.h, window.c, xdisp.c, xterm.c
+       New files for xwidgets:
+       * xwidget.c, xwidget.h:
+       Support for testing xwidgets
+       * xwidget-test-manual.el:
+
+2015-02-01  Gregoire Jadi  <daimrod@gmail.com>
+       Support for testing xwidgets
+       * parallell-remote.el, parallell-xwidget.el, parallell.el:
+       * xwidget-tests.el:
+       various improvements to xwidgets:
+       * xwidgets.c:
+
 2015-01-31  Eli Zaretskii  <eliz@gnu.org>
 
        * coding.c (raw_text_coding_system_p): New function.