[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112182: * indent.c (current_column_b
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112182: * indent.c (current_column_bol_cache): Remove leftover which is not |
Date: |
Fri, 29 Mar 2013 19:50:21 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112182
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-03-29 19:50:21 +0400
message:
* indent.c (current_column_bol_cache): Remove leftover which is not
used in Fmove_to_column any more.
(current_column, scan_for_column): Adjust users.
* keyboard.c (last_point_position_buffer, last_point_position_window):
Remove leftovers which are not used for recording undo any more.
(command_loop_1, syms_of_keyboard): Adjust users.
* xdisp.c (last_max_ascent): Remove leftover which is not used in
redisplay_window any more.
(move_it_to): Adjust user.
modified:
src/ChangeLog
src/indent.c
src/keyboard.c
src/xdisp.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-03-29 03:03:19 +0000
+++ b/src/ChangeLog 2013-03-29 15:50:21 +0000
@@ -1,3 +1,15 @@
+2013-03-29 Dmitry Antipov <address@hidden>
+
+ * indent.c (current_column_bol_cache): Remove leftover which is not
+ used in Fmove_to_column any more.
+ (current_column, scan_for_column): Adjust users.
+ * keyboard.c (last_point_position_buffer, last_point_position_window):
+ Remove leftovers which are not used for recording undo any more.
+ (command_loop_1, syms_of_keyboard): Adjust users.
+ * xdisp.c (last_max_ascent): Remove leftover which is not used in
+ redisplay_window any more.
+ (move_it_to): Adjust user.
+
2013-03-29 Juanma Barranquero <address@hidden>
* makefile.w32-in ($(BLD)/filelock.$(O), $(BLD)/filelock.$(O)):
=== modified file 'src/indent.c'
--- a/src/indent.c 2013-03-28 14:04:49 +0000
+++ b/src/indent.c 2013-03-29 15:50:21 +0000
@@ -56,11 +56,6 @@
static ptrdiff_t current_column_1 (void);
static ptrdiff_t position_indentation (ptrdiff_t);
-/* Cache of beginning of line found by the last call of
- current_column. */
-
-static ptrdiff_t current_column_bol_cache;
-
/* Get the display table to use for the current buffer. */
struct Lisp_Char_Table *
@@ -439,11 +434,6 @@
col += post_tab;
}
- if (ptr == BEGV_ADDR)
- current_column_bol_cache = BEGV;
- else
- current_column_bol_cache = BYTE_TO_CHAR (PTR_BYTE_POS (ptr));
-
last_known_column = col;
last_known_column_point = PT;
last_known_column_modified = MODIFF;
@@ -525,7 +515,6 @@
{
ptrdiff_t opoint = PT, opoint_byte = PT_BYTE;
scan_newline (PT, PT_BYTE, BEGV, BEGV_BYTE, -1, 1);
- current_column_bol_cache = PT;
scan = PT, scan_byte = PT_BYTE;
SET_PT_BOTH (opoint, opoint_byte);
next_boundary = scan;
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2013-03-28 14:04:49 +0000
+++ b/src/keyboard.c 2013-03-29 15:50:21 +0000
@@ -210,12 +210,6 @@
/* The value of point when the last command was started. */
static ptrdiff_t last_point_position;
-/* The buffer that was current when the last command was started. */
-static Lisp_Object last_point_position_buffer;
-
-/* The window that was selected when the last command was started. */
-static Lisp_Object last_point_position_window;
-
/* The frame in which the last input event occurred, or Qmacro if the
last event came from a macro. We use this to determine when to
generate switch-frame events. This may be cleared by functions
@@ -1512,8 +1506,6 @@
prev_buffer = current_buffer;
prev_modiff = MODIFF;
last_point_position = PT;
- last_point_position_window = selected_window;
- XSETBUFFER (last_point_position_buffer, prev_buffer);
/* By default, we adjust point to a boundary of a region that
has such a property that should be treated intangible
@@ -11047,9 +11039,6 @@
Fset (Qinput_method_exit_on_first_char, Qnil);
Fset (Qinput_method_use_echo_area, Qnil);
- last_point_position_buffer = Qnil;
- last_point_position_window = Qnil;
-
{
int i;
int len = sizeof (head_table) / sizeof (head_table[0]);
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2013-03-28 14:04:49 +0000
+++ b/src/xdisp.c 2013-03-29 15:50:21 +0000
@@ -580,7 +580,7 @@
/* Ascent and height of the last line processed by move_it_to. */
-static int last_max_ascent, last_height;
+static int last_height;
/* Non-zero if there's a help-echo in the echo area. */
@@ -8925,7 +8925,6 @@
it->current_y += it->max_ascent + it->max_descent;
++it->vpos;
last_height = it->max_ascent + it->max_descent;
- last_max_ascent = it->max_ascent;
it->max_ascent = it->max_descent = 0;
}
@@ -8952,7 +8951,6 @@
it->current_y += it->max_ascent + it->max_descent;
++it->vpos;
last_height = it->max_ascent + it->max_descent;
- last_max_ascent = it->max_ascent;
}
if (backup_data)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112182: * indent.c (current_column_bol_cache): Remove leftover which is not,
Dmitry Antipov <=