emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master updated (a2c32b0 -> 9fe732a)


From: Joakim Verona
Subject: [Emacs-diffs] master updated (a2c32b0 -> 9fe732a)
Date: Sun, 01 Feb 2015 00:39:49 +0000

jave pushed a change to branch master.

      from  a2c32b0   Avoid aborts when keyboard-coding-system is raw-text  
(Bug#19532)
      adds  ea113b6   initial move from git to bzr
      adds  14d0b57   compiles now
      adds  ff982c3   erge and a readme
      adds  1800c48   minor doc changes
      adds  3621208   merge from trunk, fix conflicts
      adds  3c8f5c4   fixed breakage after merge from trunk
      adds  efc9a9b   some readme updates
      adds  3da30ff   shadow -> phantom
      adds  8f7457f   real -> live
      adds  4c264af   fixed a lot of warnings, also made some xcomposite 
preparations
      adds  c63ce14   1st usable composition version
      adds  542dbe5   uzbl seems to be called uzbl-core now, at least in fedora 
packaging
      adds  5f09724   merge from upstream
      adds  8dfed77   disabled cursor drawing on xwidgets
      adds  5d13191   beginnings of a lisp interface to support debugging of 
xwidgets placements, which is hairy, and buggy.
      adds  a2080be   verified hypothesis that the 
stuck-xiwdgets-when-scrolling happens due to emacs redisplay optimizations. 
inhibit optimization completely for now, until some better solution is found.
      adds  951166f   improve clipping against right window edge a bit
      adds  8a698bc   minor tweaks
      adds  99ed13f   merge from upstream, fix 1 conflict
      adds  730139c   * xwidget.c (xwidget_key_send_message): Use 
FRAME_X_WINDOW instead of FRAME_ROOT_WINDOW.
      adds  e1a4989   * xwidget.c (Fxwidget_embed_steal_window) 
(Fxwidget_resize_internal, Fxwidget_set_keyboard_grab) 
(Fxwidget_send_keyboard_event): Check lisp types.
      adds  2630635   merge from upstream
      adds  ffce649   this doesnt actually work at all, but it does do some 
interesting things with composition, and contains lots of random experimental 
code. so i commit now, remove junk, and continue
      adds  0699485   this doesnt actually work at all, but it does do some 
interesting things with composition, and contains lots of random experimental 
code. so i commit now, remove junk, and continue
      adds  f5f038d   still doesnt actually work, but at least you get to see 
the widgets on screen randomly from time to time
      adds  224f8ae   still doesnt actually work, but at least you get to see 
the widgets on screen randomly from time to time
      adds  12cebab   still doesnt actually work, but now u see green live 
widgets and red phantom widgets, so its easier to debug visualy
      adds  cd0460b   still doesnt actually work, but now u see green live 
widgets and red phantom widgets, so its easier to debug visualy
      adds  bb8b8ba   still doesnt actually work, but added some clipping, and 
disabled compositing for sockets. acually i want compositing  for sockets, and 
it was realy the entire point of starting work on compositing, so its only 
temporary
      adds  07b8947   still doesnt actually work. cleaned up a bit. this 
version seems to redraw so much it gets sluggish. clipping works worse than 
previously still
      adds  e937179   still doesnt work, but good enough to showcase a little 
bit what might be possible if we get off-screen rendering working properly. 
some improved docs also.
      adds  35f4b80   random tweaking
      adds  13cfe8d   merge from upstream
      adds  4bd51ad   merge from upstream. currently seems to have bitroted and 
i get segfaults
      adds  a7513ad   merge from upstream
      adds  479d2bf   trying to revert the composition code and mowe to mvc. 
now compiles but far from functional. dont bother trying yet.
      adds  c20c683   already xwidget-demo-minimal works with 1 button and 1 
emacs window
      adds  bccbbe0   shows and hides the button created using 
xwidget-demo-minimal adequately with several windows and even several frames 
which is a first ever! segfaults after a while probably leaking or something.
      adds  787c27e   socket init demo xwidget-demo-a-socket now shows embedded 
browser again. phew./configure  multiple socket views create multiple 
embeddable processes though which is wrong. the 1st process plug should just be 
moved between sockets.
      adds  c5082a7   merge upstream
      adds  6716c04   clipping works again
      adds  9fa0e29   cleanups + small step towards better lisp interface. use 
syms rather than ints for xwidget types
      adds  76d0855   first working example of mvc. multiple views of a slider 
are kept in sync
      adds  2f69e75   some more explanations regarding slider mvc
      adds  78309a2   doc update for mvc. resize support for mvc
      adds  65b7d4f   demo of a clutter based canvas xwidget that renders a svg 
file
      adds  b380a76   proof of concept webkit xwidget
      adds  9333b6a   added an offscreen rendered webkit variant. the on-screen 
view shows up sometimes so the principle is validated
      adds  ada35ec   merge from upstream
      adds  0349bc3   merge from upstream
      adds  e5e23bc   damage event handler + queue redraw when emacs moves 
widgets
      adds  46ddfc9   gtk3 tests, trying to get clipping working as it does on 
gtk2. doesnt work, very annoying
      adds  9f13671   gtk3 tests, tried clipping using a scrolled windew. this 
works but results in unwanted scrollbars.
      adds  b075649   first working clipping for gtk3.
      adds  6e5d831   fixed embarrasing non-singletoness of webkit-osr.
      adds  83d3c03   damage event now actually caught and used for webkit-osr.
      adds  ff0863a   damage event now actually caught and used for webkit-osr.
      adds  d5aa6c9   event forwarding, makes webit-osr usable
      adds  f929f1a   inject javascript in embeddeb webkit instance
      adds  d319e36   cleanups. webkit title function which is unexpectedly 
useful as a workaround for lack of webkit JS exec ret val.
      adds  57be30e   work on cliptop. this rev is worse in some regards than 
the previous, but its the first where cliptop works at all.
      adds  303da42   work on cliptop. swithched from viewport, back to 
gtkfixed. pretty acceptable visuals
      adds  a218ae2   work on clipleft. not fantastic yet
      adds  f53a15f   work on clipleft. now seemingly ok
      adds  d812bba   tweak to improve deletion of xwviews when emacs windows 
are closed
      adds  e098c55   minor cleanups and doc
      adds  57b7a4c   preliminary configure support
      adds  26b7979   more configure support and cleanups. the gtk2 webkit 
support removed because offscreen rendering is too quirky there
      adds  347166e   more configure support and cleanups.
      adds  42f0519   cleanups. tentative webkit lisp interface, but i got 
annoyed now with the primitives.
      adds  c43c0a6   begin moving xwidget storage to lisp. button test shows 
again since tag 0.1, so its not a completely useless version, but since the 
xwidget identity concept now changed from int to pointer, lots of code was 
commented out and needs rework
      adds  2f6c9a3   xw title conversion to lisp object
      adds  ff2be00   webkit osr works again
      adds  4f616a2   merge from upstream
      adds  4726dd7   more webkit stuff. bugfix
      adds  b9cc025   better resize that supports webkit-osr. also 
size-requisition that returns desired size rather than allocated 
size(webkit-osr only atm)
      adds  32b1b66   some attempts at real-world usefulness
      adds  b0ec5b0   merge upstream
      adds  e9e9f8a   cleanups
      adds  917307c   explain wxidget zombie bug
      adds  f767996   docs and webkit usability
      adds  cd1f21d   cleanup xv init test, and introduce PVEC_XWIDGET
      adds  d202b5a   support for disabling plugins(flash is undesirable) in 
webkit
      adds  b41ac9a   webkit back function
      adds  5e71eb1   current url
      adds  e0bdf95   merge upstream
      adds  28a0414   merge upstream
      adds  7cdff38   webkit reload
      adds  9c4f135   cleanups
      adds  c196618   merge upstream
      adds  de37acc   notes
      adds  37d53e7   experiment send key event to xwidget. this version had 
som bad merges from trunk so it seems unstble
      adds  32feb90   merge from upstream
      adds  b60646c   non-functional xey send
      adds  37d6e22   upstream merge. cleanup
      adds  716c24d   socket osr trial experiment that doesnt work
      adds  460c547   merge upstream
      adds  0527c8f   futile allocation hacks
      adds  fac8cc5   merge upstream
      adds  5d9d21d   doc
      adds  94e784c   merge upstream
      adds  e9a9674   better support for multiple webkit buffers
      adds  c8937ab   ifdef guarding of xwidget code. not complete
      adds  6752d22   merge upstream
      adds  fceaa88   example webkit signal handler for document-loaded. 
upstream has changed display code so there are some visual glitches. i dont 
think xwidget code is to blame.
      adds  332f858   merge upstream
      adds  eac24b5   xwidgetp
      adds  7cb3d58   merge upstream
      adds  022cd22   merge upstream
      adds  e31c3c3   some adaptor code that makes webkit mode work a bit more 
like image mode
      adds  c040cbd   merge upstream + stray par fix
      adds  817efd1   upstream
      adds  66f857b   fixed an assert
      adds  895ae71   forget a reguire cl for the flet macro
      adds  5cf126a   before merge
      adds  1cab149   mostly upstream
      adds  c5e10d0   cleanups
      adds  23e9910   GLYPH_DEBUG fix
      adds  1e3f7bd   merge upstream
      adds  301cce3   redisplay debugging
      adds  1e26d43   merge upstream.
      adds  d273479   100721 is the last known healthy version, check to see if 
upstream makes things well again
      adds  fbe9606   seems my recent attempts to disable screen optimizations 
cashed hard crashes so I removed them again
      adds  f49bb00   found a way to inhibit blit scrolling which restores 
proper xwidget movement
      adds  9a31704   webkit form field edit enhancement
      adds  35aa3ba   disabled xwidget bg erase which appears safe and looks 
better. test for a while.
      adds  3121ae1   upstream
      adds  6a6f5bf   doc
      adds  3637e3b   dom traversal example
      adds  8aa09b5   usptream + doc
      adds  5813e7d   usptream
      adds  2466640   upstream
      adds  0098380   xwidget plist support
      adds  e36df8e   event to callback maping code that does not work yet
      adds  3acc419   upstream
      adds  58cc0fb   event to callback maping code works better now
      adds  f49550d   upstream
      adds  005d611   upstream
      adds  fc04ef5   upstream
      adds  66a5c19   some keyboard event code but it still crashes
      adds  8d157ab   upstream
      adds  ad64ea4   some keyboard event code but it still crashes and now im 
fed up
      adds  296042b   some keyboard event code but it still crashes and now im 
more fed up
      adds  c65b5f1   first version ever with keyboard-send that doesnt crash 
and even propagates event
      adds  de4d393   minor docs
      adds  a6df1da   upstream
      adds  636890f   upstream
      adds  37dea37   upstream
      adds  324cf6d   upstream
      adds  c0ebe7c   improved webkit field edit
      adds  a4c41ca   upstream
      adds  31cb6a3   title tweak
      adds  478018d   upstream
      adds  07053c1   get webkit url
      adds  f8012bc   upstream
      adds  91a9176   typo
      adds  41621cb   upstream
      adds  2002bbd   socket args
      adds  eff2e78   upstream
      adds  1d55eaf   minor webkit
      adds  c748958   upstream
      adds  9fb7b0c   upstream
      adds  b72c6fe   upstream
      adds  9c6d424   doc
      adds  bb1ffa0   upstream
      adds  fd1f30f   upstream
      adds  d47f8c5   disabled cavas demo code by default since people have 
issues building. it can be enabled explicitly
      adds  687faaf   upstream
      adds  a4c2da9   librsvg was unecessarily pulled into the default build
      adds  823d082   upstream
      adds  9031144   fixed a couple of warnings
      adds  1b07d72   warnings
      adds  be81ea9   upstream
      adds  467bb69   warnings
      adds  3736942   upstream
      adds  cca374c   upstream
      adds  94110be   upstream
      adds  0e852ac   upstream
      adds  8918dac   attempt to avoid possible redisplay loop
      adds  8d07d23   upstream
      adds  b728e88   upstream
      adds  c139d20   upstream
      adds  4caed0b   upstream
      adds  00c82a0   upstream
      adds  95cc95e   upstream
      adds  7e5553d   upstream
      adds  f0f8db4   upstream
      adds  7a982f9   upstream
      adds  6ae1821   upstream
      adds  79d868c   re-added xwidget-test.el
      adds  d407756   minor doc
      adds  0b19c78   upstream
      adds  4a9f23a   minor
      adds  3d9b003   upstream
      adds  dab7e06   upstream
      adds  e1745b4   url-tidy, user request
      adds  38ea27d   upstream
      adds  f3a0352   home end keys fix
      adds  3bb66ec   upstream + xwidget-webkit-show-named-element
      adds  6e73a2e   upstream
      adds  c1d6192   minor doc
      adds  ac8bd0c   upstream
      adds  c591741   ugly title return value workaround
      adds  fa25a46   upstream
      adds  37eb674   tiny url-tidy fix
      adds  f514b55   text input with html using frames works better now
      adds  51a9916   doc
      adds  b70516d   upstream
      adds  fc7ee8f   some fruitless webkit size experiments
      adds  bd5feeb   upstream
      adds  ae2cf93   initial signal handling for downloads
      adds  e664471   download url is sent to emacs
      adds  8bf21b9   more signal handler skeletons
      adds  5a2b320   upstream
      adds  99a92fa   tiny signal debug change
      adds  67be595   upstream
      adds  b534f59   upstream
      adds  1722ecc   more navigation signals work
      adds  fe118e0   attempt to make relative urls work, but it doesnt. 
contains some bugfixes anyway
      adds  34deead   relative urls actually work for emacswiki! only birefly 
tested
      adds  2e82ad1   relative urls tiny fix
      adds  85a3fca   upstream
      adds  e40ee7b   improvement to 'g'
      adds  2670512   even better relative links
      adds  19e28be   docs
      adds  c823c66   upstream
      adds  c649990   upstream
      adds  d66104e   password support. doc.
      adds  8520d9c   upstream
      adds  32db484   nav + text edit
      adds  c8d4b74   upstream
      adds  62318ae   minor doc
      adds  40bb789   upstream
      adds  a9c1e05   upstream
      adds  3c935a7   doc
      adds  bb29f04   upstream i think
      adds  2f74c36   upstream
      adds  e4f761f   upstream
      adds  16e9a80   upstream
      adds  69a8e78   fixes for typechecking to avoid crashes when some webkit 
functions are called with nil instead of valid webkit obj. intended to make it 
run on archlinux
      adds  97211d8   minor
      adds  698bd5e   upstream
      adds  d5114bf   added stuff for logging
      adds  0322b14   upstream
      adds  f992aa1   doc
      adds  fbdce5f   upstream
      adds  8c5c7f5   ustream
      adds  db2e8ff   upstream
      adds  736ab04   upstream
      adds  02db17e   upstream
      adds  61a7b85   upstream
      adds  a91388f   upstream
      adds  dc6aff3   upstream
      adds  a310be9   test
      adds  286c3fc   minor conflict between upstream and local
      adds  4c63656   upstream
      adds  e8e4207   bug when passing xwidget in event
      adds  28485da   upstream
      adds  1e3a41b   upstream
      adds  1de331c   upstream+selection support
      adds  4b2cea2   upstream
      adds  28d5f38   textarea
      adds  b827329   upstream
      adds  75da28a   upstream
      adds  e28095d   upstream
      adds  b1928cb   upstream
      adds  448c0a7   upstream
      adds  2ec5843   upstream
      adds  ab5b626   upstream partial out of memory
      adds  6346156   upstream partial out of memory
      adds  52862ad   upstream partial out of memory
      adds  74f0824   upstream, fix conflicts
      adds  aec4aaf   reinstal emocsfiked changes
      adds  4a375d7   upstream
      adds  f65ef7e   upstream
      adds  207460f   upstream
      adds  44fce8f   upstream
      adds  70700d8   upstream
      adds  664e085   upstream
      adds  fc1f1f2   upstream
      adds  5259b41   upstream
      adds  13d6898   upstream, doesn build yet
      adds  a3f77f8   upstream
      adds  32d8ff0   upstream
      adds  58a9069   lisp/emacs-lisp/cl-loaddefs.el annoyingly has to be 
handmerged.
      adds  abef204   upstream
      adds  08ab3a8   fixes so xwidgets doesnt pollute a non xwidget build
      adds  e50c9e7   fixed build issue introduced by the fix for non xwidget 
builds
      adds  2397651   tiny cosmetic fixes in the C code
      adds  7f91442   bugfix by Julian Scheid, fixes a case of bad 
initialization of views
      adds  82da003   some experimental support for gobject introspection
      adds  178a860   xwgir-call-method invoke function on an xwidget 
dynamically
      adds  9b022dc   its now possible to use xwgir to call for instance the 
zoom method on webkit!
      adds  f8dd0ee   some xwgir docs
      adds  660d17c   some xwgir docs
      adds  0c5c85c   small test changes
      adds  5fb6319   upstream
      adds  55fa71b   upstream
      adds  610ba6f   upstream
      adds  c8b0fc1   WVAR (it->w, buffer)
      adds  b648c26   upstream
      adds  d023443   repair attempt
      adds  5436d1d   upstream
      adds  4a37733   upstream
      adds  b035a30   upstream
      adds  0cc3655   upstream
      adds  aac9139   upstream
      adds  6c86337   not compiling yet
      adds  99def29   not compiling yet
      adds  a461dd7   stil not compiling
      adds  be25526   upstream
      adds  5fcc703   finally builds again
      adds  017a270   upstream
      adds  6d3ae67   upstream
      adds  fd0ea43   upstream
      adds  d1eb940   upstream
      adds  9c80955   upstream
      adds  643b189   upstream
      adds  a06cbaa   cl-loaddefs
      adds  2a4942e   upstream
      adds  74fa27a   upstream
      adds  7e61826   cl-loaddefs
      adds  a9c1b61   upstream
      adds  e6206db   upstream
      adds  0de998c   loaddef
      adds  01537ff   upstream
      adds  e1abb9a   upstream
      adds  85157ae   auto upstream
      adds  57037b0   auto upstream
      adds  c5a853f   auto upstream
      adds  ceed1ad   auto upstream
      adds  ec0f852   auto upstream
      adds  a04cd20   auto upstream
      adds  ce5ac9b   auto upstream
      adds  fd29847   auto upstream
      adds  4832577   auto upstream
      adds  21e02f2   auto upstream
      adds  fb4eb7b   auto upstream
      adds  36a7ffb   auto upstream
      adds  3ee62d1   auto upstream
      adds  2295c41   auto upstream
      adds  b4ac236   auto upstream
      adds  e850af1   auto upstream
      adds  9c42552   auto upstream
      adds  1e93652   auto upstream
      adds  5cbfa1d   auto upstream
      adds  0d88aab   auto upstream
      adds  853a3e7   auto upstream
      adds  6dfb20b   auto upstream
      adds  506553d   auto upstream
      adds  fa8510a   auto upstream
      adds  d28fde00  auto upstream
      adds  d782bc1   auto upstream
      adds  b2783e8   auto upstream
      adds  08e882e   auto upstream
      adds  c60c439   auto upstream
      adds  2e5037f   auto upstream
      adds  37c6b20   auto upstream
      adds  a9075a3   auto upstream
      adds  39f9cdb   auto upstream
      adds  5cd9c6f   auto upstream
      adds  fd98533   auto upstream
      adds  2359398   auto upstream
      adds  a1c7bed   auto upstream
      adds  62b8a78   auto upstream
      adds  3076e0d   auto upstream
      adds  d0540aa   auto upstream
      adds  79503a8   auto upstream
      adds  001e5e5   auto upstream
      adds  73cc695   auto upstream
      adds  ac47366   auto upstream
      adds  a8b4c5f   auto upstream
      adds  1baa30e   auto upstream
      adds  26c7910   auto upstream
      adds  202ba39   auto upstream
      adds  b4ec938   auto upstream
      adds  d408fa6   auto upstream
      adds  17819c0   auto upstream
      adds  8a7ec57   auto upstream
      adds  ec51343   auto upstream
      adds  6b94665   auto upstream
      adds  3f53f3a   auto upstream
      adds  78a01be   auto upstream
      adds  cb88e06   auto upstream
      adds  8ca9105   auto upstream
      adds  825970c   auto upstream
      adds  b28d85c   auto upstream
      adds  2ec68e9   auto upstream
      adds  1c29ef4   auto upstream
      adds  ff176d4   auto upstream
      adds  b43215c   auto upstream
      adds  f386998   auto upstream
      adds  edcb898   auto upstream
      adds  205f607   auto upstream
      adds  26a08c5   auto upstream
      adds  5dae61e   auto upstream
      adds  650c475   auto upstream
      adds  9d1d3a9   auto upstream
      adds  5bd31d0   auto upstream
      adds  2ba8afb   auto upstream
      adds  b2be0b0   auto upstream
      adds  9cf1fee   auto upstream
      adds  51a4c80   auto upstream
      adds  c310f10   auto upstream
      adds  1fb8a4e   auto upstream
      adds  382215a   auto upstream
      adds  64fde7a   auto upstream
      adds  bf2e04d   auto upstream
      adds  9c05e8d   auto upstream
      adds  34d01c7   auto upstream
      adds  0a78be2   auto upstream
      adds  5d95275   auto upstream
      adds  0ced9ec   auto upstream
      adds  3d9057e   auto upstream
      adds  d88f355   auto upstream
      adds  9d14011   auto upstream
      adds  423b343   auto upstream
      adds  02d4379   auto upstream
      adds  f9e7302   auto upstream
      adds  c0b9583   auto upstream
      adds  5ccd4f2   some conflict resolution
      adds  86f35ea   fixing some unterminated ifdefs caused by the previous 
conflict resolution
      adds  35a6258   auto upstream
      adds  de199f7   auto upstream
      adds  8568160   auto upstream
      adds  34d8225   auto upstream
      adds  3969dbe   auto upstream
      adds  b24b248   auto upstream
      adds  dab5f9f   auto upstream
      adds  9a39645   auto upstream
      adds  fd2e292   auto upstream
      adds  8986f11   auto upstream
      adds  835350a   auto upstream
      adds  6c0558a   auto upstream
      adds  3c91d70   auto upstream
      adds  8fef052   auto upstream
      adds  7fca2eb   auto upstream
      adds  4971cb7   auto upstream
      adds  442dbfe   auto upstream
      adds  ac6e1d4   auto upstream
      adds  8186a9f   auto upstream
      adds  a9d34ef   auto upstream
      adds  fc25410   auto upstream
      adds  d5190c9   auto upstream
      adds  825095b   auto upstream
      adds  2f04192   auto upstream
      adds  7787e3f   auto upstream
      adds  fa9b2fc   auto upstream
      adds  cd184a0   auto upstream
      adds  4641c4c   auto upstream
      adds  86c87c0   auto upstream
      adds  bb09916   auto upstream
      adds  26854f0   auto upstream
      adds  67eb4ae   auto upstream
      adds  0b0800f   auto upstream
      adds  e5e863f   auto upstream
      adds  8aa0aa3   auto upstream
      adds  b29dde6   auto upstream
      adds  0872f5e   auto upstream
      adds  a942ead   auto upstream
      adds  22910c3   auto upstream
      adds  d3fa031   auto upstream
      adds  6587f5a   auto upstream
      adds  c69b57e   auto upstream
      adds  d179ffe   auto upstream
      adds  f4a82a0   auto upstream
      adds  079006b   auto upstream
      adds  152243e   auto upstream
      adds  24d4008   auto upstream
      adds  81f3c76   auto upstream
      adds  d5359b8   auto upstream
      adds  b602e17   auto upstream
      adds  ec55013   auto upstream
      adds  767e191   auto upstream
      adds  9bcfd0c   auto upstream
      adds  87ceb24   auto upstream
      adds  78bcaa2   auto upstream
      adds  ea1a68e   auto upstream
      adds  bf7be49   auto upstream
      adds  50f3874   auto upstream
      adds  fcff84b   auto upstream
      adds  8b90f29   auto upstream
      adds  75e1383   auto upstream
      adds  9e883d9   auto upstream
      adds  1887a27   auto upstream
      adds  519c7b3   auto upstream
      adds  d9aeedb   auto upstream
      adds  fd82bea   auto upstream
      adds  a33394e   auto upstream
      adds  b49be32   auto upstream
      adds  2bc41ed   auto upstream
      adds  596c67b   auto upstream
      adds  944f8e8   auto upstream
      adds  396061b   auto upstream
      adds  93a35ba   auto upstream
      adds  05bcc2f   auto upstream
      adds  79c72f2   auto upstream
      adds  da6ecd9   auto upstream
      adds  76d0705   auto upstream
      adds  01ec2ab   auto upstream
      adds  79fcbbf   auto upstream
      adds  9670972   auto upstream
      adds  7e1b3eb   auto upstream
      adds  1513f7c   auto upstream
      adds  a1826c0   auto upstream
      adds  222a843   auto upstream
      adds  01de106   auto upstream
      adds  248ca24   auto upstream
      adds  03d4188   auto upstream
      adds  6ff8d6c   auto upstream
      adds  91485c8   auto upstream
      adds  e8088e3   auto upstream
      adds  cc590e3   auto upstream
      adds  a26b09f   auto upstream
      adds  8382cb0   auto upstream
      adds  68a2788   auto upstream
      adds  0ed421b   auto upstream
      adds  7192d83   auto upstream
      adds  0fc586f   auto upstream
      adds  8fefd1b   auto upstream
      adds  0e3586a   auto upstream
      adds  aa5dbe6   auto upstream
      adds  554a71b   auto upstream
      adds  cfa8d79   auto upstream
      adds  d31a157   auto upstream
      adds  9a347b7   auto upstream
      adds  7d2a09b   auto upstream
      adds  eb963b2   auto upstream
      adds  277acaa   auto upstream
      adds  372d582   auto upstream
      adds  66d466e   auto upstream
      adds  dabc66c   auto upstream
      adds  1704d0c   auto upstream
      adds  76dff48   auto upstream
      adds  ebcc8a1   auto upstream
      adds  8142ca4   auto upstream
      adds  e5dd24f   auto upstream
      adds  d9876e7   auto upstream
      adds  16d5d07   auto upstream
      adds  182e147   auto upstream
      adds  403d846   auto upstream
      adds  5c422b3   auto upstream
      adds  4a40436   auto upstream
      adds  78e8154   auto upstream
      adds  6b25efe   auto upstream
      adds  039071b   auto upstream
      adds  119d7b5   auto upstream
      adds  33d58df   auto upstream
      adds  899ca81   auto upstream
      adds  dabbb28   auto upstream
      adds  e9184b4   auto upstream
      adds  399f1f1   auto upstream
      adds  08b03cd   auto upstream
      adds  af5b74f   auto upstream
      adds  5d58baa   auto upstream
      adds  54058e7   auto upstream
      adds  9a5cff1   auto upstream
      adds  a5418f7   auto upstream
      adds  f811d1f   auto upstream
      adds  f3400af   auto upstream
      adds  1541110   auto upstream
      adds  22973d8   auto upstream
      adds  ae3384a   auto upstream
      adds  89d5303   auto upstream
      adds  27d8205   auto upstream
      adds  19af826   auto upstream
      adds  20868a5   auto upstream
      adds  b0aac2f   auto upstream
      adds  37b812a   auto upstream
      adds  92101bd   auto upstream
      adds  cd9a335   auto upstream
      adds  87bffe2   auto upstream
      adds  f556622   auto upstream
      adds  fcd88e2   auto upstream
      adds  16b9f22   auto upstream
      adds  ea2da3d   auto upstream
      adds  42a61fa   auto upstream
      adds  6ccf4a9   auto upstream
      adds  536714d   auto upstream
      adds  c6b5fe1   auto upstream
      adds  55b74b5   auto upstream
      adds  b18e01b   auto upstream
      adds  be73be6   auto upstream
      adds  1c05ade   auto upstream
      adds  0f9ee7a   auto upstream
      adds  09708f7   auto upstream
      adds  26f277b   auto upstream
      adds  c655adb   auto upstream
      adds  ec43cd5   auto upstream
      adds  132fdce   auto upstream
      adds  bc4f7ac4  auto upstream
      adds  29901a2   auto upstream
      adds  6bb5cf7   auto upstream
      adds  9206508   auto upstream
      adds  19ea867   auto upstream
      adds  6a5f235   auto upstream
      adds  9054ae6   auto upstream
      adds  2adf26f   auto upstream
      adds  6f0e40a   auto upstream
      adds  e4963dc   auto upstream
      adds  2552016   auto upstream
      adds  271290a   auto upstream
      adds  41d9ac9   auto upstream
      adds  7a87fee   auto upstream
      adds  8baa84f   auto upstream
      adds  de18b41   auto upstream
      adds  9658cee   auto upstream
      adds  ae8a461   auto upstream
      adds  9aa1f4e   auto upstream
      adds  cfefa7e   auto upstream
      adds  c877afe   auto upstream
      adds  4fd0ce6   auto upstream
      adds  30e5582   auto upstream
      adds  c1f14e5   auto upstream
      adds  e38ad9a   auto upstream
      adds  4df065d   auto upstream
      adds  33cc2cd   auto upstream
      adds  77f4834   auto upstream
      adds  e0444a0   auto upstream
      adds  e46029a   auto upstream
      adds  694d759   auto upstream
      adds  73b3f91   auto upstream
      adds  613fda6   auto upstream
      adds  bcd8c34   auto upstream
      adds  37bce6b   auto upstream
      adds  b6f8e0e   auto upstream
      adds  10fc3c3   auto upstream
      adds  f0f3463   auto upstream
      adds  77a72b7   auto upstream
      adds  05a2b6a   auto upstream
      adds  ceb10cf   auto upstream
      adds  1b907e3   auto upstream
      adds  6f75e51   auto upstream
      adds  96fd57d   auto upstream
      adds  aa1ff60   auto upstream
      adds  1fb561e   auto upstream
      adds  c98de16   auto upstream
      adds  85c8b5a   auto upstream
      adds  f5bf532   auto upstream
      adds  15cb771   auto upstream
      adds  79157e9   auto upstream
      adds  2dcf541   auto upstream
      adds  3a9e4f9   auto upstream
      adds  4b882bf   auto upstream
      adds  c446797   auto upstream
      adds  e11705b   conflict resolve
      adds  62dd123   cl-flet replaces flet (Stefan Hussman)
      adds  48c226c   auto upstream
      adds  6f6db22   conflict resolve
      adds  10f659b   auto upstream
      adds  17e7bda   make xwgir less crash prone when flawed args
      adds  a93503d8  1st stab at xwgir using off screen rendering. mouse 
events doesnt seem to reac the widget yet
      adds  dea4006   more robust xwgir button demo
      adds  86dc02f   some improvements to the xwgir system. you can now create 
webkit with xwgir. OTOH, event propagation still only works for webkit, not for 
simpler things like buttons
      adds  5584cae   auto upstream
      adds  3966764   upstream
      adds  73423aa   lots of work on a new event propagation strategy that 
seems to work for simple widgets but not webkit
      adds  9639da1   comment
      adds  e25d341   xdisp fix
      adds  c1a5b51   some cleanups
      adds  ec741a1   xwgir work
      adds  a1c060a   more robust xwgir button demo
      adds  7744b1d   funny diverged branches
      adds  0cb2c9f   minor doc
      adds  b7ef53c   auto upstream
      adds  a1002a1   auto upstream
      adds  59e6916   auto upstream
      adds  ea0a8e9   auto upstream
      adds  44399ce   auto upstream
      adds  679f5c7   auto upstream
      adds  d23364e   auto upstream
      adds  1083ada   upstream
      adds  7076640   auto upstream
      adds  86dfe9d   auto upstream
      adds  7ae411e   upstream
      adds  2c9934d   auto upstream
      adds  4fe629b   auto upstream
      adds  3381209   auto upstream
      adds  3064c99   auto upstream
      adds  e55fcd3   auto upstream
      adds  8ee071b   auto upstream
      adds  5877a57   auto upstream
      adds  cc21f4c   auto upstream
      adds  cf77a59   auto upstream
      adds  06f6571   auto upstream
      adds  4e3a566   auto upstream
      adds  23e7d63   test git-remote-bzr
      adds  7a1bee4   auto upstream
      adds  f100923   auto upstream
      adds  8d5d86c   auto upstream
      adds  3b2a9bc   trunk versions tha were missed earlier
      adds  5cf62a1   Merge remote-tracking branch 'origin/trunk' into xwidget
      adds  4c71f9d   upstream
      adds  4f09943   Merge remote-tracking branch 'origin/trunk' into xwidget
      adds  e6fa6da   Merge branch 'trunk' into xwidget
      adds  68e3050   mention the git repo
      adds  dd7feba   merge upstream
      adds  628eb36   * src/xwidget.c src/xwidget.h: Add comments to indicate 
to which #ifdef some #endif are associated when it's not obvious.
      adds  8847f11   Small fixes
      adds  7a00481   * src/xwidget.c (Fmake_xwidget): Add a docstring and add 
BUFFER as an optional parameter.
      adds  2958568   * lisp/xwidget-test.el: Add missing provide.
      adds  5a99554   * lisp/xwidget.el: Fix some warnings raised by the 
byte-compiler.
      adds  64548c8   Remove old code related to GOOCANVAS and CLUTTER.
      adds  d4244f6   * src/xwidget.c: Prefix all Lisp keywords on the C side 
by QC (standard convention).
      adds  f8fae09   * src/xwidget.c (syms_of_xwidget): Initialize 
Vxwidget_view_alist (typo).
      adds  5c77269   * src/emacsgtkfixed.c 
(emacs_fixed_gtk_widget_size_allocate): Mark the end of HAVE_XWIDGETS 
protection.
      adds  32a590b   Merge branch 'jave-xwidget' into xwidget
      adds  bfa5288   Merge branch 'xwidget' of 
https://github.com/daimrod/xwidget-emacs into xwidget
      adds  e329845   * lisp/xwidget.el (report-xwidget-bug): Add a function to 
submit a bug with the proper address and pseudo-header. * README.xwidget: 
Update the documentation to mention `report-xwidget-bug'.
      adds  c75684e   * src/xwidget.c: Add missing header.
      adds  2a342ba   Merge branch 'trunk' into xwidget
      adds  1a0f9e5   Merge branch 'jave-xwidget' into xwidget
      adds  ff248cd   * src/xwidget.c: Fix a lot of errors when compiling with 
--enable-checking and --enable-check-lisp-object-type.
      adds  4d3eadf   * src/xwidget.h (XXWIDGET): XXWIDGET expects a 
PSEUDOVECTOR not a display spec.
      adds  d65ea7d   * src/xwidget.c (Fmake_xwidget): Store xwidget in 
Vxwidget_list. (syms_of_xwidget): Rename Vxwidget_alist to Vxwidget_list and 
register `get-buffer-xwidgets' as a new subr. (Fget_buffer_xwidgets): New 
function to return a list of xwidgets attached to the specified buffer.
      adds  da95bc0   Handle xwidgets like processes and delete them when their 
buffer is killed.
      adds  e791b83   * src/.gdbinit (xxwidget): Add convenient command to 
print some information about an xwidget from GDB (similar to xbuffer, xwindow, 
...). (xpr): Use `xxwidget' on PVEC_XWIDGET.
      adds  098e59d   * src/xwidget.h (xwidget_view): Convert member `model' to 
Lisp_Object. (XXWIDGET_VIEW_P, XXWIDGET_VIEW): Add standard macros to 
manipulate xwidget_view. * src/xwidget.c: Fix access to model in xwidget_view 
(now a Lisp_Object).
      adds  663f996   * src/xwidget.c (Fmake_xwidget): Use XSETXWIDGET instead 
of XSETPSEUDOVECTOR.
      adds  4b10003   * src/xwidget.h (XXWIDGET, XXWIDGET_VIEW): Use XUNTAG 
instead of XPNTR (copied from XBUFFER and friends).
      adds  7a76a0a   * src/xwidget.c: Fix access to w in xwidget_view (now a 
Lisp_Object) * src/xwidget.h (xwidget_view): Convert member `w' to Lisp_Object.
      adds  204e1a8   * src/xwidget.c: Replace xwidget_views by 
Vxwidget_view_list.
      adds  1ce45b9   Merge pull request #6 from daimrod/struct_to_Lisp_Object
      adds  3718127   Merge branch 'trunk' into xwidget
      adds  0bb9bb0   Merge branch 'trunk' into xwidget
      adds  a9ec662   * src/print.c (print_object): Add pretty printing for 
xwidget_view.
      adds  54eb6c1   * src/xwidget.h src/xwidget.c (valid_xwidget_spec_p): 
Renamed `valid_xwidget_p' to `valid_xwidget_p'. (XWIDGETP): Rename `XXWIDGETP' 
to `XWIDGETP' and `XXWIDGET_VIEW_P' to `XWIDGET_VIEW_P'. The old `XWIDGETP' is 
now implemented solely in `valid_xwidget_spec_p'. (CHECK_XWIDGET): New macro to 
check whether the argument is a xwidget. (CHECK_XWIDGET_VIEW): New macro to 
check whether the argument is a xwidget_view. * src/print.c src/xdisp.c: Take 
into account the new names.
      adds  bbc0bc1   * src/xwidget.c: Fix indentation.
      adds  aa61edd   * src/xwidget.c (Fxwidget_view_model, 
Fxwidget_view_window): Add accessors to xwidget_view components.
      adds  360a89e   * src/xwidget.c (Fxwidget_view_lookup): Bring 
`xwidget-view-lookup' to the Lisp side. (xwidget_view_lookup): 
`xwidget_view_lookup' is just a wrapper around `xwidget-view-lookup' to convert 
from `struct *' to `Lisp_Object'.
      adds  53e2976   * src/xwidget.c (kill_buffer_xwidgets): Cleanup OSR 
GtkWidget when xwidget are freed.
      adds  b849935   * src/xwidget.c: Add a `query-on-exit' flag to determine 
whether we can kill xwidget when the buffer is killed without confirmation. 
(Fset_xwidget_query_on_exit_flag): New function to set the `query-on-exit' 
flag. (Fxwidget_query_on_exit_flag): New function to retrieve the value of the 
`query-on-exit' flag. (Fmake_xwidget): Set the `query-on-exit' flag to t by 
default. * src/xwidget.h (xwidget): Add new field `kill_without_query'. * 
lisp/xwidget.el (xwidget-kill-buff [...]
      adds  5a422d9   * src/xwidget.c (Fmake_xwidget): Set the initial value of 
`query-on-exit' flag to t (kill_without_query = !query-on-exit).
      adds  a425ea6   * src/xwidget.c (Fxwidget_delete_zombies): Re-implemented 
in Lisp. Note: It is not longer necessary to delete xwidget with killed buffer 
here because it is done automatically when a buffer is killed. 
(Fdelete_xwidget_view): New function to delete the given xwidget-view. * 
lisp/xwidget.el (xwidget-delete-zombies): Re-implementation. * src/xwidget.c 
(Fxwidget_delete_zombies): Re-implemented in Lisp. Note: It is not longer 
necessary to delete xwidget with killed buffer  [...]
      adds  808dcb4   * src/xwidget.c (Fxwidget_info): Fix a regression 
introduced in commit b4e1725be1b96b5335a12d34fdd81b99dededf54.
      adds  6fc319d   * src/xwidget.h (xwidget): Remove old todo.
      adds  e14802f   * lisp/emacs-parallel/parallel.el 
lisp/emacs-parallel/parallel-remote.el: Add Emacs Parallel.
      adds  1eea231   * src/xwidget.c (Fset_frame_visible): Hack to force a 
frame to be considered as visible to trigger the display engine. * 
lisp/xwidget.el (xwidget-display): Force the display engine to create a 
xwidget_view of the given xwidget.
      adds  b5b5d72   * test/automated/test-xwidget.el: Add XWidget test suites.
      adds  84d73d4   * src/xwidget.c (xwidget_init_view): Prevent an error 
while displaying a xwidget of type `cairo' but doesn't do anything useful.
      adds  1122126   Merge pull request #9 from daimrod/quickfix-cairo-view
      adds  feac206   * lisp/xwidget.el: Fix the interaction between 
`image-mode' and xwidget. (xwidget-image-mode-navigation-adaptor 
xwidget-image-mode-navigation-adaptor-p): `flet' has been deprecated and 
`cl-flet' doesn't work like the old `flet', we now use a `defadvice' around 
`image-display-size' instead. (xwidget-webkit-mode-map): No need to use the 
adaptators now.
      adds  7270f24   Merge pull request #7 from 
daimrod/fix-image-mode-interaction
      adds  f0f6659   * src/.gdbinit (xxwidget): Add an optional parameter.
      adds  6c1769c   Merge pull request #8 from daimrod/gdbinit-xwidget
      adds  759dbb1   Merge branch 'trunk' into xwidget
      adds  7e457d9   * lisp/xwidget.el (xwidget-delete-zombies): Rewrite with 
dolist/memq instead of mapcar/find.
      adds  5558a52   * src/xwidget.c (xwidget_init_view): Pass the view rather 
than the model to the callback for "clicked" event so we can retrive the frame 
and remove an old TODO. (buttonclick_handler): Get the frame from the window.
      adds  5677ff6   Always store GTK Widget as GtkWidget*.
      adds  bd0b9e4   * src/xwidget.c (Fmake_xwidget): Remove dead code.
      adds  c778c80   * src/xwidget.c: Redraw only the views on damage-event.
      adds  ede6474   * src/xwidget.c (xwidget_init_view): Remove dead code.
      adds  51c4de3   * src/xwidget.c: Implement events forwarding with the 
set_embedder strategy.
      adds  b42d152   * src/xwidget.c (xwidget_init_view): Transfer all events.
      adds  c569331   * src/xwidget.c (xwidget_init_view): Transfer embedder 
ownership when the pointer enter a widget, not on motion.
      adds  7ec36b1   * src/xwidget.c: Remove old code.
      adds  45219dd   * src/xwidget.c (Fmake_xwidget): Force each widget to be 
shown.
      adds  2427b15   Merge pull request #14 from 
daimrod/offscreen_forward_events
      adds  c39e739   merge from trunk
      adds  5ff84f8   merge from trunk
      adds  a4354e5   remove FRAME_PTR
      adds  30e2a12   merge from trunk
      adds  a24dabe   merge from trunk
      adds  71c3ecb   merge from trunk
      adds  b3797d2   merge from trunk
      adds  0b4c71f   merge from trunk
      adds  7f502f7   merge from trunk
      adds  b795172   merge from trunk
      adds  c84d5d9   merge from trunk
      adds  8cd462f   merge from trunk
      adds  6eb8619   merge from trunk
      adds  f1742c4   merge from trunk
      adds  1272f71   merge from trunk
      adds  6293f2a   merge from trunk
      adds  e87eb45   merge from trunk
      adds  88790a5   merge from trunk
      adds  2da59f8   merge from trunk
      adds  7cb2f8b   merge from trunk
      adds  cc446d1   merge from trunk
      adds  cb0b8a9   merge from trunk
      adds  c5f293d   merge from trunk
      adds  cf79cb9   merge from trunk
      adds  a218d7f   merge from trunk
      adds  f0a5c7b   merge from trunk
      adds  527a4d0   merge from trunk
      adds  f2e32ba   merge from trunk
      adds  d9369d9   merge from trunk
      adds  cdbfa34   merge from trunk
      adds  0d91bd8   merge from trunk
      adds  77df9fa   merge from trunk
      adds  ce7942f   merge from trunk
      adds  0d50a00   merge from trunk
      adds  cfb926e   merge from trunk
      adds  c3f73b4   merge from trunk
      adds  072a48a   merge from trunk
      adds  2d22a50   merge from trunk
      adds  0c405d3   merge from trunk
      adds  d84cbc2   merge from trunk
      adds  89ba610   merge from trunk
      adds  5549710   merge from trunk
      adds  ef7cb56   merge from trunk
      adds  1cd3338   merge from trunk
      adds  0b15597   merge from trunk
      adds  31800c9   merge from trunk
      adds  6c21e9f   merge from trunk
      adds  7a263a5   merge from trunk
      adds  df97ebc   merge from trunk
      adds  144b437   merge from trunk
      adds  e4b4bda   merge from trunk
      adds  98f2993   merge from trunk
      adds  a2125db   merge from trunk
      adds  50bedb9   merge from trunk
      adds  d7d5ffd   merge from trunk
      adds  dd2ec20   merge from trunk
      adds  0139d01   merge from trunk
      adds  45acbe6   merge from trunk
      adds  28bfe21   merge from trunk
      adds  575dd3b   merge from trunk
      adds  8e6a395   merge from trunk
      adds  a6266f5   merge from trunk
      adds  858133b   merge from trunk
      adds  9e72ced   merge from trunk
      adds  6d2a4fc   merge from trunk
      adds  55dff34   merge from trunk
      adds  19abe32   merge from trunk
      adds  daf8a7f   merge from trunk
      adds  4c10e4a   merge from trunk
      adds  8699832   merge from trunk
      adds  807033b   merge from trunk
      adds  1ac42cc   merge from trunk
      adds  4f89fdf   merge from trunk
      adds  4b1afd6   merge from trunk
      adds  8fe38b4   merge from trunk
      adds  6642817   merge from trunk
      adds  bd2867f   merge from trunk
      adds  2bc8a1c   merge from trunk
      adds  2747722   merge from trunk
      adds  e1f065a   merge from trunk
      adds  b55a30c   merge from trunk
      adds  193622b   merge from trunk
      adds  d835645   merge from trunk
      adds  6e5b2bb   merge from trunk
      adds  de1e8cd   merge from trunk
      adds  8604d6f   merge from trunk
      adds  e7a2af3   merge from trunk
      adds  9b28ddc   merge from trunk
      adds  a8761f8   merge from trunk
      adds  fd4e76c   merge from trunk
      adds  06e4bef   merge from trunk
      adds  c20b50e   merge from trunk
      adds  86adbaf   merge from trunk
      adds  433fc48   merge from trunk
      adds  e86a500   merge from trunk
      adds  851186e   merge from trunk
      adds  af31e21   merge from trunk
      adds  3d284db   merge from trunk
      adds  1db2216   merge from trunk
      adds  db3552a   merge from trunk
      adds  0c1b014   merge from trunk
      adds  c921588   * lisp/xwidget.el (xwidget-display): Return a useful 
value. * test/automated/xwidget-tests.el (xwidget-view-p): Use 
`xwidget-display'.
      adds  468b183   Update Emacs Parallel
      adds  edeb7fd   * test/automated/xwidget-tests.el: Emacs parallel API 
