From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 31 Dec 1993 03:05:39 +0000 (+0000)
Subject: (Fsubstitute_command_keys): Fix previous change.
X-Git-Tag: emacs-19.34~10474
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef586bbd32f786783ad6642a754a2f7b39c06bd0;p=emacs.git

(Fsubstitute_command_keys): Fix previous change.
---

diff --git a/src/doc.c b/src/doc.c
index aee321c3420..616ee271a69 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -430,9 +430,12 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
 	  /* Disregard menu bar bindings; it is positively annoying to
 	     mention them when there's no menu bar, and it isn't terribly
 	     useful even when there is a menu bar.  */
-	  firstkey = Faref (tem, make_number (0));
-	  if (EQ (firstkey, Qmenu_bar))
-	    tem = Qnil;
+	  if (!NILP (tem))
+	    {
+	      firstkey = Faref (tem, make_number (0));
+	      if (EQ (firstkey, Qmenu_bar))
+		tem = Qnil;
+	    }
 
 	  if (NILP (tem))	/* but not on any keys */
 	    {