Bump version to 05.01.00

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for remind 05.00.08.
+# Generated by GNU Autoconf 2.71 for remind 05.01.00.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -608,8 +608,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='remind'
 PACKAGE_TARNAME='remind'
-PACKAGE_VERSION='05.00.08'
-PACKAGE_STRING='remind 05.00.08'
+PACKAGE_VERSION='05.01.00'
+PACKAGE_STRING='remind 05.01.00'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL='https://dianne.skoll.ca/projects/remind/'
 
@@ -1265,7 +1265,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures remind 05.00.08 to adapt to many kinds of systems.
+\`configure' configures remind 05.01.00 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1327,7 +1327,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of remind 05.00.08:";;
+     short | recursive ) echo "Configuration of remind 05.01.00:";;
    esac
   cat <<\_ACEOF
 
@@ -1415,7 +1415,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-remind configure 05.00.08
+remind configure 05.01.00
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1865,7 +1865,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by remind $as_me 05.00.08, which was
+It was created by remind $as_me 05.01.00, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4710,7 +4710,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by remind $as_me 05.00.08, which was
+This file was extended by remind $as_me 05.01.00, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4775,7 +4775,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-remind config.status 05.00.08
+remind config.status 05.01.00
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(remind, 05.00.08, , , https://dianne.skoll.ca/projects/remind/)
+AC_INIT(remind, 05.01.00, , , https://dianne.skoll.ca/projects/remind/)
 AC_CONFIG_SRCDIR([src/queue.c])
 
 cat <<'EOF'

man/remind.1.in

@@ -4692,6 +4692,9 @@ The file \fBblock_of_reminders.rem\fR would be executed with the
 \fBmsgprefix\fR would be restored to its previous definition if
 it had one, or simply unset if it was not previously defined.
 .PP
+If either argument to the \fBFRENAME\fR command is the name of a built-in
+function, the command fails with an error message and does nothing.
+.PP
 If you define a user-defined function and then later on redefine it,
 \fBRemind\fR will issue a warning.  If you do not want this warning,
 then use \fBFUNSET\fR to remove the existing definition before you
@@ -5497,10 +5500,11 @@ produce an entry in the calendar (i.e., \fBCAL\fR- and possibly
 .B NOTES
 .PP
 Normally, the body of a reminder is followed by a carriage return.
-Thus, the results of \fBmsgsuffix()\fR will appear on the next
-line.  If you don't want this, make sure the output of \fBmsgsuffix\fR
-begins with a backspace.  This places the suffix \fIbefore\fR rather than
-after the carriage return.  Here is an example:
+Thus, the results of \fBmsgsuffix()\fR will appear on the next line.
+If you don't want this, make sure the output of \fBmsgsuffix\fR begins
+with a backspace.  This places the suffix \fIbefore\fR rather than
+after the carriage return.  (The backspace character itself is
+stripped out.)  Here is an example:
 .PP
 .nf
         FSET msgsuffix(x) char(8) + " - suffix on same line"

src/userfns.c

@@ -92,7 +92,21 @@ int DoFrename(ParsePtr p)
         DBufFree(&newbuf);
         return r;
     }
+    if (FindBuiltinFunc(DBufValue(&oldbuf))) {
+        Eprint("%s: `%s'", ErrMsg[E_REDEF_FUNC], DBufValue(&oldbuf));
+        DBufFree(&oldbuf);
+        DBufFree(&newbuf);
+        return E_REDEF_FUNC;
+    }
+    if (FindBuiltinFunc(DBufValue(&newbuf))) {
+        Eprint("%s: `%s'", ErrMsg[E_REDEF_FUNC], DBufValue(&newbuf));
+        DBufFree(&oldbuf);
+        DBufFree(&newbuf);
+        return E_REDEF_FUNC;
+    }
     RenameUserFunc(DBufValue(&oldbuf), DBufValue(&newbuf));
+    DBufFree(&oldbuf);
+    DBufFree(&newbuf);
     return OK;
 }
 

tests/test.cmp

@@ -1029,7 +1029,7 @@ set a057 value("a05"+"6")
 "a05" + "6" => "a056"
 value("a056") => "SDFJHSDF KSJDFH KJSDFH KSJDFH"
 set a058 version()
-version() => "05.00.08"
+version() => "05.01.00"
 set a059 wkday(today())
 today() => 1991-02-16
 wkday(1991-02-16) => "Saturday"
@@ -2669,7 +2669,7 @@ a099  -1
 a057  "SDFJHSDF KSJDFH KJSDFH KSJDFH"
 a120  2010-09-03
 a015  16
-a058  "05.00.08"
+a058  "05.01.00"
 a121  2010-09-03
 a016  28
 a059  "Saturday"
@@ -5597,8 +5597,8 @@ REM SATISFY ""
 REM SATISFY [version() > "01.00.00"]
 ../tests/test.rem(1046): SATISFY: expression has no reference to trigdate() or $T...
 ../tests/test.rem(1046): Trig = Saturday, 16 February, 1991
