diff options
author | Richard M. Stallman <rms@gnu.org> | 1995-09-25 18:46:19 +0000 |
---|---|---|
committer | Richard M. Stallman <rms@gnu.org> | 1995-09-25 18:46:19 +0000 |
commit | b5a3ac0f6f504b1b1084a7ee91a0d5a4560e1bb1 (patch) | |
tree | 98f1b08e353a1a3e0e83301ff8fe103b5a90e479 /src/xfns.c | |
parent | 4d93338d18a33293095e5bed99825a7a5ba72a68 (diff) | |
download | emacs-b5a3ac0f6f504b1b1084a7ee91a0d5a4560e1bb1.tar.gz |
(Fx_create_frame): Set up buffer-predicate slot.
(x_decode_color): Get error if color not defined.
Diffstat (limited to 'src/xfns.c')
-rw-r--r-- | src/xfns.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/xfns.c b/src/xfns.c index 31cee63fff2..aeabb1001ae 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -187,7 +187,7 @@ Lisp_Object Qdisplay; /* The below are defined in frame.c. */ extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth; -extern Lisp_Object Qunsplittable, Qmenu_bar_lines; +extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate; extern Lisp_Object Vwindow_system_version; @@ -1165,8 +1165,8 @@ x_decode_color (f, arg, def) if (defined_color (f, XSTRING (arg)->data, &cdef, 1)) return cdef.pixel; - /* defined_color failed; return an ultimate default. */ - return def; + Fsignal (Qerror, Fcons (build_string ("undefined color"), + Fcons (arg, Qnil))); } /* Functions called only from `x_set_frame_param' @@ -3037,6 +3037,8 @@ This function is an internal primitive--use `make-frame' instead.") "menuBar", "MenuBar", number); x_default_parameter (f, parms, Qscroll_bar_width, Qnil, "scrollBarWidth", "ScrollBarWidth", number); + x_default_parameter (f, parms, Qbuffer_predicate, Qnil, + "bufferPredicate", "BufferPredicate", symbol); f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window; window_prompting = x_figure_window_size (f, parms); |