changed.
      adds  0718a5a   Merge branch 'xwidget' of 
https://github.com/jave/xwidget-emacs into xwidget
      adds  fc11c16   merge from trunk
      adds  3b40cbc   merge from trunk
      adds  a5bc9517  merge from trunk
      adds  404511d   merge from trunk
      adds  dd9b511   merge from trunk
      adds  b657a57   merge from trunk
      adds  bbe1d42   merge from trunk
      adds  43ee61f   merge from trunk
      adds  5092c2e   merge from trunk
      adds  194dcc0   merge from trunk
      adds  c9cfa86   merge from trunk
      adds  9c5dc5b   merge from trunk
      adds  696296a   merge from trunk
      adds  3b6a294   merge from trunk
      adds  fd535b9   merge from trunk
      adds  f07c6c2   merge from trunk
      adds  98b4218   merge from trunk
      adds  ef581ca   merge from trunk
      adds  fffcc46   merge from trunk
      adds  9d72cbd   merge from trunk
      adds  87174f3   merge from trunk
      adds  5b3399e   merge from trunk
      adds  46ed8fd   merge from trunk
      adds  95a60dc   merge from trunk
      adds  f909b7c   merge from trunk
      adds  f211300   merge from trunk
      adds  4cf8510   merge from trunk
      adds  0fd8418   merge from trunk
      adds  aedb387   merge from trunk
      adds  4bd3d04   merge from trunk
      adds  202cca2   merge from trunk
      adds  8e12af0   merge from trunk
      adds  8847526   merge from trunk
      adds  8131fcf   merge from trunk
      adds  b8e2acd   merge from trunk
      adds  37f54c5   merge from trunk
      adds  de9a657   merge from trunk
      adds  bdc6208   merge from trunk
      adds  9049c89   merge from trunk
      adds  c4dfb69   merge from trunk
      adds  16d3c3f   merge from trunk
      adds  efe162a   merge from trunk
      adds  40d74a5   merge from trunk
      adds  bc468f0   merge from trunk
      adds  b4f7fca   merge from trunk
      adds  22fee39   merge from trunk
      adds  9379797   merge from trunk
      adds  a896e4c   merge from trunk
      adds  339d3a1   merge from trunk
      adds  ffb49902  merge from trunk
      adds  789fc33   merge from trunk
      adds  c635a4f   merge from trunk
      adds  95bca19   merge from trunk
      adds  3537223   merge from trunk
      adds  432336f   merge from trunk
      adds  b08b889   merge from trunk
      adds  5a3ec89   merge from trunk
      adds  9d1c691   merge from trunk
      adds  d5ac6cc   merge from trunk
      adds  369c417   merge from trunk
      adds  c8d61ae   merge from trunk
      adds  6a4bee3   merge from trunk
      adds  e74a8c4   merge from trunk
      adds  a191ef4   merge from trunk
      adds  b27d230   merge from trunk
      adds  478550f   merge from trunk
      adds  9d6363e   merge from trunk
      adds  ebc2ba4   merge from trunk
      adds  92aeabc   merge from trunk
      adds  63dae8e   merge upstream
      adds  ac84563   fix conflicts
      adds  681bd2a   merge from trunk
      adds  46b1dc2   fix conflicts
      adds  a41d9dc   fix conflicts
      adds  95227d0   fix conflicts
      adds  6481f6d   merge from trunk
      adds  fb14d1d   merge from trunk
      adds  9bdba39   merge from trunk
      adds  d1ae916   merge from trunk
      adds  41390a4   merge from trunk
      adds  0b08632   merge from trunk
      adds  6070fc7   merge from trunk
      adds  e9d8fea   merge from trunk
      adds  41c0d73   merge from trunk
      adds  f20bcfe   merge from trunk
      adds  ef064bb   merge from trunk
      adds  04f74f0   merge from trunk
      adds  4407438   merge from trunk
      adds  6138b62   merge from trunk
      adds  dd30d6b   merge from trunk
      adds  7701e07   merge from trunk
      adds  49b2470   merge from trunk
      adds  ff7e4c6   merge from trunk
      adds  a87e9c8   merge from trunk
      adds  d400d0f   merge from trunk
      adds  7cb9e4b   merge from trunk
      adds  376499b   merge from trunk
      adds  64a5e06   merge from trunk
      adds  314d47b   merge from trunk
      adds  09af856   merge from trunk
      adds  9e85e58   merge from trunk
      adds  207a6ff   merge from trunk
      adds  3525167   merge from trunk
      adds  9865802   merge from trunk
      adds  9a99d02   merge from trunk
      adds  5f7470d   merge from trunk
      adds  d4082b3   merge from trunk
      adds  4f6e322   merge from trunk
      adds  584bb3a   merge from trunk
      adds  b501019   merge from trunk
      adds  3c9c017   merge from trunk
      adds  f1a3b0d   merge from trunk
      adds  525dcfd   merge from trunk
      adds  4db1f22   merge from trunk
      adds  e4ccda9   merge from trunk
      adds  9de87b9   merge from trunk
      adds  fda7ba7   merge from trunk
      adds  042cbea   merge from trunk
      adds  8bd2fe3   merge from trunk
      adds  d892820   merge from trunk
      adds  9523ac3   merge from trunk
      adds  2b483f0   merge from trunk
      adds  df15e4f   merge from trunk
      adds  91d9cdf   merge from trunk
      adds  2386911   merge from trunk
      adds  2676aa6   merge from trunk
      adds  2f3ee26   merge from trunk
      adds  c1c9aa2   merge from trunk
      adds  ce81717   upstream
      adds  c4916d5   manual upstream merge
      adds  d92d0dd   fixes: PREPARE_FACE_FOR_DISPLAY was removed, DEFUN less 
