diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-02-01 11:39:36 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-02-01 11:45:15 -0800 |
| commit | 241260cc2819e5df254ad85953588b06388ade61 (patch) | |
| tree | 3b0099a54471738d76567ff650466a14cd3de954 /src/dispnew.c | |
| parent | 1d1162479caf1fdf48564f1486fa84e3cdacaa9b (diff) | |
| download | emacs-241260cc2819e5df254ad85953588b06388ade61.tar.gz | |
Revert changes installed by xwidgets merge
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index e614ceef122..3c8117e6b65 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -48,10 +48,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include TERM_HEADER #endif /* HAVE_WINDOW_SYSTEM */ -#ifdef HAVE_XWIDGETS -#include "xwidget.h" -#endif - #include <errno.h> #include <fpending.h> @@ -3546,9 +3542,6 @@ update_window (struct window *w, bool force_p) add_window_display_history (w, w->current_matrix->method, paused_p); #endif -#ifdef HAVE_XWIDGETS - xwidget_end_redisplay(w, w->current_matrix); -#endif clear_glyph_matrix (desired_matrix); return paused_p; @@ -4132,11 +4125,6 @@ scrolling_window (struct window *w, bool header_line_p) break; } -#ifdef HAVE_XWIDGETS - //currently this is needed to detect xwidget movement reliably. or probably not. - return 0; -#endif - /* Give up if some rows in the desired matrix are not enabled. */ if (! MATRIX_ROW_ENABLED_P (desired_matrix, i)) return -1; |