Re: master e714b31 3/6: Merge from origin/emacs-28

[Stefan Kangas <stefankangas@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> https://lists.gnu.org/r/emacs-devel/2017-12/msg00340.html
>> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=29366
>
> I guess we read different discussions, then.

I read the above.  Which discussions are you reading?

Let's count heads: Robert Pluim, Michael Albinus, Stefan Monnier, Stefan
Kangas, Glenn Morris, Juri Linkov have AFAICT all come out in support of
this change.  Some more forcefully than others.

I don't see anyone against the change.

> How can a simple bug in gitmerge be a proof of anything (except that
> bugs happen)?

The existence of the special code for this in gitmerge is already proof
that this is suboptimal.  If it is buggy, that makes it worse of course.

But even if there are no bugs in gitmerge.el, today or in the future, we
still lose the ability to use "git blame" in etc/NEWS.NN for the
previous release on master.

And what's the upside?  None, AFAICT.

Instead of working against fundamental limitations in git, it is easy or
even trivial to completely side-step the issue.  AFAICT, the attached
patch fixes this on GNU/Linux, but I think you would need to do more on
operating systems without symlink support.  (There is obviously also
more stuff to do in gitmerge.el and the install step.  I didn't bother
for this quick proof-of-concept though.)

[-- Attachment #2: 0001-Move-etc-NEWS-to-etc-NEWS.NN.patch --]
[-- Type: text/x-diff, Size: 2185 bytes --]

From 64f7877d803d8ab7870469437bd6809e68142f42 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Wed, 10 Nov 2021 18:11:36 +0100
Subject: [PATCH] Move etc/NEWS to etc/NEWS.NN

* etc/NEWS: Move from here...
* etc/NEWS.29: ...to here.
* .gitignore: Ignore NEWS.
* autogen.sh: Symlink etc/NEWS to etc/NEWS.NN.
* src/callproc.c (init_callproc): Search for the etc/ directory based
on the "TODO" file instead of "NEWS".
---
 .gitignore            | 1 +
 autogen.sh            | 5 +++++
 etc/{NEWS => NEWS.29} | 0
 src/callproc.c        | 4 ++--
 4 files changed, 8 insertions(+), 2 deletions(-)
 rename etc/{NEWS => NEWS.29} (100%)

diff --git a/.gitignore b/.gitignore
index ea1662c9b8..c212340da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -264,6 +264,7 @@ doc/misc/cc-mode.ss
 doc/misc/modus-themes.texi
 doc/misc/org.texi
 etc/DOC
+etc/NEWS
 etc/refcards/emacsver.tex
 gnustmp*
 /info/
diff --git a/autogen.sh b/autogen.sh
index 531e5775f9..1112fadd63 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -140,6 +140,11 @@ do_git=
     test -r .git && do_git=true;;
 esac
 
+# Symlink NEWS
+if [ ! -e etc/NEWS ]; then
+    ln -s "$(ls -1 etc/NEWS.* | tail -1)" etc/NEWS
+fi
+
 # Generate Autoconf-related files, if requested.
 
 if $do_autoconf; then
diff --git a/etc/NEWS b/etc/NEWS.29
similarity index 100%
rename from etc/NEWS
rename to etc/NEWS.29
diff --git a/src/callproc.c b/src/callproc.c
index fa43f97384..f0354320f7 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1733,13 +1733,13 @@ init_callproc (void)
 
       srcdir = Fexpand_file_name (build_string ("../src/"), lispdir);
 
-      tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory);
+      tem = Fexpand_file_name (build_string ("TODO"), Vdata_directory);
       if (!NILP (Fequal (srcdir, Vinvocation_directory))
 	  || NILP (Ffile_exists_p (tem)) || !NILP (Vinstallation_directory))
 	{
 	  Lisp_Object newdir;
 	  newdir = Fexpand_file_name (build_string ("../etc/"), lispdir);
-	  tem = Fexpand_file_name (build_string ("NEWS"), newdir);
+	  tem = Fexpand_file_name (build_string ("TODO"), newdir);
 	  if (!NILP (Ffile_exists_p (tem)))
 	    Vdata_directory = newdir;
 	}
-- 
2.30.2