Commit be7b2f3e authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from trunk.

parents 9d34ec3e 18480f8f
2011-05-27 David Michael <fedora.dm0@gmail.com>
* files.el (interpreter-mode-alist): Add rbash (bug#8745).
2011-05-27 Chong Yidong <cyd@stupidchicken.com>
* select.el: Support clipboard managers with built-in function
......
......@@ -2523,6 +2523,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
("ksh" . sh-mode)
("oash" . sh-mode)
("pdksh" . sh-mode)
("rbash" . sh-mode)
("rc" . sh-mode)
("rpm" . sh-mode)
("sh" . sh-mode)
......
2011-05-27 Stefan Monnier <monnier@iro.umontreal.ca>
* xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
2011-05-27 Paul Eggert <eggert@cs.ucla.edu>
Integer overflow fixes.
......
......@@ -904,7 +904,8 @@ x_convert_selection (struct input_event *event, Lisp_Object selection_symbol,
converted_selections = cs;
}
RETURN_UNGCPRO (0);
UNGCPRO;
return 0;
}
/* Otherwise, record the converted selection to binary. */
......@@ -919,7 +920,8 @@ x_convert_selection (struct input_event *event, Lisp_Object selection_symbol,
&(cs->data), &(cs->type),
&(cs->size), &(cs->format),
&(cs->nofree));
RETURN_UNGCPRO (1);
UNGCPRO;
return 1;
}
/* Handle a SelectionClear event EVENT, which indicates that some
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment