summaryrefslogtreecommitdiff
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-08-25 16:34:36 +0000
committerRichard M. Stallman <rms@gnu.org>1996-08-25 16:34:36 +0000
commit962ae6365c1bbdab1aafe8b8508dc4006258174a (patch)
treefe7e9238be1bc064740925e3d4c069f129cf0cc6 /src/keyboard.c
parent6b19c22961d80c1a4fbfee9485465e56f671486f (diff)
downloademacs-962ae6365c1bbdab1aafe8b8508dc4006258174a.tar.gz
(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.
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index e01e7e17f93..d394cc4f701 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -521,9 +521,6 @@ int flow_control;
#ifdef HAVE_WINDOW_SYSTEM
#define POLL_FOR_INPUT
#endif
-
-/* Non-nil enables Column Number mode. */
-Lisp_Object Vcolumn_number_mode;
/* Global variable declarations. */
@@ -1263,7 +1260,7 @@ command_loop_1 ()
&& !windows_or_buffers_changed
&& EQ (current_buffer->selective_display, Qnil)
&& !detect_input_pending ()
- && NILP (Vcolumn_number_mode)
+ && NILP (XWINDOW (selected_window)->column_number_displayed)
&& NILP (Vexecuting_macro))
no_redisplay = direct_output_forward_char (1);
goto directly_done;
@@ -1287,7 +1284,7 @@ command_loop_1 ()
&& !windows_or_buffers_changed
&& EQ (current_buffer->selective_display, Qnil)
&& !detect_input_pending ()
- && NILP (Vcolumn_number_mode)
+ && NILP (XWINDOW (selected_window)->column_number_displayed)
&& NILP (Vexecuting_macro))
no_redisplay = direct_output_forward_char (-1);
goto directly_done;
@@ -1317,7 +1314,7 @@ command_loop_1 ()
|| windows_or_buffers_changed
|| !EQ (current_buffer->selective_display, Qnil)
|| detect_input_pending ()
- || !NILP (Vcolumn_number_mode)
+ || !NILP (XWINDOW (selected_window)->column_number_displayed)
|| !NILP (Vexecuting_macro));
value = internal_self_insert (c, 0);
if (value)
@@ -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.");
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,
"List of active absolute time timers in order of increasing time");
Vtimer_list = Qnil;