Mercurial > emacs

changeset 25665:8250026fe76d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(swap_in_symval_forwarding): Change for Lisp_Object selected_frame. (set_internal): Ditto.
author Gerd Moellmann <gerd@gnu.org>
date Mon, 13 Sep 1999 11:13:22 +0000
parents 832aeb9c3996
children 063da8f6a487
files src/data.c
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/data.c	Mon Sep 13 11:13:16 1999 +0000
+++ b/src/data.c	Mon Sep 13 11:13:22 1999 +0000
@@ -845,7 +845,7 @@
   tem1 = XBUFFER_LOCAL_VALUE (valcontents)->buffer;
 
   if (NILP (tem1) || current_buffer != XBUFFER (tem1)
-      || selected_frame != XFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame))
+      || !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame))
     {
       tem1 = XCONS (XBUFFER_LOCAL_VALUE (valcontents)->cdr)->car;
       Fsetcdr (tem1,
@@ -856,7 +856,7 @@
       if (NILP (tem1))
 	{
 	  if (XBUFFER_LOCAL_VALUE (valcontents)->check_frame)
-	    tem1 = assq_no_quit (symbol, selected_frame->param_alist);
+	    tem1 = assq_no_quit (symbol, XFRAME (selected_frame)->param_alist);
 	  if (! NILP (tem1))
 	    XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 1;
 	  else
@@ -867,7 +867,7 @@
 
       XCONS (XBUFFER_LOCAL_VALUE (valcontents)->cdr)->car = tem1;
       XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, current_buffer);
-      XSETFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame, selected_frame);
+      XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame;
       store_symval_forwarding (symbol,
 			       XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
 			       Fcdr (tem1));
@@ -1014,8 +1014,7 @@
 	 we're looking at the default value, the cache is invalid; we
 	 need to write it out, and find the new CURRENT-ALIST-ELEMENT.  */
       if (current_buffer != XBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer)
-	  ||
-	  selected_frame != XFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame)
+	  || !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame)
 	  || (BUFFER_LOCAL_VALUEP (valcontents)
 	      && EQ (XCONS (current_alist_element)->car,
 		     current_alist_element)))
@@ -1044,7 +1043,8 @@
 		  XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 0;
 
 		  if (XBUFFER_LOCAL_VALUE (valcontents)->check_frame)
-		    tem1 = Fassq (symbol, selected_frame->param_alist);
+		    tem1 = Fassq (symbol,
+				  XFRAME (selected_frame)->param_alist);
 
 		  if (! NILP (tem1))
 		    XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame = 1;
@@ -1069,8 +1069,7 @@
 	  /* Set BUFFER and FRAME for binding now loaded.  */
 	  XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer,
 		      current_buffer);
-	  XSETFRAME (XBUFFER_LOCAL_VALUE (valcontents)->frame,
-		     selected_frame);
+	  XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame;
 	}
       valcontents = XBUFFER_LOCAL_VALUE (valcontents)->realvalue;
     }