lenient
      adds  83c4c05   manual upstream merge
      adds  1d8b8a2   upstream
      adds  5f46725   Merge branch 'master' into xwidget
      adds  703cbed   Merge branch 'master' into xwidget
      adds  cf51c3f   replaced docs with external link
      adds  4105b6a   Improved configury
      adds  baba9e03  merge upstream
      adds  993c4bc   src/macuvs.h.moved showed up, and I removed it.
      adds  1eb82c5   reverted mysterious spuriouschange in otodo-mode
      adds  c26306b   reverting some spurious changes
      adds  446f0ee   delete trailing whitespace
      adds  4423b6a   revert spurious change
      adds  8f0cf0a   removed msysconfig.sh
      adds  1d364da   Removed remains of Clutter experiment
      adds  1048722   Doc strings, and whitespace
      adds  9b7d9c0   trailing whitespace, better ifdef of xwidget code
      adds  35c2e62   a missing merge, trailing whitespace
      adds  6d1cade   whitespace cleanup
      adds  2cef979   whitespace cleanup
      adds  79030ea   whitespace
      adds  aae452a   whitespace cleanup
      adds  e93fd42   whitespace cleanup
      adds  659a0a5   whitespace cleanup
      adds  fe27c32   a missing merge
      adds  c089503   moved xwidget test to the test dir
      adds  db46135   merge master
      adds  a7e2c92   merge master
      adds  78f196e   cleanups
      adds  9681f30   Fixed over-eager ifdef
      adds  5a0d5b7   Merge branch 'master' into xwidget
      adds  66ae0ec   Added two CHECK_STRING of arguments
      adds  d972b50   Removed unused xwidgt pointer
      adds  cc7cb20   merge master, fix conflicts
      adds  a1124bc   Update to new DEFSYM strategy
      adds  0298a2c   merge master
      adds  8a10c68   Bidi test case for xwidgets
      adds  d1ca98e   Fill in some bidi values for xwidgets
      adds  b646755   moved buttons from edge to inside text
      adds  5e22550   merge master
      adds  5769602   bidi bugfix
      adds  54efd2a   merge master
      adds  35471ba   Implement native scrolling of the webkit xwidget
      adds  395a90f   Merge branch 'xwscroll' into xwidget
      adds  fee879f   Merge branch 'master' into xwidget
      adds  e1653dd   Native scrolling
      adds  ffd9ee1   rely less onimage mode
      adds  8628a48   Merge branch 'master' into xwidget
      adds  c8f2ca7   upstream
      adds  0609e90   cleanup
      adds  9e21616   removed spurious diff
      adds  069f101   Cleanup
      adds  487d6cd   webkit scrolling bugfix
      adds  d6ada5a   Merge branch 'master' into xwidget
      adds  5c1d2b0   merge master
      adds  5693f3d   merge master
      adds  bdd672b   Merge branch 'master' into xwidget
      adds  e508727   merge master
      adds  d522fd8   Merge branch 'master' into xwidget
      adds  c251ec9   Fix visual glitch during webkit resizing
      adds  8a6a92f   Improved glitch fix
      adds  f93da81   added hint to webkit buffer
      adds  d464b0e   merge master
      adds  2a9de01   Merge branch 'master' into xwidget
      adds  ac94737   First attempt at bookmark support
      adds  3fd8020   Fix for crash when displaying xwidget in a tty
      adds  4edad42   Fix compile warnings xwidget.el
      adds  69815df   Merge branch 'master' into xwidget
      adds  d75b60c   NEWS entry and Changelog xwidgets
      adds  9fe732a   Better changelog for xwidgets

