diff options
| author | Mattias EngdegÄrd | 2024-08-15 16:00:47 +0200 |
|---|---|---|
| committer | Mattias EngdegÄrd | 2024-08-15 16:02:17 +0200 |
| commit | 8db72a8d4b77ccdbb68f7361a52d7f2ebe78b656 (patch) | |
| tree | 31462f8884d9a2cb5dcb253e82421ad1acc71d04 /src/data.c | |
| parent | 03a791556af3b3683921799cce6df2f5ec81c1e7 (diff) | |
| download | emacs-8db72a8d4b77ccdbb68f7361a52d7f2ebe78b656.tar.gz emacs-8db72a8d4b77ccdbb68f7361a52d7f2ebe78b656.zip | |
Replace some EQ with BASE_EQ
* src/eval.c (FletX, Flet, funcall_lambda)
(let_shadows_buffer_binding_p):
* src/data.c (set_blv_found, set_internal, default_value)
(set_default_internal, Flocal_variable_p):
* src/buffer.c (Fkill_buffer):
(mouse_face_overlay_overlaps, compare_overlays)
(report_overlay_modification):
BASE_EQ is safe because we don't actually compare symbols here.
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/data.c b/src/data.c index d947d200870..6fa543c97cf 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -82,7 +82,7 @@ XOBJFWD (lispfwd a) | |||
| 82 | static void | 82 | static void |
| 83 | set_blv_found (struct Lisp_Buffer_Local_Value *blv, int found) | 83 | set_blv_found (struct Lisp_Buffer_Local_Value *blv, int found) |
| 84 | { | 84 | { |
| 85 | eassert (found == !EQ (blv->defcell, blv->valcell)); | 85 | eassert (found == !BASE_EQ (blv->defcell, blv->valcell)); |
| 86 | blv->found = found; | 86 | blv->found = found; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| @@ -1697,9 +1697,9 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where, | |||
| 1697 | loaded, or if it's a Lisp_Buffer_Local_Value and | 1697 | loaded, or if it's a Lisp_Buffer_Local_Value and |
| 1698 | the default binding is loaded, the loaded binding may be the | 1698 | the default binding is loaded, the loaded binding may be the |
| 1699 | wrong one. */ | 1699 | wrong one. */ |
| 1700 | if (!EQ (blv->where, where) | 1700 | if (!BASE_EQ (blv->where, where) |
| 1701 | /* Also unload a global binding (if the var is local_if_set). */ | 1701 | /* Also unload a global binding (if the var is local_if_set). */ |
| 1702 | || (EQ (blv->valcell, blv->defcell))) | 1702 | || (BASE_EQ (blv->valcell, blv->defcell))) |
| 1703 | { | 1703 | { |
| 1704 | /* The currently loaded binding is not necessarily valid. | 1704 | /* The currently loaded binding is not necessarily valid. |
| 1705 | We need to unload it, and choose a new binding. */ | 1705 | We need to unload it, and choose a new binding. */ |
| @@ -1940,7 +1940,7 @@ default_value (Lisp_Object symbol) | |||
| 1940 | But the `realvalue' slot may be more up to date, since | 1940 | But the `realvalue' slot may be more up to date, since |
| 1941 | ordinary setq stores just that slot. So use that. */ | 1941 | ordinary setq stores just that slot. So use that. */ |
| 1942 | struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); | 1942 | struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
| 1943 | if (blv->fwd.fwdptr && EQ (blv->valcell, blv->defcell)) | 1943 | if (blv->fwd.fwdptr && BASE_EQ (blv->valcell, blv->defcell)) |
| 1944 | return do_symval_forwarding (blv->fwd); | 1944 | return do_symval_forwarding (blv->fwd); |
| 1945 | else | 1945 | else |
| 1946 | return XCDR (blv->defcell); | 1946 | return XCDR (blv->defcell); |
| @@ -2035,7 +2035,7 @@ set_default_internal (Lisp_Object symbol, Lisp_Object value, | |||
| 2035 | XSETCDR (blv->defcell, value); | 2035 | XSETCDR (blv->defcell, value); |
| 2036 | 2036 | ||
| 2037 | /* If the default binding is now loaded, set the REALVALUE slot too. */ | 2037 | /* If the default binding is now loaded, set the REALVALUE slot too. */ |
| 2038 | if (blv->fwd.fwdptr && EQ (blv->defcell, blv->valcell)) | 2038 | if (blv->fwd.fwdptr && BASE_EQ (blv->defcell, blv->valcell)) |
| 2039 | store_symval_forwarding (blv->fwd, value, NULL); | 2039 | store_symval_forwarding (blv->fwd, value, NULL); |
| 2040 | return; | 2040 | return; |
| 2041 | } | 2041 | } |
| @@ -2401,7 +2401,7 @@ Also see `buffer-local-boundp'.*/) | |||
| 2401 | XSETBUFFER (tmp, buf); | 2401 | XSETBUFFER (tmp, buf); |
| 2402 | XSETSYMBOL (variable, sym); /* Update in case of aliasing. */ | 2402 | XSETSYMBOL (variable, sym); /* Update in case of aliasing. */ |
| 2403 | 2403 | ||
| 2404 | if (EQ (blv->where, tmp)) /* The binding is already loaded. */ | 2404 | if (BASE_EQ (blv->where, tmp)) /* The binding is already loaded. */ |
| 2405 | return blv_found (blv) ? Qt : Qnil; | 2405 | return blv_found (blv) ? Qt : Qnil; |
| 2406 | else | 2406 | else |
| 2407 | return NILP (assq_no_quit (variable, BVAR (buf, local_var_alist))) | 2407 | return NILP (assq_no_quit (variable, BVAR (buf, local_var_alist))) |