Mercurial > emacs
changeset 76745:f6a525134188
(get_scrap_target_type_list, x_own_selection): Move
assignments outside predicate macros.
(Vselection_converter_alist): Doc fix.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Mon, 26 Mar 2007 08:13:09 +0000 |
| parents | 726af0adfd34 |
| children | d3898ad6d0d5 |
| files | src/macselect.c |
| diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macselect.c Mon Mar 26 08:12:55 2007 +0000 +++ b/src/macselect.c Mon Mar 26 08:13:09 2007 +0000 @@ -386,7 +386,9 @@ { ScrapFlavorType flavor_type = 0; - if (CONSP (XCAR (rest)) && SYMBOLP (target_type = XCAR (XCAR (rest))) + if (CONSP (XCAR (rest)) + && (target_type = XCAR (XCAR (rest)), + SYMBOLP (target_type)) && (flavor_type = scrap_has_target_type (scrap, target_type))) { result = Fcons (target_type, result); @@ -449,9 +451,11 @@ for (rest = Vselection_converter_alist; CONSP (rest); rest = XCDR (rest)) { if (!(CONSP (XCAR (rest)) - && SYMBOLP (type = XCAR (XCAR (rest))) + && (type = XCAR (XCAR (rest)), + SYMBOLP (type)) && valid_scrap_target_type_p (type) - && SYMBOLP (handler_fn = XCDR (XCAR (rest))))) + && (handler_fn = XCDR (XCAR (rest)), + SYMBOLP (handler_fn)))) continue; if (!NILP (handler_fn)) @@ -1852,10 +1856,7 @@ The function should return the value to send to the Scrap Manager \(must be a string). A return value of nil -means that the conversion could not be done. -A return value which is the symbol `NULL' -means that a side-effect was executed, -and there is no meaningful selection value. */); +means that the conversion could not be done. */); Vselection_converter_alist = Qnil; DEFVAR_LISP ("x-lost-selection-functions", &Vx_lost_selection_functions,