No new revisions were added by this update.

Summary of changes:
 ChangeLog                               |    4 +
 README.xwidget                          |    2 +
 configure.ac                            |   43 +-
 etc/NEWS                                |    4 +-
 lisp/ChangeLog                          |    9 +
 lisp/emacs-parallel/README.org          |  147 +++
 lisp/emacs-parallel/parallel-remote.el  |   81 ++
 lisp/emacs-parallel/parallel-xwidget.el |   59 +
 lisp/emacs-parallel/parallel.el         |  310 ++++++
 lisp/net/browse-url.el                  |   13 +-
 lisp/xwidget.el                         |  592 ++++++++++
 src/ChangeLog                           |   17 +
 src/Makefile.in                         |   10 +
 src/buffer.c                            |    8 +
 src/dispextern.h                        |   27 +
 src/dispnew.c                           |   12 +
 src/emacs.c                             |    6 +
 src/emacsgtkfixed.c                     |  119 ++-
 src/emacsgtkfixed.h                     |   28 +
 src/keyboard.c                          |   25 +
 src/lisp.h                              |    5 +
 src/print.c                             |   16 +
 src/termhooks.h                         |    4 +
 src/window.c                            |    6 +
 src/xdisp.c                             |  259 +++++-
 src/xterm.c                             |   15 +
 src/xwidget.c                           | 1853 +++++++++++++++++++++++++++++++
 src/xwidget.h                           |  115 ++
 test/ChangeLog                          |    8 +
 test/automated/xwidget-tests.el         |  121 ++
 test/xwidget-test-manual.el             |  204 ++++
 31 files changed, 4100 insertions(+), 22 deletions(-)
 create mode 100644 README.xwidget
 create mode 100644 lisp/emacs-parallel/README.org
 create mode 100644 lisp/emacs-parallel/parallel-remote.el
 create mode 100644 lisp/emacs-parallel/parallel-xwidget.el
 create mode 100644 lisp/emacs-parallel/parallel.el
 create mode 100644 lisp/xwidget.el
 create mode 100644 src/xwidget.c
 create mode 100644 src/xwidget.h
 create mode 100644 test/automated/xwidget-tests.el
 create mode 100644 test/xwidget-test-manual.el



reply via email to

[Prev in Thread] Current Thread [Next in Thread]