Commit 962ae636 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(command_loop_1): Check column_number_displayed

in the selected window, not Vcolumn_number_mode.
(Vcolumn_number_mode): Variable deleted.
(syms_of_keyboard): Delete Lisp variable column-number-mode.
parent 6b19c229
...@@ -521,9 +521,6 @@ int flow_control; ...@@ -521,9 +521,6 @@ int flow_control;
#ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_WINDOW_SYSTEM
#define POLL_FOR_INPUT #define POLL_FOR_INPUT
#endif #endif
/* Non-nil enables Column Number mode. */
Lisp_Object Vcolumn_number_mode;
/* Global variable declarations. */ /* Global variable declarations. */
...@@ -1263,7 +1260,7 @@ command_loop_1 () ...@@ -1263,7 +1260,7 @@ command_loop_1 ()
&& !windows_or_buffers_changed && !windows_or_buffers_changed
&& EQ (current_buffer->selective_display, Qnil) && EQ (current_buffer->selective_display, Qnil)
&& !detect_input_pending () && !detect_input_pending ()
&& NILP (Vcolumn_number_mode) && NILP (XWINDOW (selected_window)->column_number_displayed)
&& NILP (Vexecuting_macro)) && NILP (Vexecuting_macro))
no_redisplay = direct_output_forward_char (1); no_redisplay = direct_output_forward_char (1);
goto directly_done; goto directly_done;
...@@ -1287,7 +1284,7 @@ command_loop_1 () ...@@ -1287,7 +1284,7 @@ command_loop_1 ()
&& !windows_or_buffers_changed && !windows_or_buffers_changed
&& EQ (current_buffer->selective_display, Qnil) && EQ (current_buffer->selective_display, Qnil)
&& !detect_input_pending () && !detect_input_pending ()
&& NILP (Vcolumn_number_mode) && NILP (XWINDOW (selected_window)->column_number_displayed)
&& NILP (Vexecuting_macro)) && NILP (Vexecuting_macro))
no_redisplay = direct_output_forward_char (-1); no_redisplay = direct_output_forward_char (-1);
goto directly_done; goto directly_done;
...@@ -1317,7 +1314,7 @@ command_loop_1 () ...@@ -1317,7 +1314,7 @@ command_loop_1 ()
|| windows_or_buffers_changed || windows_or_buffers_changed
|| !EQ (current_buffer->selective_display, Qnil) || !EQ (current_buffer->selective_display, Qnil)
|| detect_input_pending () || detect_input_pending ()
|| !NILP (Vcolumn_number_mode) || !NILP (XWINDOW (selected_window)->column_number_displayed)
|| !NILP (Vexecuting_macro)); || !NILP (Vexecuting_macro));
value = internal_self_insert (c, 0); value = internal_self_insert (c, 0);
if (value) if (value)
...@@ -8172,10 +8169,6 @@ The value can be a length of time to show the message for.\n\ ...@@ -8172,10 +8169,6 @@ The value can be a length of time to show the message for.\n\
If the value is non-nil and not a number, we wait 2 seconds."); If the value is non-nil and not a number, we wait 2 seconds.");
Vsuggest_key_bindings = Qt; Vsuggest_key_bindings = Qt;
DEFVAR_LISP ("column-number-mode", &Vcolumn_number_mode,
"Non-nil enables display of the current column number in the mode line.");
Vcolumn_number_mode = Qnil;
DEFVAR_LISP ("timer-list", &Vtimer_list, DEFVAR_LISP ("timer-list", &Vtimer_list,
"List of active absolute time timers in order of increasing time"); "List of active absolute time timers in order of increasing time");
Vtimer_list = Qnil; Vtimer_list = Qnil;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment