summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Love <fx@gnu.org>2001-02-15 00:14:17 +0000
committerDave Love <fx@gnu.org>2001-02-15 00:14:17 +0000
commit3becc0163d0c8155e21e7a8e1df100960de18f9f (patch)
tree1fbc07c15d69273b67295579ef453b77ea42660f
parent681e6b4b6beeb96c168c7e85cb84a06a9f79e835 (diff)
downloademacs-3becc0163d0c8155e21e7a8e1df100960de18f9f.tar.gz
*** empty log message ***
-rw-r--r--etc/MACHINES2
-rw-r--r--lisp/calendar/timeclock.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/MACHINES b/etc/MACHINES
index 41312bb08e3..3bd02c3bbd4 100644
--- 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 d96250dde1d..773c131a24f 100644
--- 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