*** empty log message ***

diff --git a/etc/MACHINES b/etc/MACHINES
index 41312bb08e35c70706cc79dd7df024036d9efb49..3bd02c3bbd4ac844ea067d0d6efbac8ca407038e 100644 (file)
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -988,7 +988,7 @@ Sun 3, Sun 4 (sparc), Sun 386 (m68k-sun-sunos, sparc-sun-sunos, i386-sun-sunos,
   including large file support) on a Solaris system which supports
   64-bit executables, use the Sun compiler, configuring something like
   this (see the cc documentation for information on 64-bit
-  compilation):  env CC="cc -xarch=v9" ./configure --without-gcc
+  compilation):  env CC="cc -xarch=v9" ./configure
 
   As of version 2.95, GCC doesn't support the 64-bit ABI properly, but
   later releases may.

diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index d96250dde1de2539c7ddcfc173132e834239ae0f..773c131a24ff64f3c9931d2a77b52bcc228b3722 100644 (file)
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -128,7 +128,7 @@ nil, or equal to `timeclock-workday', nothing special will be done.
 If it is a quantity different from `timeclock-workday', however, a
 record will be output to the timelog file to note the fact that that
 day has a different length from the norm."
-  :type 'function
+  :type '(choice (const nil) (function-item timeclock-workday) function)
   :group 'timeclock)
 
 (defcustom timeclock-ask-before-exiting t