* buffer.h (NARROWED, BUF_NARROWED): Drop unused macros.

(DECODE_POSITION, BUFFER_CHECK_INDIRECTION): Fix indentation.
* buffer.c (toplevel, syms_of_buffer): Drop old commented-out
debugging stubs.

diff --git a/src/ChangeLog b/src/ChangeLog
index 115b8d429155f7798883bfc18fa8b5c2df898dd5..316995bf20b3952a4bb90a2982f2c4b64d81b439 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-17  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       * buffer.h (NARROWED, BUF_NARROWED): Drop unused macros.
+       (DECODE_POSITION, BUFFER_CHECK_INDIRECTION): Fix indentation.
+       * buffer.c (toplevel, syms_of_buffer): Drop old commented-out
+       debugging stubs.
+
 2013-01-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * alloc.c (free_save_value): Now static.

diff --git a/src/buffer.c b/src/buffer.c
index 218ae1a7d11b63bac68fe4938a0bfce39d95bfca..66581cb78280dc5155d68737393a8c94dc1670d2 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -372,9 +372,6 @@ bset_zv_marker (struct buffer *b, Lisp_Object val)
   b->INTERNAL_FIELD (zv_marker) = val;
 }
 
-/* For debugging; temporary.  See set_buffer_internal.  */
-/* Lisp_Object Qlisp_mode, Vcheck_symbol; */
-
 void
 nsberror (Lisp_Object spec)
 {
@@ -6003,10 +6000,6 @@ simple case that you moved off with C-b means scrolling just one line.
 window scrolls by a full window height.  Meaningful values are
 between 0.0 and 1.0, inclusive.  */);
 
-/*DEFVAR_LISP ("debug-check-symbol", &Vcheck_symbol,
-    "Don't ask.");
-*/
-
   DEFVAR_LISP ("before-change-functions", Vbefore_change_functions,
               doc: /* List of functions to call before each text change.
 Two arguments are passed to each function: the positions of

diff --git a/src/buffer.h b/src/buffer.h
index b4cc21d675da24e5e4a0bff5eca25a38cbebe00c..276cca32e489b0b3dc3f2d76e5187a139fb28969 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -82,9 +82,6 @@ INLINE_HEADER_BEGIN
 /* Size of gap.  */
 #define GAP_SIZE (current_buffer->text->gap_size)
 
-/* Is the current buffer narrowed?  */
-#define NARROWED       ((BEGV != BEG) || (ZV != Z))
-
 /* Modification count.  */
 #define MODIFF (current_buffer->text->modiff)
 
@@ -173,10 +170,6 @@ INLINE_HEADER_BEGIN
 /* Size of gap.  */
 #define BUF_GAP_SIZE(buf) ((buf)->text->gap_size)
 
-/* Is this buffer narrowed?  */
-#define BUF_NARROWED(buf) ((BUF_BEGV (buf) != BUF_BEG (buf)) \
-                          || (BUF_ZV (buf) != BUF_Z (buf)))
-
 /* Modification count.  */
 #define BUF_MODIFF(buf) ((buf)->text->modiff)
 
@@ -294,24 +287,24 @@ extern void enlarge_buffer_text (struct buffer *, ptrdiff_t);
 /* Access a Lisp position value in POS,
    and store the charpos in CHARPOS and the bytepos in BYTEPOS.  */
 
-#define DECODE_POSITION(charpos, bytepos, pos)                 \
-do                                                             \
-  {                                                            \
-    Lisp_Object __pos = (pos);                                 \
-    if (NUMBERP (__pos))                                       \
-      {                                                                \
-       charpos = __pos;                                        \
-       bytepos = buf_charpos_to_bytepos (current_buffer, __pos);  \
-      }                                                                \
-    else if (MARKERP (__pos))                                  \
-      {                                                                \
-       charpos = marker_position (__pos);                      \
-       bytepos = marker_byte_position (__pos);                 \
-      }                                                                \
-    else                                                       \
-      wrong_type_argument (Qinteger_or_marker_p, __pos);       \
-  }                                                            \
-while (0)
+#define DECODE_POSITION(charpos, bytepos, pos)                         \
+  do                                                                   \
+    {                                                                  \
+      Lisp_Object __pos = (pos);                                       \
+      if (NUMBERP (__pos))                                             \
+       {                                                               \
+         charpos = __pos;                                              \
+         bytepos = buf_charpos_to_bytepos (current_buffer, __pos);     \
+       }                                                               \
+      else if (MARKERP (__pos))                                                \
+       {                                                               \
+         charpos = marker_position (__pos);                            \
+         bytepos = marker_byte_position (__pos);                       \
+       }                                                               \
+      else                                                             \
+       wrong_type_argument (Qinteger_or_marker_p, __pos);              \
+    }                                                                  \
+  while (0)
 
 /* Maximum number of bytes in a buffer.
    A buffer cannot contain more bytes than a 1-origin fixnum can represent,
@@ -1009,15 +1002,15 @@ bset_width_table (struct buffer *b, Lisp_Object val)
 #define BUFFER_CHECK_INDIRECTION(b)                    \
   do {                                                 \
     if (BUFFER_LIVE_P (b))                             \
-    {                                                  \
-      if (b->base_buffer)                              \
-       {                                               \
-         eassert (b->indirections == -1);              \
-         eassert (b->base_buffer->indirections > 0);   \
-       }                                               \
-      else                                             \
-       eassert (b->indirections >= 0);                 \
-    }                                                  \
+      {                                                        \
+       if (b->base_buffer)                             \
+         {                                             \
+           eassert (b->indirections == -1);            \
+           eassert (b->base_buffer->indirections > 0); \
+         }                                             \
+       else                                            \
+         eassert (b->indirections >= 0);               \
+      }                                                        \
   } while (0)
 
 /* Chain of all buffers, including killed ones.  */