/[emacs]/emacs/src/xdisp.c
ViewVC logotype

Diff of /emacs/src/xdisp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.781 by handa, Fri Aug 30 13:44:55 2002 UTC revision 1.782 by kfstorm, Fri Aug 30 23:10:09 2002 UTC
# Line 537  static int message_cleared_p; Line 537  static int message_cleared_p;
537  Lisp_Object Vcursor_in_non_selected_windows;  Lisp_Object Vcursor_in_non_selected_windows;
538  Lisp_Object Qcursor_in_non_selected_windows;  Lisp_Object Qcursor_in_non_selected_windows;
539    
 /* Specifies the desired cursor-type to use to show the blinking  
    cursor off state and cursor shown in non-selected windows.  
    t means to use the default.  */  
   
 Lisp_Object Valternate_cursor_type;  
 Lisp_Object Qalternate_cursor_type;  
   
540  /* How to blink the default frame cursor off.  */  /* How to blink the default frame cursor off.  */
541  Lisp_Object Vblink_cursor_alist;  Lisp_Object Vblink_cursor_alist;
542    
# Line 15362  get_window_cursor_type (w, width) Line 15355  get_window_cursor_type (w, width)
15355    
15356    /* Cursor is blinked off, so determine how to "toggle" it.  */    /* Cursor is blinked off, so determine how to "toggle" it.  */
15357    
15358    /* First try to use alternate-cursor-type, unless it is t.  */    /* First look for an entry matching the buffer's cursor-type in blink-cursor-alist.  */
15359    alt_cursor = Fbuffer_local_value (Qalternate_cursor_type, w->buffer);    if ((alt_cursor = Fassoc (b->cursor_type, Vblink_cursor_alist), !NILP (alt_cursor)))
   if (!EQ (alt_cursor, Qt))  
     return get_specified_cursor_type (alt_cursor, width);  
   
   /* Then unless buffer's cursor-type is t (use default),  
      look for an entry matching normal cursor in blink-cursor-alist.  */  
   if (!EQ (b->cursor_type, Qt) &&  
       (alt_cursor = Fassoc (b->cursor_type, Vblink_cursor_alist), !NILP (alt_cursor)))  
15360      return get_specified_cursor_type (XCDR (alt_cursor), width);      return get_specified_cursor_type (XCDR (alt_cursor), width);
15361    
15362    /* Then see if frame has specified a specific blink off cursor type.  */    /* Then see if frame has specified a specific blink off cursor type.  */
# Line 15499  syms_of_xdisp () Line 15485  syms_of_xdisp ()
15485    staticpro (&Qmessage_truncate_lines);    staticpro (&Qmessage_truncate_lines);
15486    Qcursor_in_non_selected_windows = intern ("cursor-in-non-selected-windows");    Qcursor_in_non_selected_windows = intern ("cursor-in-non-selected-windows");
15487    staticpro (&Qcursor_in_non_selected_windows);    staticpro (&Qcursor_in_non_selected_windows);
   Qalternate_cursor_type = intern ("alternate-cursor-type");  
   staticpro (&Qalternate_cursor_type);  
15488    Qgrow_only = intern ("grow-only");    Qgrow_only = intern ("grow-only");
15489    staticpro (&Qgrow_only);    staticpro (&Qgrow_only);
15490    Qinhibit_menubar_update = intern ("inhibit-menubar-update");    Qinhibit_menubar_update = intern ("inhibit-menubar-update");
# Line 15737  go back to their normal size.  */); Line 15721  go back to their normal size.  */);
15721  t means to use hollow box cursor.  See `cursor-type' for other values.  */);  t means to use hollow box cursor.  See `cursor-type' for other values.  */);
15722    Vcursor_in_non_selected_windows = Qt;    Vcursor_in_non_selected_windows = Qt;
15723    
   DEFVAR_LISP ("alternate-cursor-type", &Valternate_cursor_type,  
     doc: /* *Cursor type displayed in the blinking cursor off state.  
 t means to use default.  See `cursor-type' for other values.  */);  
   Valternate_cursor_type = Qt;  
   
15724    DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist,    DEFVAR_LISP ("blink-cursor-alist", &Vblink_cursor_alist,
15725      doc: /* Alist specifying how to blink the cursor off.      doc: /* Alist specifying how to blink the cursor off.
15726  Each element has the form (ON-STATE . OFF-STATE).  Whenever the  Each element has the form (ON-STATE . OFF-STATE).  Whenever the

Legend:
Removed from v.1.781  
changed lines
  Added in v.1.782

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26