9 files changed, 33 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e360dc48ba8..2c4152d1dd6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2008-07-16  Adrian Robert <Adrian.B.Robert@gmail.com>
+
+        * config.in
+        * dispextern.h
+        * frame.c
+        * image.c
+        * nsfns.m
+        * nsfont.m
+        * nsgui.h
+        * nsmenu.m
+        * nsterm.h
+        * nsterm.m
+        * s/darwin.h
+        * xdisp.c: Change most cases of PENDING to TODO, some to FIXME or
+        XXX.
+
 2008-07-17  Andreas Schwab  <schwab@suse.de>
 
         * s/cygwin.h (LIB_STANDARD_LIBSRC): Don't define.
diff --git a/src/config.in b/src/config.in
index d520d50b9b7..5a34ca7046a 100644
--- a/src/config.in
+++ b/src/config.in
@@ -997,7 +997,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define CANNOT_DUMP
 #endif
 
-/* PENDING: These are used for the Carbon port only. */
+/* TODO: These are used for the Carbon port only. */
 #undef MAC_OS
 #undef MAC_OSX
 
diff --git a/src/dispextern.h b/src/dispextern.h
index 180820d4b80..5c06437f634 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2946,7 +2946,7 @@ struct atimer;			/* Defined in atimer.h.  */
    an hourglass cursor on all frames.  */
 extern struct atimer *hourglass_atimer;
 
-/* Each GUI implements these.  PENDING: move into RIF. */
+/* Each GUI implements these.  FIXME: move into RIF. */
 extern void show_hourglass P_ ((struct atimer *));
 extern void hide_hourglass P_ ((void));
 
diff --git a/src/frame.c b/src/frame.c
index 88cabc2ac80..21b16154662 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2986,7 +2986,7 @@ x_set_frame_parameters (f, alist)
 
           old_value = get_frame_param (f, prop);
           fullscreen_is_being_set |= EQ (prop, Qfullscreen);
-#ifndef HAVE_NS  /* PENDING: ensure font attrs change goes through */
+#ifndef HAVE_NS  /* XXX: ensure font attrs change goes through */
           if (NILP (Fequal (val, old_value)))
 #endif
             {
diff --git a/src/image.c b/src/image.c
index 1d73704b388..2685237e718 100644
--- a/src/image.c
+++ b/src/image.c
@@ -435,7 +435,7 @@ XGetImage (Display *display, Pixmap pixmap, int x, int y,
            unsigned int width, unsigned int height,
            unsigned long plane_mask, int format)
 {
-  /* PENDING: not sure what this function is supposed to do.. */
+  /* TODO: not sure what this function is supposed to do.. */
   ns_retain_object(pixmap);
   return pixmap;
 }
diff --git a/src/nsfns.m b/src/nsfns.m
index 8ec6518aead..1752512d2dc 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -742,7 +742,7 @@ ns_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
 }
 
 
-/* 23: PENDING: there is an erroneous direct call in window.c to this fn */
+/* 23: XXX: there is an erroneous direct call in window.c to this fn */
 void
 x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
 {
@@ -783,7 +783,7 @@ ns_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
 }
 
 
