diff options
| author | Mattias EngdegÄrd | 2022-06-12 12:05:03 +0200 |
|---|---|---|
| committer | Mattias EngdegÄrd | 2022-06-12 12:42:35 +0200 |
| commit | bab1d412801eead715f1465131aa3734558f35ab (patch) | |
| tree | 7d91b615721dcff56df153b22c6349a8b337223a /src/pgtkfns.c | |
| parent | 980009e84c817b9a5357dfe4d735cb5c10b974bb (diff) | |
| download | emacs-bab1d412801eead715f1465131aa3734558f35ab.tar.gz emacs-bab1d412801eead715f1465131aa3734558f35ab.zip | |
Use BASE_EQ when comparing with Qunbound
Qunbound is uninterned and can therefore never be EQ to any symbol
with position.
* src/buffer.c (Fbuffer_local_value, buffer_lisp_local_variables)
(buffer_local_variables_1):
* src/bytecode.c (exec_byte_code):
* src/comp.c (compile_function, Fcomp__compile_ctxt_to_file):
* src/composite.c (composition_gstring_cache_clear_font):
* src/data.c (Fboundp, Fsymbol_value, set_internal)
(Fdefault_boundp, Fdefault_value, Fmake_variable_buffer_local):
* src/emacs-module.c (module_global_reference_p):
* src/eval.c (Fdefault_toplevel_value, defvar)
(run_hook_with_args):
* src/fns.c (hash_put, Fmaphash):
* src/font.c (font_put_extra):
* src/frame.c (gui_set_frame_parameters)
(gui_frame_get_and_record_arg, gui_default_parameter)
(gui_figure_window_size):
* src/haikufns.c (get_geometry_from_preferences)
(haiku_create_frame, haiku_create_tip_frame):
* src/haikuterm.c (haiku_draw_text_decoration)
(haiku_default_font_parameter):
* src/json.c (lisp_to_json_nonscalar_1):
* src/keymap.c (access_keymap_1, access_keymap, current_minor_maps):
* src/lread.c (readevalloop, define_symbol):
* src/minibuf.c (read_minibuf, Ftry_completion):
(Fall_completions, Ftest_completion):
* src/pgtkfns.c (pgtk_default_font_parameter, Fx_create_frame)
(x_create_tip_frame):
* src/pgtkselect.c (Fpgtk_own_selection_internal):
* src/print.c (print):
* src/profiler.c (evict_lower_half, record_backtrace):
* src/terminal.c (create_terminal):
* src/textprop.c (set_properties):
* src/w32fns.c (my_create_window, w32_icon)
(w32_default_font_parameter, Fx_create_frame)
(w32_create_tip_frame):
* src/w32term.c (w32_draw_glyph_string):
* src/xdisp.c (handle_single_display_spec)
(cursor_row_fully_visible_p, calc_pixel_width_or_height):
* src/xfns.c (x_default_scroll_bar_color_parameter, x_icon_verify)
(x_icon, x_default_font_parameter, Fx_create_frame)
(x_create_tip_frame):
* src/xselect.c (x_handle_selection_request):
* src/xterm.c (x_draw_glyph_string, x_term_init):
Use BASE_EQ instead of EQ when comparing with Qunbound.
Diffstat (limited to 'src/pgtkfns.c')
| -rw-r--r-- | src/pgtkfns.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/pgtkfns.c b/src/pgtkfns.c index 35e3c10589b..294bdb37917 100644 --- a/src/pgtkfns.c +++ b/src/pgtkfns.c | |||
| @@ -1068,7 +1068,7 @@ pgtk_default_font_parameter (struct frame *f, Lisp_Object parms) | |||
| 1068 | gui_display_get_arg (dpyinfo, parms, Qfont, NULL, NULL, | 1068 | gui_display_get_arg (dpyinfo, parms, Qfont, NULL, NULL, |
| 1069 | RES_TYPE_STRING); | 1069 | RES_TYPE_STRING); |
| 1070 | Lisp_Object font = Qnil; | 1070 | Lisp_Object font = Qnil; |
| 1071 | if (EQ (font_param, Qunbound)) | 1071 | if (BASE_EQ (font_param, Qunbound)) |
| 1072 | font_param = Qnil; | 1072 | font_param = Qnil; |
| 1073 | 1073 | ||
| 1074 | if (NILP (font_param)) | 1074 | if (NILP (font_param)) |
| @@ -1221,10 +1221,10 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1221 | 1221 | ||
| 1222 | display = | 1222 | display = |
| 1223 | gui_display_get_arg (dpyinfo, parms, Qterminal, 0, 0, RES_TYPE_NUMBER); | 1223 | gui_display_get_arg (dpyinfo, parms, Qterminal, 0, 0, RES_TYPE_NUMBER); |
| 1224 | if (EQ (display, Qunbound)) | 1224 | if (BASE_EQ (display, Qunbound)) |
| 1225 | display = | 1225 | display = |
| 1226 | gui_display_get_arg (dpyinfo, parms, Qdisplay, 0, 0, RES_TYPE_STRING); | 1226 | gui_display_get_arg (dpyinfo, parms, Qdisplay, 0, 0, RES_TYPE_STRING); |
| 1227 | if (EQ (display, Qunbound)) | 1227 | if (BASE_EQ (display, Qunbound)) |
| 1228 | display = Qnil; | 1228 | display = Qnil; |
| 1229 | dpyinfo = check_pgtk_display_info (display); | 1229 | dpyinfo = check_pgtk_display_info (display); |
| 1230 | kb = dpyinfo->terminal->kboard; | 1230 | kb = dpyinfo->terminal->kboard; |
| @@ -1235,7 +1235,7 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1235 | name = | 1235 | name = |
| 1236 | gui_display_get_arg (dpyinfo, parms, Qname, "name", "Name", | 1236 | gui_display_get_arg (dpyinfo, parms, Qname, "name", "Name", |
| 1237 | RES_TYPE_STRING); | 1237 | RES_TYPE_STRING); |
| 1238 | if (!STRINGP (name) && !EQ (name, Qunbound) && !NILP (name)) | 1238 | if (!STRINGP (name) && !BASE_EQ (name, Qunbound) && !NILP (name)) |
| 1239 | error ("Invalid frame name--not a string or nil"); | 1239 | error ("Invalid frame name--not a string or nil"); |
| 1240 | 1240 | ||
| 1241 | if (STRINGP (name)) | 1241 | if (STRINGP (name)) |
| @@ -1245,7 +1245,7 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1245 | parent = | 1245 | parent = |
| 1246 | gui_display_get_arg (dpyinfo, parms, Qparent_id, NULL, NULL, | 1246 | gui_display_get_arg (dpyinfo, parms, Qparent_id, NULL, NULL, |
| 1247 | RES_TYPE_NUMBER); | 1247 | RES_TYPE_NUMBER); |
| 1248 | if (EQ (parent, Qunbound)) | 1248 | if (BASE_EQ (parent, Qunbound)) |
| 1249 | parent = Qnil; | 1249 | parent = Qnil; |
| 1250 | if (!NILP (parent)) | 1250 | if (!NILP (parent)) |
| 1251 | CHECK_NUMBER (parent); | 1251 | CHECK_NUMBER (parent); |
| @@ -1271,7 +1271,7 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1271 | RES_TYPE_SYMBOL); | 1271 | RES_TYPE_SYMBOL); |
| 1272 | /* Accept parent-frame iff parent-id was not specified. */ | 1272 | /* Accept parent-frame iff parent-id was not specified. */ |
| 1273 | if (!NILP (parent) | 1273 | if (!NILP (parent) |
| 1274 | || EQ (parent_frame, Qunbound) | 1274 | || BASE_EQ (parent_frame, Qunbound) |
| 1275 | || NILP (parent_frame) | 1275 | || NILP (parent_frame) |
| 1276 | || !FRAMEP (parent_frame) | 1276 | || !FRAMEP (parent_frame) |
| 1277 | || !FRAME_LIVE_P (XFRAME (parent_frame)) | 1277 | || !FRAME_LIVE_P (XFRAME (parent_frame)) |
| @@ -1285,7 +1285,7 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1285 | (tem = | 1285 | (tem = |
| 1286 | (gui_display_get_arg | 1286 | (gui_display_get_arg |
| 1287 | (dpyinfo, parms, Qundecorated, NULL, NULL, RES_TYPE_BOOLEAN))) | 1287 | (dpyinfo, parms, Qundecorated, NULL, NULL, RES_TYPE_BOOLEAN))) |
| 1288 | && !(EQ (tem, Qunbound))) | 1288 | && !(BASE_EQ (tem, Qunbound))) |
| 1289 | undecorated = true; | 1289 | undecorated = true; |
| 1290 | 1290 | ||
| 1291 | FRAME_UNDECORATED (f) = undecorated; | 1291 | FRAME_UNDECORATED (f) = undecorated; |
| @@ -1295,7 +1295,7 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1295 | (tem = | 1295 | (tem = |
| 1296 | (gui_display_get_arg | 1296 | (gui_display_get_arg |
| 1297 | (dpyinfo, parms, Qoverride_redirect, NULL, NULL, RES_TYPE_BOOLEAN))) | 1297 | (dpyinfo, parms, Qoverride_redirect, NULL, NULL, RES_TYPE_BOOLEAN))) |
| 1298 | && !(EQ (tem, Qunbound))) | 1298 | && !(BASE_EQ (tem, Qunbound))) |
| 1299 | override_redirect = true; | 1299 | override_redirect = true; |
| 1300 | 1300 | ||
| 1301 | FRAME_OVERRIDE_REDIRECT (f) = override_redirect; | 1301 | FRAME_OVERRIDE_REDIRECT (f) = override_redirect; |
| @@ -1371,7 +1371,7 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1371 | 1371 | ||
| 1372 | /* Set the name; the functions to which we pass f expect the name to | 1372 | /* Set the name; the functions to which we pass f expect the name to |
| 1373 | be set. */ | 1373 | be set. */ |
| 1374 | if (EQ (name, Qunbound) || NILP (name)) | 1374 | if (BASE_EQ (name, Qunbound) || NILP (name)) |
| 1375 | { | 1375 | { |
| 1376 | fset_name (f, build_string (dpyinfo->x_id_name)); | 1376 | fset_name (f, build_string (dpyinfo->x_id_name)); |
| 1377 | f->explicit_name = false; | 1377 | f->explicit_name = false; |
| @@ -1414,7 +1414,7 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1414 | value = gui_display_get_arg (dpyinfo, parms, Qinternal_border_width, | 1414 | value = gui_display_get_arg (dpyinfo, parms, Qinternal_border_width, |
| 1415 | "internalBorder", "internalBorder", | 1415 | "internalBorder", "internalBorder", |
| 1416 | RES_TYPE_NUMBER); | 1416 | RES_TYPE_NUMBER); |
| 1417 | if (!EQ (value, Qunbound)) | 1417 | if (!BASE_EQ (value, Qunbound)) |
| 1418 | parms = Fcons (Fcons (Qinternal_border_width, value), parms); | 1418 | parms = Fcons (Fcons (Qinternal_border_width, value), parms); |
| 1419 | } | 1419 | } |
| 1420 | 1420 | ||
| @@ -1431,7 +1431,7 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1431 | value = gui_display_get_arg (dpyinfo, parms, Qchild_frame_border_width, | 1431 | value = gui_display_get_arg (dpyinfo, parms, Qchild_frame_border_width, |
| 1432 | "childFrameBorder", "childFrameBorder", | 1432 | "childFrameBorder", "childFrameBorder", |
| 1433 | RES_TYPE_NUMBER); | 1433 | RES_TYPE_NUMBER); |
| 1434 | if (! EQ (value, Qunbound)) | 1434 | if (! BASE_EQ (value, Qunbound)) |
| 1435 | parms = Fcons (Fcons (Qchild_frame_border_width, value), | 1435 | parms = Fcons (Fcons (Qchild_frame_border_width, value), |
| 1436 | parms); | 1436 | parms); |
| 1437 | 1437 | ||
| @@ -1695,7 +1695,7 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1695 | } | 1695 | } |
| 1696 | else | 1696 | else |
| 1697 | { | 1697 | { |
| 1698 | if (EQ (visibility, Qunbound)) | 1698 | if (BASE_EQ (visibility, Qunbound)) |
| 1699 | visibility = Qt; | 1699 | visibility = Qt; |
| 1700 | 1700 | ||
| 1701 | if (!NILP (visibility)) | 1701 | if (!NILP (visibility)) |
| @@ -1709,7 +1709,7 @@ This function is an internal primitive--use `make-frame' instead. */ ) | |||
| 1709 | from `x-create-frame-with-faces' (see above comment). */ | 1709 | from `x-create-frame-with-faces' (see above comment). */ |
| 1710 | f->was_invisible | 1710 | f->was_invisible |
| 1711 | = (f->was_invisible | 1711 | = (f->was_invisible |
| 1712 | && (!EQ (height, Qunbound) || !EQ (width, Qunbound))); | 1712 | && (!BASE_EQ (height, Qunbound) || !BASE_EQ (width, Qunbound))); |
| 1713 | 1713 | ||
| 1714 | store_frame_param (f, Qvisibility, visibility); | 1714 | store_frame_param (f, Qvisibility, visibility); |
| 1715 | } | 1715 | } |
| @@ -2677,7 +2677,7 @@ x_create_tip_frame (struct pgtk_display_info *dpyinfo, Lisp_Object parms, struct | |||
| 2677 | name = gui_display_get_arg (dpyinfo, parms, Qname, "name", "Name", | 2677 | name = gui_display_get_arg (dpyinfo, parms, Qname, "name", "Name", |
| 2678 | RES_TYPE_STRING); | 2678 | RES_TYPE_STRING); |
| 2679 | if (!STRINGP (name) | 2679 | if (!STRINGP (name) |
| 2680 | && !EQ (name, Qunbound) | 2680 | && !BASE_EQ (name, Qunbound) |
| 2681 | && !NILP (name)) | 2681 | && !NILP (name)) |
| 2682 | error ("Invalid frame name--not a string or nil"); | 2682 | error ("Invalid frame name--not a string or nil"); |
| 2683 | 2683 | ||
| @@ -2728,7 +2728,7 @@ x_create_tip_frame (struct pgtk_display_info *dpyinfo, Lisp_Object parms, struct | |||
| 2728 | 2728 | ||
| 2729 | /* Set the name; the functions to which we pass f expect the name to | 2729 | /* Set the name; the functions to which we pass f expect the name to |
| 2730 | be set. */ | 2730 | be set. */ |
| 2731 | if (EQ (name, Qunbound) || NILP (name)) | 2731 | if (BASE_EQ (name, Qunbound) || NILP (name)) |
| 2732 | { | 2732 | { |
| 2733 | fset_name (f, build_string (dpyinfo->x_id_name)); | 2733 | fset_name (f, build_string (dpyinfo->x_id_name)); |
| 2734 | f->explicit_name = false; | 2734 | f->explicit_name = false; |
| @@ -2769,7 +2769,7 @@ x_create_tip_frame (struct pgtk_display_info *dpyinfo, Lisp_Object parms, struct | |||
| 2769 | value = gui_display_get_arg (dpyinfo, parms, Qinternal_border_width, | 2769 | value = gui_display_get_arg (dpyinfo, parms, Qinternal_border_width, |
| 2770 | "internalBorder", "internalBorder", | 2770 | "internalBorder", "internalBorder", |
| 2771 | RES_TYPE_NUMBER); | 2771 | RES_TYPE_NUMBER); |
| 2772 | if (! EQ (value, Qunbound)) | 2772 | if (! BASE_EQ (value, Qunbound)) |
| 2773 | parms = Fcons (Fcons (Qinternal_border_width, value), | 2773 | parms = Fcons (Fcons (Qinternal_border_width, value), |
| 2774 | parms); | 2774 | parms); |
| 2775 | } | 2775 | } |