diff options
author | Xin LI <delphij@FreeBSD.org> | 2007-06-21 10:42:55 +0000 |
---|---|---|
committer | Xin LI <delphij@FreeBSD.org> | 2007-06-21 10:42:55 +0000 |
commit | 811fe9ccfe33d060ffb08b919e42ae15147a27d6 (patch) | |
tree | c780c1aea3a3dea2249bcfe0b2071247ed385670 /contrib/less | |
parent | 22249a963575f911670ef98f90a75c8493ff1afa (diff) | |
parent | efd72c2eb66e67c4f367ba48c3effd0ae2a668e1 (diff) | |
download | src-test2-811fe9ccfe33d060ffb08b919e42ae15147a27d6.tar.gz src-test2-811fe9ccfe33d060ffb08b919e42ae15147a27d6.zip |
This commit was generated by cvs2svn to compensate for changes in r170964,
which included commits to RCS files with non-trunk default branches.
Notes
Notes:
svn path=/head/; revision=170965
Diffstat (limited to 'contrib/less')
-rw-r--r-- | contrib/less/NEWS | 2 | ||||
-rw-r--r-- | contrib/less/README | 4 | ||||
-rw-r--r-- | contrib/less/cmdbuf.c | 16 | ||||
-rw-r--r-- | contrib/less/less.man | 2 | ||||
-rw-r--r-- | contrib/less/less.nro | 2 | ||||
-rw-r--r-- | contrib/less/lessecho.man | 2 | ||||
-rw-r--r-- | contrib/less/lessecho.nro | 2 | ||||
-rw-r--r-- | contrib/less/lesskey.man | 2 | ||||
-rw-r--r-- | contrib/less/lesskey.nro | 2 | ||||
-rw-r--r-- | contrib/less/optfunc.c | 6 | ||||
-rw-r--r-- | contrib/less/version.c | 5 |
11 files changed, 29 insertions, 16 deletions
diff --git a/contrib/less/NEWS b/contrib/less/NEWS index ddd31370706d..ccb14ba432bd 100644 --- a/contrib/less/NEWS +++ b/contrib/less/NEWS @@ -13,7 +13,7 @@ ====================================================================== - Major changes between "less" versions 394 and 403 + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. diff --git a/contrib/less/README b/contrib/less/README index ac2d46edac81..848fe4de7731 100644 --- a/contrib/less/README +++ b/contrib/less/README @@ -1,7 +1,7 @@ - Less, version 403 + Less, version 406 - This is the distribution of less, version 403, released 25 May 2007. + This is the distribution of less, version 406, released 19 Jun 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or diff --git a/contrib/less/cmdbuf.c b/contrib/less/cmdbuf.c index 6effb60aeada..ad79ce9b9096 100644 --- a/contrib/less/cmdbuf.c +++ b/contrib/less/cmdbuf.c @@ -1390,11 +1390,14 @@ init_cmdhist() } if (strcmp(line, HISTFILE_SEARCH_SECTION) == 0) ml = &mlist_search; -#if SHELL_ESCAPE || PIPEC else if (strcmp(line, HISTFILE_SHELL_SECTION) == 0) + { +#if SHELL_ESCAPE || PIPEC ml = &mlist_shell; +#else + ml = NULL; #endif - else if (*line == '"') + } else if (*line == '"') { if (ml != NULL) cmd_addhist(ml, line+1); @@ -1444,11 +1447,18 @@ save_cmdhist() #if CMD_HISTORY char *filename; FILE *f; + int modified = 0; filename = histfile_name(); if (filename == NULL) return; - if (!mlist_search.modified && !mlist_shell.modified) + if (mlist_search.modified) + modified = 1; +#if SHELL_ESCAPE || PIPEC + if (mlist_shell.modified) + modified = 1; +#endif + if (!modified) return; f = fopen(filename, "w"); free(filename); diff --git a/contrib/less/less.man b/contrib/less/less.man index 18a1227f02cd..2efc49dfce82 100644 --- a/contrib/less/less.man +++ b/contrib/less/less.man @@ -1544,4 +1544,4 @@ LESS(1) LESS(1) - Version 403: 25 May 2007 LESS(1) + Version 406: 19 Jun 2007 LESS(1) diff --git a/contrib/less/less.nro b/contrib/less/less.nro index 85d05e99056a..ddba6d85672a 100644 --- a/contrib/less/less.nro +++ b/contrib/less/less.nro @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 403: 25 May 2007" +.TH LESS 1 "Version 406: 19 Jun 2007" .SH NAME less \- opposite of more .SH SYNOPSIS diff --git a/contrib/less/lessecho.man b/contrib/less/lessecho.man index b21f2c030a0e..49c863a17e3c 100644 --- a/contrib/less/lessecho.man +++ b/contrib/less/lessecho.man @@ -46,4 +46,4 @@ LESSECHO(1) LESSECHO(1) - Version 403: 25 May 2007 LESSECHO(1) + Version 406: 19 Jun 2007 LESSECHO(1) diff --git a/contrib/less/lessecho.nro b/contrib/less/lessecho.nro index 6a08e9bef892..297a7323b500 100644 --- a/contrib/less/lessecho.nro +++ b/contrib/less/lessecho.nro @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 403: 25 May 2007" +.TH LESSECHO 1 "Version 406: 19 Jun 2007" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS diff --git a/contrib/less/lesskey.man b/contrib/less/lesskey.man index 2b614a514b7f..ffad2c346f4c 100644 --- a/contrib/less/lesskey.man +++ b/contrib/less/lesskey.man @@ -357,4 +357,4 @@ LESSKEY(1) LESSKEY(1) - Version 403: 25 May 2007 LESSKEY(1) + Version 406: 19 Jun 2007 LESSKEY(1) diff --git a/contrib/less/lesskey.nro b/contrib/less/lesskey.nro index ebb506650ef4..63cb39a1dc63 100644 --- a/contrib/less/lesskey.nro +++ b/contrib/less/lesskey.nro @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 403: 25 May 2007" +.TH LESSKEY 1 "Version 406: 19 Jun 2007" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS diff --git a/contrib/less/optfunc.c b/contrib/less/optfunc.c index 8cb9aa3c931a..4ca514297c95 100644 --- a/contrib/less/optfunc.c +++ b/contrib/less/optfunc.c @@ -45,6 +45,9 @@ extern char *hproto; extern char *wproto; extern IFILE curr_ifile; extern char version[]; +extern int jump_sline; +extern int jump_sline_fraction; +extern int less_is_more; #if LOGFILE extern char *namelogfile; extern int force_logfile; @@ -53,9 +56,6 @@ extern int logfile; #if TAGS public char *tagoption = NULL; extern char *tags; -extern int jump_sline; -extern int jump_sline_fraction; -extern int less_is_more; #endif #if MSDOS_COMPILER extern int nm_fg_color, nm_bg_color; diff --git a/contrib/less/version.c b/contrib/less/version.c index 30efdde96693..df74e04f2aa0 100644 --- a/contrib/less/version.c +++ b/contrib/less/version.c @@ -690,6 +690,9 @@ v401 3/24/07 Minor documentation fixes. v402 3/30/07 Fix autoconf bug when memcpy etc are inline; fix bug in terminating number following -j option. v403 5/25/07 Fix Windows build. +v404 6/5/07 Fix display bug with F command and long lines. +v405 6/17/07 Fix display bug when using -w option. +v406 6/17/07 Fix secure build. */ -char version[] = "403"; +char version[] = "406"; |