Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 880-885)

   - Remove RCS keywords from doc/misc/cc-mode.texi
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-264

1 files changed, 2 insertions, 0 deletions

diff --git a/src/macfns.c b/src/macfns.c
index 71eae699f9a..0330ccd0d44 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -3855,6 +3855,8 @@ x_create_tip_frame (dpyinfo, parms, text)
      the frame is live, as per FRAME_LIVE_P.  If we get a signal
      from this point on, x_destroy_window might screw up reference
      counts etc.  */
+  f->terminal = dpyinfo->terminal;
+  f->terminal->reference_count++;
   f->output_method = output_mac;
   f->output_data.mac =
     (struct mac_output *) xmalloc (sizeof (struct mac_output));