[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind] |
Date: |
Tue, 06 Jul 2004 05:41:30 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.754.2.21 emacs/src/xdisp.c:1.754.2.22
*** emacs/src/xdisp.c:1.754.2.21 Tue Jul 6 09:24:09 2004
--- emacs/src/xdisp.c Tue Jul 6 09:31:32 2004
***************
*** 198,205 ****
#endif
#ifdef MAC_OS
#include "macterm.h"
-
- Cursor No_Cursor;
#endif
#ifndef FRAME_X_OUTPUT
--- 198,203 ----
***************
*** 4563,4568 ****
--- 4561,4574 ----
visible_p = 0;
}
+ if (visible_p)
+ {
+ struct it it2 = *it;
+
+ if (handle_display_prop (&it2) == HANDLED_RETURN)
+ visible_p = 0;
+ }
+
/* Back one more newline if the current one is invisible. */
if (!visible_p)
back_to_previous_line_start (it);
***************
*** 20630,20640 ****
cursor = FRAME_X_OUTPUT (f)->nontext_cursor;
}
- #ifndef HAVE_CARBON
if (cursor != No_Cursor)
- #else
- if (bcmp (&cursor, &No_Cursor, sizeof (Cursor)))
- #endif
rif->define_frame_cursor (f, cursor);
}
--- 20636,20642 ----
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind],
Miles Bader <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind], Miles Bader, 2004/07/23