From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 21 Sep 2011 20:19:18 +0000 (-0700)
Subject: * keymap.c (Fkey_description): Recode slightly to pacify GCC 4.6.1 x86.
X-Git-Tag: emacs-24.2.90~471^2~6^2~204
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3b11691a6e0607221ea6a4eb23415442e90417b0;p=emacs.git

* keymap.c (Fkey_description): Recode slightly to pacify GCC 4.6.1 x86.
---

diff --git a/src/keymap.c b/src/keymap.c
index 2d2f36d91c3..03e4688eaad 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2091,9 +2091,12 @@ spaces are put between sequence elements, etc.  */)
       if (add_meta)
 	{
 	  args[len] = Fsingle_key_description (meta_prefix_char, Qnil);
-	  len += 2;
+	  result = Fconcat (len + 1, args);
 	}
-      result = len == 0 ? empty_unibyte_string : Fconcat (len - 1, args);
+      else if (len == 0)
+	result = empty_unibyte_string;
+      else
+	result = Fconcat (len - 1, args);
       SAFE_FREE ();
       return result;
     }