ifdef indentation

diff --git a/src/buffer.c b/src/buffer.c
index 223683db6f32c60f6d3bacf7b29562696dffec96..bc06e17ad42bc45b39622f09e5c6656dec60eef3 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -43,8 +43,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "frame.h"
 
 #ifdef HAVE_XWIDGETS
-#include "xwidget.h"
-#endif  /* HAVE_XWIDGETS */
+# include "xwidget.h"
+#endif
 #ifdef WINDOWSNT
 #include "w32heap.h"           /* for mmap_* */
 #endif
@@ -1762,7 +1762,7 @@ cleaning up all windows currently displaying the buffer to be killed. */)
   GCPRO1 (buffer);
   kill_buffer_xwidgets (buffer);
   UNGCPRO;
-#endif  /* HAVE_XWIDGETS */
+#endif
   /* Killing buffer processes may run sentinels which may have killed
      our buffer.  */
   if (!BUFFER_LIVE_P (b))

diff --git a/src/dispnew.c b/src/dispnew.c
index 6ee4ccedf0b3fadcced397537a1bc9dfbd9a2d5d..5f63c7190bf3bd3b55279e96bd32b8f155d6ebe3 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -49,7 +49,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif /* HAVE_WINDOW_SYSTEM */
 
 #ifdef HAVE_XWIDGETS
-#include "xwidget.h"
+# include "xwidget.h"
 #endif
 
 #include <errno.h>

diff --git a/src/emacs.c b/src/emacs.c
index 87b1f11d59b059079b4becf01b890fa749acf45d..0b9275236820cd89324334823191240b611cff33 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -66,7 +66,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "window.h"
 
 #ifdef HAVE_XWIDGETS
-#include "xwidget.h"
+# include "xwidget.h"
 #endif
 #include "systty.h"
 #include "atimer.h"

diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 598c5c1a81e038aa0d250e547a4b162c616228b5..76b169def467b7779d32e885240eab078634b8bc 100644 (file)
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -24,7 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "frame.h"
 #include "xterm.h"
 #ifdef HAVE_XWIDGETS
-#include "xwidget.h"
+# include "xwidget.h"
 #endif
 #include "emacsgtkfixed.h"
 

diff --git a/src/print.c b/src/print.c
index 75288bc6a3a3aa28437d002d4f1be1d514491d50..cca73ec2b29202d758003c755093eebef0e27664 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -38,7 +38,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "font.h"
 
 #ifdef HAVE_XWIDGETS
-#include "xwidget.h"
+# include "xwidget.h"
 #endif
 
 #include <float.h>

diff --git a/src/window.c b/src/window.c
index 5cbd58ddde9f5c5656d5ce66a9b795d981d26b5b..1c94d7bfebd39c524ac21bb16486a71c28ddc024 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -45,7 +45,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "msdos.h"
 #endif
 #ifdef HAVE_XWIDGETS
-#include "xwidget.h"
+# include "xwidget.h"
 #endif
 
 static int displayed_window_lines (struct window *);

diff --git a/src/xdisp.c b/src/xdisp.c
index faec93fc6f907a5f3802722087a993c43ec82dde..17458bfdc0aa1425d5ca0ecff6689889ecf7ca2f 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -319,7 +319,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif /* HAVE_WINDOW_SYSTEM */
 
 #ifdef HAVE_XWIDGETS
-#include "xwidget.h"
+# include "xwidget.h"
 #endif
 #ifndef FRAME_X_OUTPUT
 #define FRAME_X_OUTPUT(f) ((f)->output_data.x)
@@ -846,7 +846,7 @@ static int next_element_from_buffer (struct it *);
 static int next_element_from_composition (struct it *);
 static int next_element_from_image (struct it *);
 #ifdef HAVE_XWIDGETS
-static int next_element_from_xwidget(struct it *);
+ static int next_element_from_xwidget(struct it *);
 #endif
 static int next_element_from_stretch (struct it *);
 static void load_overlay_strings (struct it *, ptrdiff_t);
@@ -17055,13 +17055,6 @@ try_window_reusing_current_matrix (struct window *w)
     return 0;
 #endif
 
-#ifdef HAVE_XWIDGETS_xxx
- //currently this is needed to detect xwidget movement reliably. or probably not.
-  printf("try_window_reusing_current_matrix\n");
-    return 0;
-#endif
-
-
   if (/* This function doesn't handle terminal frames.  */
       !FRAME_WINDOW_P (f)
       /* Don't try to reuse the display if windows have been split

diff --git a/src/xterm.c b/src/xterm.c
index 555af2b536c506a3eca67fa25c5edec8a9bf0a8d..37784d33fc561e5f793fd84b073e96a7724c1d46 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -64,7 +64,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "frame.h"
 #include "dispextern.h"
 #ifdef HAVE_XWIDGETS
-#include "xwidget.h"
+# include "xwidget.h"
 #endif
 #include "fontset.h"
 #include "termhooks.h"

diff --git a/src/xwidget.h b/src/xwidget.h
index 6f97cb17459ad8c4dc1eb3b4bd738c02d1d0949a..8f5fa0a1e8368e8ee9a5a6b5f4f5b328eb6715a7 100644 (file)
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -121,15 +121,11 @@ struct xwidget_type
 
 struct xwidget *xwidget_from_id (int id);
 
-//extern int xwidget_owns_kbd;
-
 void xwidget_start_redisplay (void);
 void xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix);
 
 void xwidget_touch (struct xwidget_view *xw);
 
-//void assert_valid_xwidget_id(int id,char *str);
-
 struct xwidget *lookup_xwidget (Lisp_Object spec);
 #define XG_XWIDGET "emacs_xwidget"
 #define XG_XWIDGET_VIEW "emacs_xwidget_view"