IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #620 from watk/remove-dead-feats

Browse Source 
[RDY] Remove references to FEAT_{X11,CLIPBOARD} and USE_XSMP.
This commit is contained in:
Justin M. Keyes 2014-04-28 20:31:56 -04:00
commit 9a2c92e92c
5 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/globals.h
View File

@ -1118,10 +1118,6 @@ EXTERN char bot_top_msg[] INIT(= N_("search hit BOTTOM, continuing at TOP"));
EXTERN char need_key_msg[] INIT(= N_("Need encryption key for \"%s\"")); EXTERN char need_key_msg[] INIT(= N_("Need encryption key for \"%s\""));
/*
* Comms. with the session manager (XSMP)
*/
/* For undo we need to know the lowest time possible. */ /* For undo we need to know the lowest time possible. */
EXTERN time_t starttime; EXTERN time_t starttime;

3
src/message.c
View File

@ -126,8 +126,7 @@ int msg(char_u *s)
return msg_attr_keep(s, 0, FALSE); return msg_attr_keep(s, 0, FALSE);
} }
#if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \ #if defined(FEAT_EVAL) || defined(FEAT_GUI_GTK) || defined(PROTO)
|| defined(FEAT_GUI_GTK) || defined(PROTO)
/* /*
* Like msg() but keep it silent when 'verbosefile' is set. * Like msg() but keep it silent when 'verbosefile' is set.
*/ */

14
src/ops.c
View File

@ -44,20 +44,14 @@
#include "window.h" #include "window.h"
/* /*
* Number of registers. * Registers:
* 0 = unnamed register, for normal yanks and puts * 0 = unnamed register, for normal yanks and puts
* 1..9 = registers '1' to '9', for deletes * 1..9 = registers '1' to '9', for deletes
* 10..35 = registers 'a' to 'z' * 10..35 = registers 'a' to 'z'
* 36 = delete register '-' * 36 = delete register '-'
* 37 = Selection register '*'. Only if FEAT_CLIPBOARD defined
* 38 = Clipboard register '+'. Only if FEAT_CLIPBOARD and FEAT_X11 defined
*/ */
/* #define NUM_REGISTERS 37
* Symbolic names for some registers. #define DELETION_REGISTER 36
*/
#define DELETION_REGISTER 36
# define NUM_REGISTERS 37
/* /*
* Each yank register is an array of pointers to lines. * Each yank register is an array of pointers to lines.

2
src/option.c
View File

@ -363,7 +363,7 @@ struct vimoption {
/* The 16 bit MS-DOS version is low on space, make the string as short as /* The 16 bit MS-DOS version is low on space, make the string as short as
* possible when compiling with few features. */ * possible when compiling with few features. */
#if defined(FEAT_DIFF) || defined(FEAT_FOLDING) || defined(FEAT_SPELL) \ #if defined(FEAT_DIFF) || defined(FEAT_FOLDING) || defined(FEAT_SPELL) \
|| defined(FEAT_VERTSPLIT) || defined(FEAT_CLIPBOARD) \ || defined(FEAT_VERTSPLIT) \
|| defined(FEAT_INS_EXPAND) || defined(FEAT_SYN_HL) || defined(FEAT_CONCEAL) || defined(FEAT_INS_EXPAND) || defined(FEAT_SYN_HL) || defined(FEAT_CONCEAL)
# define HIGHLIGHT_INIT \ # define HIGHLIGHT_INIT \
"8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,N:CursorLineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,-:Conceal,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill,!:CursorColumn,.:CursorLine,o:ColorColumn" "8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,N:CursorLineNr,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,-:Conceal,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill,!:CursorColumn,.:CursorLine,o:ColorColumn"

2
src/ui.c
View File

@ -539,7 +539,7 @@ void ui_cursor_shape(void)
conceal_check_cursur_line(); conceal_check_cursur_line();
} }
#if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \ #if defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \
|| defined(FEAT_MBYTE) || defined(PROTO) || defined(FEAT_MBYTE) || defined(PROTO)
/* /*
* Check bounds for column number * Check bounds for column number