-version() => "05.00.08"
-"05.00.08" > "01.00.00" => 1
+version() => "05.01.00"
+"05.01.00" > "01.00.00" => 1
 ../tests/test.rem(1046): Trig(satisfied) = Saturday, 16 February, 1991
 REM SATISFY [max(x, max(x, 1, 2, 3), 4, 5, 6) * 5]
 ../tests/test.rem(1047): SATISFY: expression has no reference to trigdate() or $T...
@@ -5892,48 +5892,55 @@ REM MSG [sq(9)]
 ../tests/test.rem(1152): Trig = Saturday, 16 February, 1991
 ../tests/test.rem(1152): Undefined function: `sq'
 
+FRENAME square max
+../tests/test.rem(1154): Attempt to redefine built-in function: `max'
+FRENAME max square
+../tests/test.rem(1155): Attempt to redefine built-in function: `max'
+FRENAME max min
+../tests/test.rem(1156): Attempt to redefine built-in function: `max'
+
 # Test $DefaultDelta
 SET $DefaultDelta 0
 CLEAR-OMIT-CONTEXT
 OMIT 17 Feb 1991
 REM 18 Feb MSG This should not be seen
-../tests/test.rem(1158): Trig = Monday, 18 February, 1991
+../tests/test.rem(1162): Trig = Monday, 18 February, 1991
 
 SET $DefaultDelta 1
 REM 18 Feb MSG This should also not be seen
-../tests/test.rem(1161): Trig = Monday, 18 February, 1991
+../tests/test.rem(1165): Trig = Monday, 18 February, 1991
 
 SET $DefaultDelta 2
 REM 18 Feb MSG But this should be seen
-../tests/test.rem(1164): Trig = Monday, 18 February, 1991
+../tests/test.rem(1168): Trig = Monday, 18 February, 1991
 But this should be seen
 
 
 REM 18 Feb ++1 MSG Explicit delta should not be seen.
-../tests/test.rem(1166): Trig = Monday, 18 February, 1991
+../tests/test.rem(1170): Trig = Monday, 18 February, 1991
 REM 18 Feb ++0 MSG Explicit delta should not be seen.
-../tests/test.rem(1167): Trig = Monday, 18 February, 1991
+../tests/test.rem(1171): Trig = Monday, 18 February, 1991
 
 REM 18 Feb +1 MSG Explicit delta should be seen - don't count OMITS
-../tests/test.rem(1169): Trig = Monday, 18 February, 1991
+../tests/test.rem(1173): Trig = Monday, 18 February, 1991
 Explicit delta should be seen - don't count OMITS
 
 REM 18 Feb +0 MSG Explicit delta should not be seen.
-../tests/test.rem(1170): Trig = Monday, 18 February, 1991
+../tests/test.rem(1174): Trig = Monday, 18 February, 1991
 
 # Test msgsuffix
 FSET msgsuffix(x) "On the next line"
 REM MSG Hello
-../tests/test.rem(1174): Trig = Saturday, 16 February, 1991
+../tests/test.rem(1178): Trig = Saturday, 16 February, 1991
 Entering UserFN msgsuffix(5000)
 Leaving UserFN msgsuffix(5000) => "On the next line"
 Hello
 On the next line
 
 FSET msgsuffix(x) char(8) + " on the same line"
-../tests/test.rem(1176): Function msgsuffix redefined (previously defined at ../tests/test.rem:1173)
+../tests/test.rem(1180): Function msgsuffix redefined (previously defined at ../tests/test.rem:1177)
 REM MSG Hello
-../tests/test.rem(1177): Trig = Saturday, 16 February, 1991
+../tests/test.rem(1181): Trig = Saturday, 16 February, 1991
 Entering UserFN msgsuffix(5000)
 char(8) => "\b"
 "\b" + " on the same line" => "\b on the same line"
@@ -12847,7 +12854,7 @@ SECURITY: Won't read world-writable file or directory!
 Error reading include_dir/ww: Can't open file
 SECURITY: Won't read world-writable file or directory!
 Error reading include_dir/ww: No files matching *.rem
-05.00.08
+05.01.00
 NOTE JSONQUEUE
 [{"priority":2,"eventstart":"VOLATILE","time":"23:59","nexttime":"23:59","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue2.rem","lineno":1,"type":"MSG_TYPE","body":"XXXX"},{"priority":999,"eventstart":"VOLATILE","time":"23:58","nexttime":"23:58","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue1.rem","lineno":5,"type":"MSG_TYPE","body":"quux"},{"priority":42,"eventstart":"VOLATILE","time":"23:57","nexttime":"23:57","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue1.rem","lineno":4,"type":"MSG_TYPE","body":"bar"},{"priority":5000,"eventstart":"VOLATILE","time":"23:56","nexttime":"23:56","tdelta":0,"trep":0,"rundisabled":0,"ntrig":1,"filename":"../tests/queue1.rem","lineno":3,"type":"MSG_TYPE","body":"foo"}]
 NOTE ENDJSONQUEUE

tests/test.rem

@@ -1151,6 +1151,10 @@ FRENAME sq square
 REM MSG [square(9)]
 REM MSG [sq(9)]
 
+FRENAME square max
+FRENAME max square
+FRENAME max min
+
 # Test $DefaultDelta
 SET $DefaultDelta 0
 CLEAR-OMIT-CONTEXT