*** choice.c.orig	Mon Dec 23 14:06:57 1996
--- choice.c	Sat Dec 28 10:31:25 1996
***************
*** 1750,1754 ****
        case CHOICE_FILE:
           if (delta == 0) {
!             return FileMenu(x, y, FALSE);
           } else {
              switch (pageStyle) {
--- 1750,1757 ----
        case CHOICE_FILE:
           if (delta == 0) {
!             int rc=FileMenu(x, y, FALSE);
! 
!             cycleThroughChoice = FALSE;
!             return rc;
           } else {
              switch (pageStyle) {
*** font.c.orig	Wed Dec 25 08:39:10 1996
--- font.c	Sat Dec 28 10:32:27 1996
***************
*** 1509,1512 ****
--- 1509,1516 ----
  {
     if (topPushedFontStk == NULL) {
+       if (!editingText) {
+          /* NewCurText() doesn't call PushCurFont() */
+          return;
+       }
        Msg("Possible fatal error.  Please read the terminal error output.");
        fprintf(stderr, "Warning:  empty stack in SetPushedFontValue().\n");
*** patchlvl.h.orig	Thu Oct 31 08:08:11 1996
--- patchlvl.h	Sat Dec 28 10:29:51 1996
***************
*** 34,38 ****
  #define _TGIF_PATCHLEVEL_H_
  
! #define TGIF_PATCHLEVEL 11
  
  #endif /*_TGIF_PATCHLEVEL_H_*/
--- 34,38 ----
  #define _TGIF_PATCHLEVEL_H_
  
! #define TGIF_PATCHLEVEL 12
  
  #endif /*_TGIF_PATCHLEVEL_H_*/
*** Imakefile.orig	Sat Dec 28 10:28:22 1996
--- Imakefile	Sat Dec 28 10:28:52 1996
***************
*** 45,49 ****
  XCOMM EXTRA_LDOPTIONS	=
  
! TGIFVERSION	= 3.0-p11
  PROGRAMS	= tgif prtgif XCOMM frontend11.o testdrive
  XCOMM CDEBUGFLAGS= -g
--- 45,49 ----
  XCOMM EXTRA_LDOPTIONS	=
  
! TGIFVERSION	= 3.0-p12
  PROGRAMS	= tgif prtgif XCOMM frontend11.o testdrive
  XCOMM CDEBUGFLAGS= -g
*** HISTORY.orig	Wed Dec 25 22:29:46 1996
--- HISTORY	Sat Dec 28 10:36:35 1996
***************
*** 1,2 ****
--- 1,8 ----
+ -----------------------> tgif-3.0-p11 => tgif-3.0-p12 <-----------------------
+ Here's a short list of added features/bug fixes.
+ 
+ 1)  Fix a bogus message, 'Warning:  empty stack in SetPushedFontValue().'
+     Thanks to Dave Bodenstab <imdave@synet.net> for pointing out the problem.
+ 
  -----------------------> tgif-3.0-p10 => tgif-3.0-p11 <-----------------------
  Here's a short list of added features/bug fixes.
***************
*** 3,7 ****
  
  1)  Fix a bug in using the -DUSE_XAPPLRESDIR compile option.  Thanks to
!     Dieter Jurzitza to the patch.
  2)  Fix a bug in constrained move/stretch/rotate mode for transformed
      objects.  Thanks to Hiroto Kagotani <kagotani@in.it.okayama-u.ac.jp>
--- 9,13 ----
  
  1)  Fix a bug in using the -DUSE_XAPPLRESDIR compile option.  Thanks to
!     Dieter Jurzitza for the patch.
  2)  Fix a bug in constrained move/stretch/rotate mode for transformed
      objects.  Thanks to Hiroto Kagotani <kagotani@in.it.okayama-u.ac.jp>