# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 840990876 0
# Node ID 11f4f96a71d26b07e7c1141a8cb8e30c75de02d3
# Parent  e67d0c1ec11c2a5ffcfc9c682df8a76d0959120f
(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.

diff -r e67d0c1ec11c -r 11f4f96a71d2 src/keyboard.c
--- a/src/keyboard.c	Sun Aug 25 02:31:33 1996 +0000
+++ b/src/keyboard.c	Sun Aug 25 16:34:36 1996 +0000
@@ -521,9 +521,6 @@
 #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 @@
 		      && !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 @@
 		      && !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 @@
 			  || 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 @@
 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;