diff --git a/src/indent.c b/src/indent.c
index 26507b5eb5..79841a3d2c 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -76,15 +76,17 @@ buffer_display_table (void)
 static int
 character_width (int c, struct Lisp_Char_Table *dp)
 {
-  Lisp_Object elt;
-
   /* These width computations were determined by examining the cases
      in display_text_line.  */
 
   /* Everything can be handled by the display table, if it's
      present and the element is right.  */
-  if (dp && (elt = DISP_CHAR_VECTOR (dp, c), VECTORP (elt)))
-    return ASIZE (elt);
+  if (dp)
+    {
+      Lisp_Object elt = DISP_CHAR_VECTOR (dp, c);
+      if (VECTORP (elt))
+	return ASIZE (elt);
+    }
 
   /* Some characters are special.  */
   if (c == '\n' || c == '\t' || c == '\015')