1 files changed, 4 insertions, 2 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index b8f2a4cb8bb..807cbc2b793 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10085,7 +10085,9 @@ select_frame_for_redisplay (frame)
             (BUFFER_LOCAL_VALUEP (val)
              || SOME_BUFFER_LOCAL_VALUEP (val)))
         && XBUFFER_LOCAL_VALUE (val)->check_frame)
-      Fsymbol_value (sym);
+      /* Use find_symbol_value rather than Fsymbol_value
+         to avoid an error if it is void.  */
+      find_symbol_value (sym);
 
   for (tail = XFRAME (old)->param_alist; CONSP (tail); tail = XCDR (tail))
     if (CONSP (XCAR (tail))
@@ -10096,7 +10098,7 @@ select_frame_for_redisplay (frame)
             (BUFFER_LOCAL_VALUEP (val)
              || SOME_BUFFER_LOCAL_VALUEP (val)))
         && XBUFFER_LOCAL_VALUE (val)->check_frame)
-      Fsymbol_value (sym);
+      find_symbol_value (sym);
 }