Hello community,
here is the log from the commit of package ed for openSUSE:Factory checked in at 2015-04-07 09:26:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ed (Old)
and /work/SRC/openSUSE:Factory/.ed.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ed"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ed/ed.changes 2014-02-28 16:21:41.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ed.new/ed.changes 2015-04-07 09:26:27.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Apr 3 06:33:35 UTC 2015 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Update to 1.11
+ * main_loop.c (exec_command): Fixed 'z' command.
+ (zN printed N + 1 lines).
+ * ed.texi: Documented the window size used by the 'z' command.
+ * Makefile.in: Added new targets 'install*-compress'.
+ * Restored original copyright notices in the code. I assigned to
+ the FSF the copyright on changes made to the part of ed already
+ copyrighted by the FSF, which seems to be just the manual.
+
+-------------------------------------------------------------------
Old:
----
ed-1.10.tar.xz
New:
----
ed-1.11.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ed.spec ++++++
--- /var/tmp/diff_new_pack.zCPJVV/_old 2015-04-07 09:26:28.000000000 +0200
+++ /var/tmp/diff_new_pack.zCPJVV/_new 2015-04-07 09:26:28.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ed
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,17 @@
Name: ed
-Version: 1.10
+Version: 1.11
Release: 0
Summary: GNU ed is a line-oriented text editor
License: GPL-3.0+ and LGPL-2.1+
Group: Productivity/Editors/Other
Url: http://www.gnu.org/software/ed/
-#DL_URL: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.lz
-#mvyskocil: repackaged to xz in order to avoid adding lzip to bootstrap
-Source0: ed-1.10.tar.xz
-Requires(pre): %install_info_prereq
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source0: %{name}-%{version}.tar.xz
BuildRequires: xz
+Requires(preun): %{install_info_prereq}
+Requires(post): %{install_info_prereq}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
GNU ed is a line-oriented text editor. It is used to create, display,
@@ -47,18 +46,18 @@
configure
%build
-%{configure}
+%configure
make %{?_smp_mflags}
%install
-%{makeinstall}
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
#UsrMerge
-%{__install} -d -m 0755 %{buildroot}/bin
-%{__ln_s} %{_bindir}/ed %{buildroot}/bin/ed
+install -d -m 0755 %{buildroot}/bin
+ln -s %{_bindir}/ed %{buildroot}/bin/ed
#UsrMerge
%check
-make check
+make %{?_smp_mflags} check
%files
%defattr(-,root,root)
@@ -73,7 +72,7 @@
%post
%install_info --entry="* ed: (ed). Line-oriented text editor" --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
-%postun
+%preun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%changelog
++++++ ed-1.10.tar.xz -> ed-1.11.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/COPYING new/ed-1.11/COPYING
--- old/ed-1.10/COPYING 2007-06-28 20:58:47.000000000 +0200
+++ new/ed-1.11/COPYING 2007-06-28 20:58:47.000000000 +0200
@@ -1,4 +1,3 @@
-
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
@@ -77,7 +76,7 @@
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
-
+
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
@@ -510,7 +509,7 @@
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
-
+
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
@@ -673,4 +672,3 @@
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
http://www.gnu.org/philosophy/why-not-lgpl.html.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/ChangeLog new/ed-1.11/ChangeLog
--- old/ed-1.10/ChangeLog 2014-01-22 20:36:16.000000000 +0100
+++ new/ed-1.11/ChangeLog 2015-03-30 19:51:15.000000000 +0200
@@ -1,3 +1,14 @@
+2015-03-30 Antonio Diaz Diaz
+
+ * Version 1.11 released.
+ * main_loop.c (exec_command): Fixed 'z' command.
+ (zN printed N + 1 lines).
+ * ed.texi: Documented the window size used by the 'z' command.
+ * Makefile.in: Added new targets 'install*-compress'.
+ * Restored original copyright notices in the code. I assigned to
+ the FSF the copyright on changes made to the part of ed already
+ copyrighted by the FSF, which seems to be just the manual.
+
2014-01-22 Antonio Diaz Diaz
* Version 1.10 released.
@@ -51,8 +62,8 @@
* buffer.c (append_lines): Fixed 'a', 'c' and 'i' commands.
(When used in a global command list, the commands following
them in the list were ignored).
- * main_loop.c (exec_command): Fixed 'e' command. (It quitted
- when invoked a second time with a modified buffer).
+ * main_loop.c (exec_command): Fixed 'e' command.
+ (It quitted when invoked a second time with a modified buffer).
* main.c: Added new option '--restricted'.
* 'red' has been converted to a script invoking 'ed --restricted'.
* Description of ed in the manual has been changed.
@@ -208,8 +219,7 @@
Copyright (C) 1993 François Pinard
Copyright (C) 1994 Andrew Moore
-Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
-Free Software Foundation, Inc.
+Copyright (C) 2006-2015 Antonio Diaz Diaz.
This file is a collection of facts, and thus it is not copyrightable,
but just in case, you have unlimited permission to copy, distribute and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/INSTALL new/ed-1.11/INSTALL
--- old/ed-1.10/INSTALL 2014-01-22 20:50:24.000000000 +0100
+++ new/ed-1.11/INSTALL 2015-01-08 12:54:16.000000000 +0100
@@ -1,7 +1,7 @@
Requirements
------------
You will need a C compiler and a C library compatible with GNU libc.
-I use gcc 4.8.1 and 3.3.6, but the code should compile with any
+I use gcc 4.9.1 and 3.3.6, but the code should compile with any
standards compliant compiler.
Gcc is available at http://gcc.gnu.org.
@@ -32,7 +32,11 @@
5. Type 'make install' to install the program and any data files and
documentation.
- You can install only the program, the info manual or the man page
+ Or type 'make install-compress', which additionally compresses the
+ info manual and the man page after installation. (Installing
+ compressed docs may become the default in the future).
+
+ You can install only the program, the info manual or the man page by
typing 'make install-bin', 'make install-info' or 'make install-man'
respectively.
@@ -54,8 +58,7 @@
explained above.
-Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
-Antonio Diaz Diaz.
+Copyright (C) 2006-2015 Antonio Diaz Diaz.
This file is free documentation: you have unlimited permission to copy,
distribute and modify it.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/Makefile.in new/ed-1.11/Makefile.in
--- old/ed-1.10/Makefile.in 2014-01-16 20:07:06.000000000 +0100
+++ new/ed-1.11/Makefile.in 2015-01-11 19:05:25.000000000 +0100
@@ -10,27 +10,26 @@
objs = buffer.o carg_parser.o global.o io.o main.o main_loop.o regex.o signal.o
-.PHONY : all install install-bin install-info install-man install-strip \
+.PHONY : all install install-bin install-info install-man \
+ install-strip install-compress install-strip-compress \
+ install-bin-strip install-info-compress install-man-compress \
uninstall uninstall-bin uninstall-info uninstall-man \
doc info man check dist clean distclean
all : $(progname) r$(progname)
$(progname) : $(objs)
- $(CC) $(LDFLAGS) -o $@ $(objs)
-
-$(progname)_profiled : $(objs)
- $(CC) $(LDFLAGS) -pg -o $@ $(objs)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs)
r$(progname) : r$(progname).in
cat $(VPATH)/r$(progname).in > $@
chmod a+x $@
main.o : main.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
+ $(CC) $(CFLAGS) $(CPPFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
%.o : %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
$(objs) : Makefile ed.h
carg_parser.o : carg_parser.h
@@ -56,27 +55,40 @@
@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite $(pkgversion)
install : install-bin install-info install-man
+install-strip : install-bin-strip install-info install-man
+install-compress : install-bin install-info-compress install-man-compress
+install-strip-compress : install-bin-strip install-info-compress install-man-compress
install-bin : all
if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi
$(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(program_prefix)$(progname)"
$(INSTALL_SCRIPT) ./r$(progname) "$(DESTDIR)$(bindir)/$(program_prefix)r$(progname)"
+install-bin-strip : all
+ $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install-bin
+
install-info :
if [ ! -d "$(DESTDIR)$(infodir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(infodir)" ; fi
+ -rm -f "$(DESTDIR)$(infodir)/$(pkgname).info"*
$(INSTALL_DATA) $(VPATH)/doc/$(pkgname).info "$(DESTDIR)$(infodir)/$(program_prefix)$(pkgname).info"
-install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$(program_prefix)$(pkgname).info"
+install-info-compress : install-info
+ lzip -v -9 "$(DESTDIR)$(infodir)/$(pkgname).info"
+
install-man :
if [ ! -d "$(DESTDIR)$(mandir)/man1" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" ; fi
+ -rm -f "$(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1"*
+ -rm -f "$(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1"*
$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 "$(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1"
- -rm -f "$(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1"
cd "$(DESTDIR)$(mandir)/man1" && ln -s "$(program_prefix)$(progname).1" "$(program_prefix)r$(progname).1"
-install-strip : all
- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+install-man-compress : install-man
+ lzip -v -9 "$(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1"
+ -rm -f "$(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1"*
+ cd "$(DESTDIR)$(mandir)/man1" && ln -s "$(program_prefix)$(progname).1.lz" "$(program_prefix)r$(progname).1.lz"
-uninstall : uninstall-bin uninstall-info uninstall-man
+uninstall : uninstall-man uninstall-info uninstall-bin
uninstall-bin :
-rm -f "$(DESTDIR)$(bindir)/$(program_prefix)$(progname)"
@@ -84,11 +96,11 @@
uninstall-info :
-install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$(program_prefix)$(pkgname).info"
- -rm -f "$(DESTDIR)$(infodir)/$(program_prefix)$(pkgname).info"
+ -rm -f "$(DESTDIR)$(infodir)/$(program_prefix)$(pkgname).info"*
uninstall-man :
- -rm -f "$(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1"
- -rm -f "$(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1"
+ -rm -f "$(DESTDIR)$(mandir)/man1/$(program_prefix)$(progname).1"*
+ -rm -f "$(DESTDIR)$(mandir)/man1/$(program_prefix)r$(progname).1"*
dist : doc
ln -sf $(VPATH) $(DISTNAME)
@@ -119,7 +131,7 @@
lzip -v -9 $(DISTNAME).tar
clean :
- -rm -f $(progname) r$(progname) $(progname)_profiled $(objs)
+ -rm -f $(progname) r$(progname) $(objs)
distclean : clean
-rm -f Makefile config.status *.tar *.tar.lz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/NEWS new/ed-1.11/NEWS
--- old/ed-1.10/NEWS 2014-01-22 19:08:39.000000000 +0100
+++ new/ed-1.11/NEWS 2015-01-13 14:12:57.000000000 +0100
@@ -1,3 +1,11 @@
-Changes in version 1.10:
+Changes in version 1.11:
-"ed.texinfo" has been renamed to "ed.texi".
+The "z" command has been fixed. ("zN" printed N + 1 lines). This bug was
+present since at least ed-0.2.
+
+The window size used by the "z" command has been documented in the
+manual.
+
+The targets "install-compress", "install-strip-compress",
+"install-info-compress" and "install-man-compress" have been added to
+the Makefile.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/README new/ed-1.11/README
--- old/ed-1.10/README 2014-01-22 23:33:59.000000000 +0100
+++ new/ed-1.11/README 2015-01-11 19:43:16.000000000 +0100
@@ -136,8 +136,7 @@
Copyright (C) 1993, 1994 Andrew Moore
-Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
-Free Software Foundation, Inc.
+Copyright (C) 2006-2015 Antonio Diaz Diaz.
This file is free documentation: you have unlimited permission to copy,
distribute and modify it.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/buffer.c new/ed-1.11/buffer.c
--- old/ed-1.10/buffer.c 2014-01-22 19:08:39.000000000 +0100
+++ new/ed-1.11/buffer.c 2015-01-14 11:04:06.000000000 +0100
@@ -1,12 +1,11 @@
/* buffer.c: scratch-file buffer routines for the ed line editor. */
/* GNU ed - The GNU line editor.
Copyright (C) 1993, 1994 Andrew Moore, Talke Studio
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- Free Software Foundation, Inc.
+ Copyright (C) 2006-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -107,7 +106,7 @@
/* Insert text from stdin (or from command buffer if global) to after
line n; stop when either a single period is read or EOF.
- Return false if insertion fails. */
+ Returns false if insertion fails. */
bool append_lines( const char ** const ibufpp, const int addr,
const bool isglobal )
{
@@ -492,7 +491,7 @@
}
}
else if( o_addr <= 2 * addr )
- while( o_addr > addr ) { --o_addr; lp = lp->q_back; }
+ while( o_addr > addr ) { --o_addr; lp = lp->q_back; }
else
{ lp = &buffer_head; o_addr = 0;
while( o_addr < addr ) { ++o_addr; lp = lp->q_forw; } }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/carg_parser.c new/ed-1.11/carg_parser.c
--- old/ed-1.10/carg_parser.c 2014-01-12 21:05:53.000000000 +0100
+++ new/ed-1.11/carg_parser.c 2015-01-16 23:09:05.000000000 +0100
@@ -1,10 +1,9 @@
/* Arg_parser - POSIX/GNU command line argument parser. (C version)
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- Antonio Diaz Diaz.
+ Copyright (C) 2006-2015 Antonio Diaz Diaz.
This library is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This library is distributed in the hope that it will be useful,
@@ -176,7 +175,8 @@
if( index < 0 )
{
- add_error( ap, "invalid option -- " ); add_error( ap, code_str );
+ add_error( ap, "invalid option -- '" ); add_error( ap, code_str );
+ add_error( ap, "'" );
return 1;
}
@@ -191,8 +191,8 @@
{
if( !arg || !arg[0] )
{
- add_error( ap, "option requires an argument -- " );
- add_error( ap, code_str );
+ add_error( ap, "option requires an argument -- '" );
+ add_error( ap, code_str ); add_error( ap, "'" );
return 1;
}
++*argindp; cind = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/carg_parser.h new/ed-1.11/carg_parser.h
--- old/ed-1.10/carg_parser.h 2014-01-12 21:05:53.000000000 +0100
+++ new/ed-1.11/carg_parser.h 2015-01-16 23:09:05.000000000 +0100
@@ -1,10 +1,9 @@
/* Arg_parser - POSIX/GNU command line argument parser. (C version)
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- Antonio Diaz Diaz.
+ Copyright (C) 2006-2015 Antonio Diaz Diaz.
This library is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This library is distributed in the hope that it will be useful,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/configure new/ed-1.11/configure
--- old/ed-1.10/configure 2014-01-22 19:08:39.000000000 +0100
+++ new/ed-1.11/configure 2015-03-30 19:51:15.000000000 +0200
@@ -1,13 +1,12 @@
#! /bin/sh
# configure script for GNU ed - The GNU line editor
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
-# Antonio Diaz Diaz.
+# Copyright (C) 2006-2015 Antonio Diaz Diaz.
#
# This configure script is free software: you have unlimited permission
# to copy, distribute and modify it.
pkgname=ed
-pkgversion=1.10
+pkgversion=1.11
progname=ed
srctrigger=doc/${pkgname}.texi
@@ -67,7 +66,7 @@
echo " --infodir=DIR info files directory [${infodir}]"
echo " --mandir=DIR man pages directory [${mandir}]"
echo " --program-prefix=NAME install program and documentation prefixed with NAME"
- echo " CC=COMPILER C compiler to use [gcc]"
+ echo " CC=COMPILER C compiler to use [${CC}]"
echo " CPPFLAGS=OPTIONS command line options for the preprocessor [${CPPFLAGS}]"
echo " CFLAGS=OPTIONS command line options for the C compiler [${CFLAGS}]"
echo " LDFLAGS=OPTIONS command line options for the linker [${LDFLAGS}]"
@@ -171,8 +170,7 @@
rm -f Makefile
cat > Makefile << EOF
# Makefile for GNU ed - The GNU line editor
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
-# Antonio Diaz Diaz.
+# Copyright (C) 2006-2015 Antonio Diaz Diaz.
# This file was generated automatically by configure. Do not edit.
#
# This Makefile is free software: you have unlimited permission
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/doc/ed.1 new/ed-1.11/doc/ed.1
--- old/ed-1.10/doc/ed.1 2014-01-22 23:34:02.000000000 +0100
+++ new/ed-1.11/doc/ed.1 2015-03-30 20:22:04.000000000 +0200
@@ -1,10 +1,10 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1.
-.TH ED "1" "January 2014" "Ed 1.10" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.1.
+.TH ED "1" "March 2015" "ed 1.11" "User Commands"
.SH NAME
-Ed \- line-oriented text editor
+ed \- line-oriented text editor
.SH SYNOPSIS
.B ed
-[\fIoptions\fR] [\fIfile\fR]
+[\fI\,options\/\fR] [\fI\,file\/\fR]
.SH DESCRIPTION
GNU Ed \- The GNU line editor.
.SH OPTIONS
@@ -21,7 +21,7 @@
\fB\-l\fR, \fB\-\-loose\-exit\-status\fR
exit with 0 status even if a command fails
.TP
-\fB\-p\fR, \fB\-\-prompt\fR=\fISTRING\fR
+\fB\-p\fR, \fB\-\-prompt\fR=\fI\,STRING\/\fR
use STRING as an interactive prompt
.TP
\fB\-r\fR, \fB\-\-restricted\fR
@@ -49,20 +49,20 @@
.SH COPYRIGHT
Copyright \(co 1994 Andrew L. Moore.
.br
-Copyright \(co 2014 Free Software Foundation, Inc.
+Copyright \(co 2015 Antonio Diaz Diaz.
License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html
.br
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
.SH "SEE ALSO"
The full documentation for
-.B Ed
+.B ed
is maintained as a Texinfo manual. If the
.B info
and
-.B Ed
+.B ed
programs are properly installed at your site, the command
.IP
-.B info Ed
+.B info ed
.PP
should give you access to the complete manual.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/doc/ed.info new/ed-1.11/doc/ed.info
--- old/ed-1.10/doc/ed.info 2014-01-22 23:34:02.000000000 +0100
+++ new/ed-1.11/doc/ed.info 2015-03-30 19:51:25.000000000 +0200
@@ -5,8 +5,7 @@
* Ed: (ed). The GNU line editor
END-INFO-DIR-ENTRY
- Copyright (C) 1993, 1994, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-2013, 2014 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 2006-2015 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -19,7 +18,7 @@
The GNU ed line editor
**********************
-This manual is for GNU ed (version 1.10, 22 January 2014).
+This manual is for GNU ed (version 1.11, 30 March 2015).
GNU ed is a line-oriented text editor. It is used to create, display,
@@ -44,8 +43,7 @@
* GNU Free Documentation License:: How you can copy and share this manual
- Copyright (C) 1993, 1994, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-2013, 2014 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 2006-2015 Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -165,10 +163,10 @@
<r> command (mnemonic: "read"):
*r !cal -m
- 143
+ 137
*
- Here 'ed' is telling us that it has just read 143 characters into
+ Here 'ed' is telling us that it has just read 137 characters into
the editor buffer - i.e., the output of the 'cal' command, which prints
a simple ASCII calendar. To display the buffer contents we issue the
<p> ("print") command (not to be confused with the prompt command,
@@ -177,13 +175,13 @@
shorthand for "the whole buffer":
*,p
- September 2006
+ June 2006
Mo Tu We Th Fr Sa Su
- 1 2 3
- 4 5 6 7 8 9 10
- 11 12 13 14 15 16 17
- 18 19 20 21 22 23 24
- 25 26 27 28 29 30
+ 1 2 3 4
+ 5 6 7 8 9 10 11
+ 12 13 14 15 16 17 18
+ 19 20 21 22 23 24 25
+ 26 27 28 29 30
*
@@ -192,7 +190,7 @@
it's the whole buffer we want:
*,w junk
- 143
+ 137
*
Need we say? It's good practice to frequently write the buffer
@@ -841,9 +839,11 @@
commands. The current address is unchanged.
'(.+1)z N'
- Scrolls N lines at a time starting at addressed line. If N is not
- specified, then the current window size is used. The current
- address is set to the last line printed.
+ Scrolls N lines at a time starting at addressed line, and sets
+ window size to N. If N is not specified, then the current window
+ size is used. Window size defaults to screen size minus two lines,
+ or to 22 if screen size can't be determined. The current address
+ is set to the last line printed.
'!COMMAND'
Executes COMMAND via 'sh (1)'. If the first character of COMMAND
@@ -1411,17 +1411,17 @@
Tag Table:
-Node: Top578
-Node: Overview2281
-Node: Introduction to line editing4338
-Node: Invoking ed11584
-Node: Line addressing13385
-Node: Regular expressions16462
-Node: Commands21806
-Node: Limitations32951
-Node: Diagnostics33592
-Node: Problems34293
-Node: GNU Free Documentation License34826
+Node: Top535
+Node: Overview2193
+Node: Introduction to line editing4250
+Node: Invoking ed11491
+Node: Line addressing13292
+Node: Regular expressions16369
+Node: Commands21713
+Node: Limitations32993
+Node: Diagnostics33634
+Node: Problems34335
+Node: GNU Free Documentation License34868
End Tag Table
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/doc/ed.texi new/ed-1.11/doc/ed.texi
--- old/ed-1.10/doc/ed.texi 2014-01-22 23:33:59.000000000 +0100
+++ new/ed-1.11/doc/ed.texi 2015-03-30 19:51:15.000000000 +0200
@@ -6,8 +6,8 @@
@finalout
@c %**end of header
-@set UPDATED 22 January 2014
-@set VERSION 1.10
+@set UPDATED 30 March 2015
+@set VERSION 1.11
@dircategory Basics
@direntry
@@ -15,8 +15,8 @@
@end direntry
@copying
-Copyright @copyright{} 1993, 1994, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013, 2014 Free Software Foundation, Inc.
+Copyright @copyright{} 1993, 1994, 2006-2015
+Free Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -199,11 +199,11 @@
@example
*r !cal -m
-143
+137
*
@end example
-Here @command{ed} is telling us that it has just read 143 characters
+Here @command{ed} is telling us that it has just read 137 characters
into the editor buffer - i.e., the output of the @command{cal} command,
which prints a simple ASCII calendar. To display the buffer contents we
issue the @key{p} (@dfn{print}) command (not to be confused with the
@@ -213,13 +213,13 @@
@example
*,p
- September 2006
+ June 2006
Mo Tu We Th Fr Sa Su
- 1 2 3
- 4 5 6 7 8 9 10
-11 12 13 14 15 16 17
-18 19 20 21 22 23 24
-25 26 27 28 29 30
+ 1 2 3 4
+ 5 6 7 8 9 10 11
+12 13 14 15 16 17 18
+19 20 21 22 23 24 25
+26 27 28 29 30
*
@end example
@@ -230,7 +230,7 @@
@example
*,w junk
-143
+137
*
@end example
@@ -919,9 +919,11 @@
@samp{c} commands. The current address is unchanged.
@item (.+1)z @var{n}
-Scrolls @var{n} lines at a time starting at addressed line. If @var{n}
-is not specified, then the current window size is used. The current
-address is set to the last line printed.
+Scrolls @var{n} lines at a time starting at addressed line, and sets
+window size to @var{n}. If @var{n} is not specified, then the current
+window size is used. Window size defaults to screen size minus two
+lines, or to 22 if screen size can't be determined. The current address
+is set to the last line printed.
@item !@var{command}
Executes @var{command} via @command{sh (1)}. If the first character of
@@ -994,7 +996,7 @@
If you find a bug in @command{ed}, please send electronic mail to
@email{bug-ed@@gnu.org}. Include the version number, which you can
-find by running @w{@samp{ed --version}}.
+find by running @w{@code{ed --version}}.
@node GNU Free Documentation License
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/ed.h new/ed-1.11/ed.h
--- old/ed-1.10/ed.h 2014-01-22 19:08:39.000000000 +0100
+++ new/ed-1.11/ed.h 2015-01-11 19:43:16.000000000 +0100
@@ -1,12 +1,11 @@
/* Global declarations for the ed editor. */
/* GNU ed - The GNU line editor.
Copyright (C) 1993, 1994 Andrew Moore, Talke Studio
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- Free Software Foundation, Inc.
+ Copyright (C) 2006-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/global.c new/ed-1.11/global.c
--- old/ed-1.10/global.c 2014-01-22 19:08:39.000000000 +0100
+++ new/ed-1.11/global.c 2015-01-11 19:43:16.000000000 +0100
@@ -1,12 +1,11 @@
/* global.c: global command routines for the ed line editor */
/* GNU ed - The GNU line editor.
Copyright (C) 1993, 1994 Andrew Moore, Talke Studio
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- Free Software Foundation, Inc.
+ Copyright (C) 2006-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -60,7 +59,8 @@
if( !resize_line_buffer( &active_list, &active_size,
( active_len + 1 ) * sizeof (line_t **) ) )
{
- show_strerror( 0, errno ); set_error_msg( "Memory exhausted" );
+ show_strerror( 0, errno );
+ set_error_msg( "Memory exhausted" );
enable_interrupts();
return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/io.c new/ed-1.11/io.c
--- old/ed-1.10/io.c 2014-01-22 19:08:39.000000000 +0100
+++ new/ed-1.11/io.c 2015-01-11 19:43:16.000000000 +0100
@@ -1,12 +1,11 @@
/* io.c: i/o routines for the ed line editor */
/* GNU ed - The GNU line editor.
Copyright (C) 1993, 1994 Andrew Moore, Talke Studio
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- Free Software Foundation, Inc.
+ Copyright (C) 2006-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -128,7 +127,7 @@
/* Read a line of text from stdin.
- Return pointer to buffer and line size (including trailing newline
+ Returns pointer to buffer and line size (including trailing newline
if it exists) */
const char * get_tty_line( int * const sizep )
{
@@ -145,7 +144,8 @@
{
if( ferror( stdin ) )
{
- show_strerror( "stdin", errno ); set_error_msg( "Cannot read stdin" );
+ show_strerror( "stdin", errno );
+ set_error_msg( "Cannot read stdin" );
clearerr( stdin ); if( sizep ) *sizep = 0;
return 0;
}
@@ -167,7 +167,7 @@
/* Read a line of text from a stream.
- Return pointer to buffer and line size (including trailing newline
+ Returns pointer to buffer and line size (including trailing newline
if it exists and is not added now) */
static const char * read_stream_line( FILE * const fp, int * const sizep,
bool * const newline_added_nowp )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/main.c new/ed-1.11/main.c
--- old/ed-1.10/main.c 2014-01-22 23:33:59.000000000 +0100
+++ new/ed-1.11/main.c 2015-01-11 19:43:16.000000000 +0100
@@ -1,10 +1,9 @@
/* GNU ed - The GNU line editor.
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- Free Software Foundation, Inc.
+ Copyright (C) 2006-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -45,7 +44,7 @@
static const char * const Program_name = "GNU Ed";
static const char * const program_name = "ed";
-static const char * const program_year = "2014";
+static const char * const program_year = "2015";
static const char * invocation_name = 0;
static bool restricted_ = false; /* if set, run in restricted mode */
@@ -85,9 +84,9 @@
static void show_version( void )
{
- printf( "%s %s\n", Program_name, PROGVERSION );
+ printf( "GNU %s %s\n", program_name, PROGVERSION );
printf( "Copyright (C) 1994 Andrew L. Moore.\n"
- "Copyright (C) %s Free Software Foundation, Inc.\n", program_year );
+ "Copyright (C) %s Antonio Diaz Diaz.\n", program_year );
printf( "License GPLv3+: GNU GPL version 3 or later http://gnu.org/licenses/gpl.html\n"
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n" );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/main_loop.c new/ed-1.11/main_loop.c
--- old/ed-1.10/main_loop.c 2014-01-22 19:08:39.000000000 +0100
+++ new/ed-1.11/main_loop.c 2015-01-13 13:20:27.000000000 +0100
@@ -1,11 +1,10 @@
/* GNU ed - The GNU line editor.
Copyright (C) 1993, 1994 Andrew Moore, Talke Studio
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- Free Software Foundation, Inc.
+ Copyright (C) 2006-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -92,7 +91,7 @@
}
-/* Return pointer to copy of shell command in the command buffer */
+/* Returns pointer to copy of shell command in the command buffer */
static const char * get_shell_command( const char ** const ibufpp )
{
static char * buf = 0;
@@ -159,7 +158,7 @@
}
-/* Return pointer to copy of filename in the command buffer */
+/* Returns pointer to copy of filename in the command buffer */
static const char * get_filename( const char ** const ibufpp )
{
static char * buf = 0;
@@ -259,7 +258,7 @@
/* get line addresses from the command buffer until an invalid address
- is seen. Return number of addresses read */
+ is seen. Returns the number of addresses read */
static int extract_addr_range( const char ** const ibufpp )
{
int addr;
@@ -601,8 +600,9 @@
{ if( parse_int( &n, *ibufpp, ibufpp ) ) set_window_lines( n );
else return ERR; }
if( !get_command_suffix( ibufpp, &gflags ) ||
- !display_lines( second_addr, min( last_addr(), second_addr + window_lines() ),
- gflags ) )
+ !display_lines( second_addr,
+ min( last_addr(), second_addr + window_lines() - 1 ),
+ gflags ) )
return ERR;
gflags = 0;
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/regex.c new/ed-1.11/regex.c
--- old/ed-1.10/regex.c 2014-01-22 19:08:39.000000000 +0100
+++ new/ed-1.11/regex.c 2015-01-11 19:43:16.000000000 +0100
@@ -1,12 +1,11 @@
/* regex.c: regular expression interface routines for the ed line editor. */
/* GNU ed - The GNU line editor.
Copyright (C) 1993, 1994 Andrew Moore, Talke Studio
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- Free Software Foundation, Inc.
+ Copyright (C) 2006-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/signal.c new/ed-1.11/signal.c
--- old/ed-1.10/signal.c 2014-01-22 19:08:39.000000000 +0100
+++ new/ed-1.11/signal.c 2015-01-13 13:47:41.000000000 +0100
@@ -1,12 +1,11 @@
/* signal.c: signal and miscellaneous routines for the ed line editor. */
/* GNU ed - The GNU line editor.
Copyright (C) 1993, 1994 Andrew Moore, Talke Studio
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
- Free Software Foundation, Inc.
+ Copyright (C) 2006-2015 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -34,7 +33,7 @@
jmp_buf jmp_state;
static int mutex = 0; /* If > 0, signals stay pending */
-static int window_lines_ = 22; /* scroll length: ws_row - 2 */
+static int window_lines_ = 22; /* scroll lines set by sigwinch_handler */
static int window_columns_ = 72;
static bool sighup_pending = false;
static bool sigint_pending = false;
@@ -101,7 +100,7 @@
}
-static int set_signal( int signum, void (*handler)( int ) )
+static int set_signal( const int signum, void (*handler)( int ) )
{
struct sigaction new_action;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ed-1.10/testsuite/check.sh new/ed-1.11/testsuite/check.sh
--- old/ed-1.10/testsuite/check.sh 2014-01-12 21:09:21.000000000 +0100
+++ new/ed-1.11/testsuite/check.sh 2015-01-11 19:43:16.000000000 +0100
@@ -1,7 +1,6 @@
#! /bin/sh
# check script for GNU ed - The GNU line editor
-# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
-# Free Software Foundation, Inc.
+# Copyright (C) 2006-2015 Antonio Diaz Diaz.
#
# This script is free software; you have unlimited permission
# to copy, distribute and modify it.
@@ -12,7 +11,7 @@
testdir=`cd "$1" ; pwd`
ED="${objdir}"/ed
-if [ ! -x "${ED}" ] ; then
+if [ ! -f "${ED}" ] || [ ! -x "${ED}" ] ; then
echo "${ED}: cannot execute"
exit 1
fi