--- a/components/emacs/README	Tue Jan 13 07:55:43 2015 -0800
+++ b/components/emacs/README	Tue Jan 13 10:04:39 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 NAME:             emacs
@@ -36,6 +36,13 @@
 
 - We patch the following changes to the emacs sources:
 
+	calc-forms.patch
+	    calc has a flaw that puts the X11 versions of emacs into a
+            tight loop. This patch comes from the calc maintainer. The
+	    fix was applied to the GNU emacs "master" branch, in September
+	    2014. It will be in version 25.1. We should be able to drop
+	    this patch when we upgrade to, or past, that release.
+
 	face_for_font.patch
 	    xdisp.c has a call to face_for_font(), a function that is
 	    only present when window system support is included, which is