new upstream release - 2.5.1
This commit is contained in:
parent
89ce253543
commit
9abeffde3d
@ -35,8 +35,8 @@ index f6efbf1..99cc1b8 100644
|
||||
+
|
||||
/* If it's not "", filename is a file to open. We make a new buffer, if
|
||||
* necessary, and then open and read the file, if applicable. */
|
||||
void open_buffer(const char *filename, bool undoable)
|
||||
@@ -399,11 +417,7 @@ void open_buffer(const char *filename, bool undoable)
|
||||
bool open_buffer(const char *filename, bool undoable)
|
||||
@@ -399,11 +417,7 @@ bool open_buffer(const char *filename, bool undoable)
|
||||
if (rc > 0) {
|
||||
read_file(f, rc, filename, undoable, new_buffer);
|
||||
#ifndef NANO_TINY
|
||||
@ -49,7 +49,7 @@ index f6efbf1..99cc1b8 100644
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1758,10 +1772,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
|
||||
@@ -1744,10 +1758,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
|
||||
* specified it interactively), stat and save the value now,
|
||||
* or else we will chase null pointers when we do modtime checks,
|
||||
* preserve file times, and so on, during backup. */
|
||||
@ -62,7 +62,7 @@ index f6efbf1..99cc1b8 100644
|
||||
|
||||
/* We backup only if the backup toggle is set, the file isn't
|
||||
* temporary, and the file already exists. Furthermore, if we
|
||||
@@ -2151,8 +2163,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
|
||||
@@ -2137,8 +2149,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
|
||||
if (openfile->current_stat == NULL)
|
||||
openfile->current_stat =
|
||||
(struct stat *)nmalloc(sizeof(struct stat));
|
||||
|
@ -28,7 +28,7 @@ diff --git a/configure b/configure
|
||||
index 02733c7..1805e53 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -7755,7 +7755,7 @@ fi
|
||||
@@ -7752,7 +7752,7 @@ fi
|
||||
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ diff --git a/src/files.c b/src/files.c
|
||||
index 99cc1b8..9a1bdcc 100644
|
||||
--- a/src/files.c
|
||||
+++ b/src/files.c
|
||||
@@ -1681,6 +1681,29 @@ int copy_file(FILE *inn, FILE *out)
|
||||
@@ -1667,6 +1667,29 @@ int copy_file(FILE *inn, FILE *out)
|
||||
return retval;
|
||||
}
|
||||
|
||||
@ -84,7 +84,7 @@ index 99cc1b8..9a1bdcc 100644
|
||||
/* Write a file out to disk. If f_open isn't NULL, we assume that it is
|
||||
* a stream associated with the file, and we don't try to open it
|
||||
* ourselves. If tmp is TRUE, we set the umask to disallow anyone else
|
||||
@@ -1922,18 +1945,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
|
||||
@@ -1908,18 +1931,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
|
||||
fprintf(stderr, "Backing up %s to %s\n", realname, backupname);
|
||||
#endif
|
||||
|
||||
@ -106,7 +106,7 @@ index 99cc1b8..9a1bdcc 100644
|
||||
if (prompt_failed_backupwrite(backupname))
|
||||
goto skip_backup;
|
||||
statusbar(_("Error writing backup file %s: %s"), backupname,
|
||||
@@ -1945,6 +1959,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
|
||||
@@ -1931,6 +1945,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
|
||||
goto cleanup_and_exit;
|
||||
}
|
||||
|
||||
|
@ -1,7 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iEYEABECAAYFAlZjyBEACgkQvLNW35EAn6c2pwCg44t3cjySFYTBxqUQWn5cG/+i
|
||||
nuIAoLrOVrhe06exKsGb8S9RpvqvfUPV
|
||||
=jqjB
|
||||
-----END PGP SIGNATURE-----
|
7
nano-2.5.1.tar.gz.asc
Normal file
7
nano-2.5.1.tar.gz.asc
Normal file
@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iEYEABECAAYFAlaTOJAACgkQvLNW35EAn6cUYwCg06jx/7wtlHA9Fx2VI/wfiL29
|
||||
25wAn3ew1mra5GWeQ4zck4/VicUC2qE1
|
||||
=sSKY
|
||||
-----END PGP SIGNATURE-----
|
@ -1,6 +1,6 @@
|
||||
Summary: A small text editor
|
||||
Name: nano
|
||||
Version: 2.5.0
|
||||
Version: 2.5.1
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Applications/Editors
|
||||
@ -96,6 +96,9 @@ exit 0
|
||||
%{_datadir}/nano
|
||||
|
||||
%changelog
|
||||
* Mon Jan 11 2016 Kamil Dudka <kdudka@redhat.com> - 2.5.1-1
|
||||
- new upstream release
|
||||
|
||||
* Sun Dec 06 2015 Kamil Dudka <kdudka@redhat.com> - 2.5.0-1
|
||||
- new upstream release
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user