[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111540: * buffer.h (NARROWED, BUF_NA
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111540: * buffer.h (NARROWED, BUF_NARROWED): Drop unused macros. |
Date: |
Thu, 17 Jan 2013 09:52:13 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111540
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-01-17 09:52:13 +0400
message:
* 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.
modified:
src/ChangeLog
src/buffer.c
src/buffer.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-01-15 21:38:58 +0000
+++ b/src/ChangeLog 2013-01-17 05:52:13 +0000
@@ -1,3 +1,10 @@
+2013-01-17 Dmitry Antipov <address@hidden>
+
+ * 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 <address@hidden>
* alloc.c (free_save_value): Now static.
=== modified file 'src/buffer.c'
--- a/src/buffer.c 2013-01-10 10:30:16 +0000
+++ b/src/buffer.c 2013-01-17 05:52:13 +0000
@@ -372,9 +372,6 @@
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 @@
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
=== modified file 'src/buffer.h'
--- a/src/buffer.h 2013-01-10 10:30:16 +0000
+++ b/src/buffer.h 2013-01-17 05:52:13 +0000
@@ -82,9 +82,6 @@
/* 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 @@
/* 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 @@
/* 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 @@
#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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111540: * buffer.h (NARROWED, BUF_NARROWED): Drop unused macros.,
Dmitry Antipov <=