diff options
author | Kenichi Handa <[email protected]> | 2008-06-19 10:37:11 +0000 |
---|---|---|
committer | Kenichi Handa <[email protected]> | 2008-06-19 10:37:11 +0000 |
commit | 22e64f7c64f1e79062eb1f4925ffe54af33d9de5 (patch) | |
tree | c65e7d0c0b41de7106ccac25341b0d95b030b564 | |
parent | 40ef82425268e306133904b13cc360b8e86f37b3 (diff) |
Include <ctype.h>
(x_set_font_backend): Allow spacing characters in the X resource
for FontBackend.
-rw-r--r-- | src/ChangeLog | 9 | ||||
-rw-r--r-- | src/frame.c | 9 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6a920f22f9..bd8d02017a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,15 @@ +2008-06-19 Kenichi Handa <[email protected]> + + * frame.c: Include <ctype.h>. + (x_set_font_backend): Allow spacing characters in the X resource + for FontBackend. + 2008-06-19 Stefan Monnier <[email protected]> * w32fns.c, xfns.c (Qfont_param): New var. (syms_of_w32fns): Initialize it. - (x_default_font_parameter): Record explicit `font' into `font-parameter'. + (x_default_font_parameter): Record explicit `font' into + `font-parameter'. 2008-06-18 Kenichi Handa <[email protected]> diff --git a/src/frame.c b/src/frame.c index 84a4e54d31..761e6cc9a7 100644 --- a/src/frame.c +++ b/src/frame.c @@ -20,6 +20,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> #include <stdio.h> +#include <ctype.h> #include "lisp.h" #include "character.h" #ifdef HAVE_X_WINDOWS @@ -3419,12 +3420,16 @@ x_set_font_backend (f, new_value, old_value) new_value = Qnil; while (*p0) { - while (*p1 && *p1 != ',') p1++; + while (*p1 && ! isspace (*p1) && *p1 != ',') p1++; if (p0 < p1) new_value = Fcons (Fintern (make_string (p0, p1 - p0), Qnil), new_value); if (*p1) - p1++; + { + int c; + + while ((c = *++p1) && isspace (c)); + } p0 = p1; } new_value = Fnreverse (new_value); |