-/* 23: PENDING: there is an erroneous direct call in window.c to this fn */
+/* 23: XXX: there is an erroneous direct call in window.c to this fn */
 void
 x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
 {
@@ -912,7 +912,7 @@ XParseGeometry (char *string, int *x, int *y,
 }
 
 
-/*PENDING: move to nsterm? */
+/* TODO: move to nsterm? */
 int
 ns_lisp_to_cursor_type (Lisp_Object arg)
 {
@@ -1213,7 +1213,7 @@ be shared by the new frame.")
                       "background", "Background", RES_TYPE_STRING);
   x_default_parameter (f, parms, Qcursor_color, build_string ("grey"),
                       "cursorColor", "CursorColor", RES_TYPE_STRING);
-  /*PENDING: not suppported yet in NS */
+  /* FIXME: not suppported yet in NS */
   x_default_parameter (f, parms, Qline_spacing, Qnil,
                        "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);
   x_default_parameter (f, parms, Qleft_fringe, Qnil,
@@ -1233,7 +1233,7 @@ be shared by the new frame.")
   x_default_parameter (f, parms, Qtitle, Qnil, "title", "Title",
                        RES_TYPE_STRING);
 
-/*PENDING: other terms seem to get away w/o this complexity.. */
+/* TODO: other terms seem to get away w/o this complexity.. */
   if (NILP (Fassq (Qwidth, parms)))
     {
       Lisp_Object value
@@ -1610,7 +1610,7 @@ If omitted or nil, that stands for the selected frame's display.")
      (display)
      Lisp_Object display;
 {
-  /*PENDING: return GUI version on GNUSTEP, ?? on OS X */
+  /* FIXME: return GUI version on GNUSTEP, ?? on OS X */
   return build_string ("1.0");
 }
 
@@ -2108,7 +2108,7 @@ x_set_scroll_bar_default_width (f)
 const char *
 x_get_string_resource (XrmDatabase rdb, char *name, char *class)
 {
-  /* remove appname prefix; PENDING: allow for !="Emacs" */
+  /* remove appname prefix; TODO: allow for !="Emacs" */
   char *toCheck = class + (!strncmp (class, "Emacs.", 6) ? 6 : 0);
   const char *res;
   check_ns ();
@@ -2359,7 +2359,7 @@ If omitted or nil, that stands for the selected frame's display.")
 /* Unused dummy def needed for compatibility. */
 Lisp_Object tip_frame;
 
-/*PENDING: move to xdisp or similar */
+/* TODO: move to xdisp or similar */
 static void
 compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
      struct frame *f;
diff --git a/src/nsterm.h b/src/nsterm.h
index 260263549b6..2a70ae31d53 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -542,7 +542,7 @@ extern struct ns_display_info *ns_display_list;
 extern Lisp_Object ns_display_name_list;
 extern struct ns_display_info *ns_display_info_for_name ();
 
-/* 23: PENDING: these functions (we defined in nsfns) are used in various
+/* 23: FIXME: these functions (we defined in nsfns) are used in various
        places, but no prototypes are provided */
 struct ns_display_info *check_x_display_info (Lisp_Object frame);
 FRAME_PTR check_x_frame (Lisp_Object frame);
@@ -679,7 +679,7 @@ struct x_output
     (FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f) \
         - NS_SCROLL_BAR_WIDTH (f)) : 0)
 
-/*PENDING: fix for GNUstep inconsistent accounting for titlebar */
+/* XXX: fix for GNUstep inconsistent accounting for titlebar */
 #ifdef NS_IMPL_GNUSTEP
 #define NS_TOP_POS(f) ((f)->top_pos + 18)
 #else
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 4dbaa8ff3c6..9fcf2ca6dff 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -206,8 +206,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Link in the Carbon or AppKit lib. */
 #ifdef HAVE_NS
-/* PENDING: lresolv is here because configure when testing #undefs res_init,
-            a macro in /usr/include/resolv.h for res_9_init, not in stdc lib. */
+/* XXX: lresolv is here because configure when testing #undefs res_init,
+        a macro in /usr/include/resolv.h for res_9_init, not in stdc lib. */
 #define LIBS_MACGUI -framework AppKit -lresolv
 #define SYSTEM_PURESIZE_EXTRA 200000
 #define HEADERPAD_EXTRA 6C8
diff --git a/src/xdisp.c b/src/xdisp.c
index d7b79b527cd..84908f71cf4 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11547,7 +11547,7 @@ redisplay_internal (preserve_echo_area)
       /* Resized active mini-window to fit the size of what it is
          showing if its contents might have changed.  */
       must_finish = 1;
-/* PENDING: this causes all frames to be updated, which seems unnecessary
+/* FIXME: this causes all frames to be updated, which seems unnecessary
    since only the current frame needs to be considered.  This function needs
    to be rewritten with two variables, consider_all_windows and
    consider_all_frames. */