search.c (a8f92a7ce5678c7ac2c635f123aea79b13ba8dd7) | search.c (8ed69c6ff9a57551420d2cb6f67c989b37477cb5) |
---|---|
1/* $FreeBSD$ */ | |
2/* 3 * Copyright (C) 1984-2000 Mark Nudelman 4 * 5 * You may distribute under the terms of either the GNU General Public 6 * License or the Less License, as specified in the README file. 7 * 8 * For more information about less, or for information on how to 9 * contact the author, see the README file. --- 8 unchanged lines hidden (view full) --- 18#include "position.h" 19 20#define MINPOS(a,b) (((a) < (b)) ? (a) : (b)) 21#define MAXPOS(a,b) (((a) > (b)) ? (a) : (b)) 22 23#if HAVE_POSIX_REGCOMP 24#include <regex.h> 25#ifdef REG_EXTENDED | 1/* 2 * Copyright (C) 1984-2000 Mark Nudelman 3 * 4 * You may distribute under the terms of either the GNU General Public 5 * License or the Less License, as specified in the README file. 6 * 7 * For more information about less, or for information on how to 8 * contact the author, see the README file. --- 8 unchanged lines hidden (view full) --- 17#include "position.h" 18 19#define MINPOS(a,b) (((a) < (b)) ? (a) : (b)) 20#define MAXPOS(a,b) (((a) > (b)) ? (a) : (b)) 21 22#if HAVE_POSIX_REGCOMP 23#include <regex.h> 24#ifdef REG_EXTENDED |
26#define REGCOMP_FLAG (more_mode ? 0 : REG_EXTENDED) | 25#define REGCOMP_FLAG REG_EXTENDED |
27#else 28#define REGCOMP_FLAG 0 29#endif 30#endif 31#if HAVE_PCRE 32#include <pcre.h> 33#endif 34#if HAVE_RE_COMP --- 13 unchanged lines hidden (view full) --- 48 49extern int sigs; 50extern int how_search; 51extern int caseless; 52extern int linenums; 53extern int sc_height; 54extern int jump_sline; 55extern int bs_mode; | 26#else 27#define REGCOMP_FLAG 0 28#endif 29#endif 30#if HAVE_PCRE 31#include <pcre.h> 32#endif 33#if HAVE_RE_COMP --- 13 unchanged lines hidden (view full) --- 47 48extern int sigs; 49extern int how_search; 50extern int caseless; 51extern int linenums; 52extern int sc_height; 53extern int jump_sline; 54extern int bs_mode; |
56extern int more_mode; | 55extern int status_col; |
57extern POSITION start_attnpos; 58extern POSITION end_attnpos; 59#if HILITE_SEARCH 60extern int hilite_search; 61extern int screen_trashed; 62extern int size_linebuf; 63extern int squished; 64extern int can_goto_line; --- 441 unchanged lines hidden (view full) --- 506 public int 507is_hilited(pos, epos, nohide) 508 POSITION pos; 509 POSITION epos; 510 int nohide; 511{ 512 struct hilite *hl; 513 | 56extern POSITION start_attnpos; 57extern POSITION end_attnpos; 58#if HILITE_SEARCH 59extern int hilite_search; 60extern int screen_trashed; 61extern int size_linebuf; 62extern int squished; 63extern int can_goto_line; --- 441 unchanged lines hidden (view full) --- 505 public int 506is_hilited(pos, epos, nohide) 507 POSITION pos; 508 POSITION epos; 509 int nohide; 510{ 511 struct hilite *hl; 512 |
514 if (start_attnpos != NULL_POSITION && | 513 if (!status_col && 514 start_attnpos != NULL_POSITION && |
515 pos < end_attnpos && 516 (epos == NULL_POSITION || epos > start_attnpos)) 517 /* 518 * The attn line overlaps this range. 519 */ 520 return (1); 521 522 if (hilite_search == 0) --- 839 unchanged lines hidden --- | 515 pos < end_attnpos && 516 (epos == NULL_POSITION || epos > start_attnpos)) 517 /* 518 * The attn line overlaps this range. 519 */ 520 return (1); 521 522 if (hilite_search == 0) --- 839 unchanged lines hidden --- |