aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2011-08-23 13:26:04 +0200
committerJoakim Verona2011-08-23 13:26:04 +0200
commit91a91767a52dccd75bfb3fee1f4e2c75c5e475f9 (patch)
tree851a295531ba9cafe57176575badfee442855ed9
parentf8012bc3ef48dd207da5b517fd22b4ac241e88bb (diff)
downloademacs-91a91767a52dccd75bfb3fee1f4e2c75c5e475f9.tar.gz
emacs-91a91767a52dccd75bfb3fee1f4e2c75c5e475f9.zip
typo
-rw-r--r--README.xwidget96
-rw-r--r--lisp/xwidget.el2
2 files changed, 97 insertions, 1 deletions
diff --git a/README.xwidget b/README.xwidget
index 90dbf2f5d2b..2282134a49d 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -247,6 +247,102 @@ Emacs sockets.
247 in that case not phantomed. 247 in that case not phantomed.
248 248
249* ToDo:s 249* ToDo:s
250** TODO again a trace
251[2011-08-23 Tue]
252the hunch is that since I still hand-wave the view storage the array
253can get out of synchronous. so maybe switching to a lisp structure
254will help as it did for the model. Anyway, doesnt happen at all often.
255*** the trace
256(gdb) bt
257#0 0x0000000000685304 in xwidget_touch (xv=0x0) at xwidget.c:1225
258#1 0x00000000006853e7 in xwidget_end_redisplay (w=0x11b42ca0, matrix=
259 0xff9bf40) at xwidget.c:1272
260#2 0x000000000041cc31 in update_window (w=0x11b42ca0, force_p=0)
261 at dispnew.c:3705
262#3 0x000000000041c0e5 in update_window_tree (w=0x11b42ca0, force_p=0)
263 at dispnew.c:3331
264#4 0x000000000041be8b in update_frame (f=0x1682a50, force_p=0,
265 inhibit_hairy_id_p=0) at dispnew.c:3258
266#5 0x000000000045066f in redisplay_internal () at xdisp.c:12931
267#6 0x000000000044e210 in redisplay () at xdisp.c:12110
268#7 0x0000000000567e65 in read_char (commandflag=1, nmaps=7, maps=
269 0x7fffffffc040, prev_event=12708226, used_mouse_menu=0x7fffffffc254,
270 end_time=0x0) at keyboard.c:2447
271#8 0x000000000057613c in read_key_sequence (keybuf=0x7fffffffc4a0, bufsize=
272 30, prompt=12708226, dont_downcase_last=0, can_return_switch_frame=1,
273 fix_current_buffer=1) at keyboard.c:9299
274#9 0x0000000000565d45 in command_loop_1 () at keyboard.c:1448
275#10 0x0000000000601008 in internal_condition_case (bfun=
276 0x565962 <command_loop_1>, handlers=12760466, hfun=0x565259 <cmd_error>)
277 at eval.c:1490
278#11 0x0000000000565659 in command_loop_2 (ignore=12708226) at keyboard.c:1159
279#12 0x0000000000600992 in internal_catch (tag=12873826, func=
280---Type <return> to continue, or q <return> to quit---
281 0x565633 <command_loop_2>, arg=12708226) at eval.c:1247
282#13 0x00000000005655bd in command_loop () at keyboard.c:1124
283#14 0x0000000000564da7 in recursive_edit_1 () at keyboard.c:759
284#15 0x0000000000564f43 in Frecursive_edit () at keyboard.c:823
285#16 0x000000000060444f in Ffuncall (nargs=1, args=0x7fffffffca20)
286 at eval.c:2986
287#17 0x00000000006507f8 in exec_byte_code (bytestr=145172929, vector=145179445,
288 maxdepth=116, args_template=12708226, nargs=0, args=0x0) at bytecode.c:785
289#18 0x0000000000604eec in funcall_lambda (fun=140575909, nargs=2, arg_vector=
290 0x7fffffffcfe8) at eval.c:3220
291#19 0x000000000060467e in Ffuncall (nargs=3, args=0x7fffffffcfe0)
292 at eval.c:3038
293#20 0x00000000006035fc in Fapply (nargs=2, args=0x7fffffffd0b0) at eval.c:2494
294#21 0x0000000000603b43 in apply1 (fn=12874242, arg=301666310) at eval.c:2732
295#22 0x00000000005feb25 in call_debugger (arg=301666310) at eval.c:220
296#23 0x0000000000601ca9 in maybe_call_debugger (conditions=9431542, sig=
297 12761282, data=301666742) at eval.c:1893
298#24 0x0000000000601785 in Fsignal (error_symbol=12761282, data=301666742)
299 at eval.c:1714
300#25 0x0000000000601898 in xsignal (error_symbol=12761282, data=301666742)
301 at eval.c:1749
302#26 0x0000000000601926 in xsignal2 (error_symbol=12761282, arg1=102756373,
303 arg2=0) at eval.c:1770
304---Type <return> to continue, or q <return> to quit---
305#27 0x0000000000604d6e in funcall_lambda (fun=102756373, nargs=0, arg_vector=
306 0x7fffffffd398) at eval.c:3189
307#28 0x000000000060467e in Ffuncall (nargs=1, args=0x7fffffffd390)
308 at eval.c:3038
309#29 0x00000000006507f8 in exec_byte_code (bytestr=54783137, vector=109656229,
310 maxdepth=12, args_template=12708226, nargs=0, args=0x0) at bytecode.c:785
311#30 0x0000000000604eec in funcall_lambda (fun=109656517, nargs=0, arg_vector=
312 0x7fffffffd890) at eval.c:3220
313#31 0x000000000060467e in Ffuncall (nargs=1, args=0x7fffffffd888)
314 at eval.c:3038
315#32 0x0000000000603b08 in apply1 (fn=109656517, arg=12708226) at eval.c:2725
316#33 0x00000000005fc8c9 in Fcall_interactively (function=109656517, record_flag=
317 12708226, keys=12754549) at callint.c:379
318#34 0x00000000006044c2 in Ffuncall (nargs=4, args=0x7fffffffdc60)
319 at eval.c:2996
320#35 0x0000000000603c57 in call3 (fn=12893554, arg1=109656517, arg2=12708226,
321 arg3=12708226) at eval.c:2789
322#36 0x00000000005784cd in Fcommand_execute (cmd=109656517, record_flag=
323 12708226, keys=12708226, special=12708226) at keyboard.c:10290
324#37 0x00000000005661fb in command_loop_1 () at keyboard.c:1575
325#38 0x0000000000601008 in internal_condition_case (bfun=
326 0x565962 <command_loop_1>, handlers=12760466, hfun=0x565259 <cmd_error>)
327 at eval.c:1490
328---Type <return> to continue, or q <return> to quit---
329#39 0x0000000000565659 in command_loop_2 (ignore=12708226) at keyboard.c:1159
330#40 0x0000000000600992 in internal_catch (tag=12756258, func=
331 0x565633 <command_loop_2>, arg=12708226) at eval.c:1247
332#41 0x000000000056560c in command_loop () at keyboard.c:1138
333#42 0x0000000000564da7 in recursive_edit_1 () at keyboard.c:759
334#43 0x0000000000564f43 in Frecursive_edit () at keyboard.c:823
335#44 0x0000000000563052 in main (argc=1, argv=0x7fffffffe678) at emacs.c:1711
336
337Lisp Backtrace:
338"recursive-edit" (0xffffca28)
339"debug" (0xffffcfe8)
340"image-bol" (0xffffd398)
3410x68939c0 PVEC_COMPILED
342"call-interactively" (0xffffdc68)
343(gdb)
344
345
250** DONE new annoying trace 346** DONE new annoying trace
251 CLOSED: [2011-08-13 Sat 16:16] 347 CLOSED: [2011-08-13 Sat 16:16]
252maybe related to scroll inhibiting or cursor inhibiting code. 348maybe related to scroll inhibiting or cursor inhibiting code.
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index b4308008939..22d80405869 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -282,7 +282,7 @@ Argument H height."
282 (interactive) 282 (interactive)
283 (xwidget-webkit-execute-script ( xwidget-webkit-current-session) "history.go(0);")) 283 (xwidget-webkit-execute-script ( xwidget-webkit-current-session) "history.go(0);"))
284 284
285(defun xwidget-webit-current-url () 285(defun xwidget-webkit-current-url ()
286 "Get the webkit url. place it on kill ring." 286 "Get the webkit url. place it on kill ring."
287 (interactive) 287 (interactive)
288 ;;notice the fugly "title" hack. it is needed because the webkit api doesnt support returning values. 288 ;;notice the fugly "title" hack. it is needed because the webkit api doesnt support returning values.