[nongnu] elpa/vm a1e5b13242 3/3: Merge branch 'main' into 'main'

[ELPA Syncer]

branch: elpa/vm
commit a1e5b13242efb0fc756916cb670eacc22893d6db
Merge: 85359a6095 fc5947bd89
Author: Mark Diekhans <ma...@ucsc.edu>
Commit: Mark Diekhans <ma...@ucsc.edu>

    Merge branch 'main' into 'main'
    
    Fixed generation of autoloads and NEWS update
    
    Closes #505
    
    See merge request emacs-vm/vm!45
---
 NEWS             |  5 ++++-
 lisp/Makefile.in | 16 ++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 9234ebc313..584a4c385f 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,10 @@ Status
 
 VM 8.3.0 <in progress>
   CHANGES
-  * added vm-version-commit variable and function for the git commit id.
+  * VM development convert from bzr to git and moved to GitLab.
+  * Merged multiple pending changes.
+  * Update to modern e-lisp.
+  * Added vm-version-commit variable and function for the git commit id.
 
 VM 8.2.0b1
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index f5a3c8521f..f0ed87ec63 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -144,16 +144,16 @@ vm-version-conf.el: Makefile
 # the echo command can also emit CRs.
 vm-autoloads.el: $(SOURCES:%=@srcdir@/%)
        -$(RM) -f $@
-       echo > $@
+       echo > $@.tmp
        (build_dir="`pwd`"; cd "@srcdir@"; \
         $(EMACS_COMP) -l autoload \
-               -f vm-built-autoloads "@abs_builddir@/$@" "`pwd`")
-       echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@
-       echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> $@
-       echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" | tr -d '\015' >> 
$@
-       echo "(setq vm-configure-docdir \"${docdir}\")" | tr -d '\015' >> $@
-       echo "(setq vm-configure-infodir \"${infodir}\")" | tr -d '\015' >> $@
-       echo "(require 'vm-vars)" | tr -d '\015' >> $@
+               -f vm-built-autoloads "@abs_builddir@/$@.tmp" "`pwd`")
+       echo "(custom-add-load 'vm 'vm-cus-load)" | tr -d '\015' >> $@.tmp
+       echo "(setq vm-configure-datadir \"${etcdir}\")" | tr -d '\015' >> 
$@.tmp
+       echo "(setq vm-configure-pixmapdir \"${pixmapdir}\")" | tr -d '\015' >> 
$@.tmp
+       echo "(setq vm-configure-docdir \"${docdir}\")" | tr -d '\015' >> $@.tmp
+       echo "(setq vm-configure-infodir \"${infodir}\")" | tr -d '\015' >> 
$@.tmp
+       echo "(require 'vm-vars)" | tr -d '\015' >> $@.tmp
        echo "(provide 'vm-autoloads)" | tr -d '\015' >> $@.tmp
        mv -f $@.tmp $@