mirror of
https://github.com/rkd77/elinks.git
synced 2025-09-21 19:46:23 -04:00
Merge commit 'pasky.or.cz/elinks-0.12' into elinks-0.13
There were conflicts in src/document/css/ because 0.12.GIT switched to LIST_OF(struct css_selector) and 0.13.GIT switched to struct css_selector_set. Resolved by using LIST_OF(struct css_selector) inside struct css_selector_set.
This commit is contained in:
committed by
Kalle Olavi Niemitalo
commit
2437d35904
@@ -39,7 +39,7 @@ struct ecmascript_interpreter {
|
||||
* any new snippets in document.onload_snippets). Instead, as we
|
||||
* go through the list we maintain a pointer to the last processed
|
||||
* entry. */
|
||||
struct list_head onload_snippets; /* -> struct string_list_item */
|
||||
LIST_OF(struct string_list_item) onload_snippets;
|
||||
struct string_list_item *current_onload_snippet;
|
||||
|
||||
/* ID of the {struct document} where those onload_snippets belong to.
|
||||
|
Reference in New Issue
Block a user