/[emacs]/emacs/src/xdisp.c
ViewVC logotype

Diff of /emacs/src/xdisp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.754.2.21 by miles, Tue Jul 6 09:24:09 2004 UTC revision 1.754.2.22 by miles, Tue Jul 6 09:31:32 2004 UTC
# Line 198  Boston, MA 02111-1307, USA.  */ Line 198  Boston, MA 02111-1307, USA.  */
198  #endif  #endif
199  #ifdef MAC_OS  #ifdef MAC_OS
200  #include "macterm.h"  #include "macterm.h"
   
 Cursor No_Cursor;  
201  #endif  #endif
202    
203  #ifndef FRAME_X_OUTPUT  #ifndef FRAME_X_OUTPUT
# Line 4563  back_to_previous_visible_line_start (it) Line 4561  back_to_previous_visible_line_start (it)
4561              visible_p = 0;              visible_p = 0;
4562          }          }
4563    
4564          if (visible_p)
4565            {
4566              struct it it2 = *it;
4567    
4568              if (handle_display_prop (&it2) == HANDLED_RETURN)
4569                visible_p = 0;
4570            }
4571    
4572        /* Back one more newline if the current one is invisible.  */        /* Back one more newline if the current one is invisible.  */
4573        if (!visible_p)        if (!visible_p)
4574          back_to_previous_line_start (it);          back_to_previous_line_start (it);
# Line 20630  define_frame_cursor1 (f, cursor, pointer Line 20636  define_frame_cursor1 (f, cursor, pointer
20636          cursor = FRAME_X_OUTPUT (f)->nontext_cursor;          cursor = FRAME_X_OUTPUT (f)->nontext_cursor;
20637      }      }
20638    
 #ifndef HAVE_CARBON  
20639    if (cursor != No_Cursor)    if (cursor != No_Cursor)
 #else  
   if (bcmp (&cursor, &No_Cursor, sizeof (Cursor)))  
 #endif  
20640      rif->define_frame_cursor (f, cursor);      rif->define_frame_cursor (f, cursor);
20641  }  }
20642    

Legend:
Removed from v.1.754.2.21  
changed lines
  Added in v.1.754.2.22

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26