[patch] Update from 1.10.1 to 1.12

0001-Update-to-1.12.patch (text/plain), 164.85 KB, created by x11sh on 2021-07-11 20:53:17 UTC

From 79c8834069e0009105f629a41649270e741c56f7 Mon Sep 17 00:00:00 2001
From: x11sh
Date: Sun, 11 Jul 2021 17:48:00 -0300
Subject: [PATCH] Update to 1.12

---
 HISTORY                    | 1606 ++++++++++++++++++------------------
 holiday/holiday_bavarian   |    4 +-
 language/plan.lang.spanish |  130 +--
 misc/netplan.1             |   25 +-
 misc/netplan.boot          |   13 +-
 misc/plan.1                |   83 +-
 misc/plan.1.orig           |  326 --------
 misc/plan.1cat             |    4 +-
 misc/plan.4                |    4 +-
 src/Makefile               |   20 +-
 src/calmenu.c              |   84 +-
 src/configure              |   14 +-
 src/daemon.c               |   26 +-
 src/daymenu.c              |    1 -
 src/edit.c                 |    2 +-
 src/file_r.c               |    4 +-
 src/file_w.c               |    2 +-
 src/g_dbfile.c             |    3 +-
 src/g_formop.c             |    2 +
 src/holiday.c              |    1 +
 src/main.c                 |   28 +-
 src/netplan.c              |   38 +-
 src/netplan.h              |    3 +-
 src/netplan_acl.c          |    6 +-
 src/network.c              |    2 +-
 src/notifier.c             |   22 +-
 src/notifier.h             |   12 +-
 src/notmenu.c              |    7 +-
 src/parser.lex             |    7 +-
 src/parser.y               |    6 +
 src/proto.h                |   27 +-
 src/sublist.c              |   49 +-
 src/time.c                 |    6 +-
 src/usermenu.c             |    7 +-
 src/usersel.c              |    2 +-
 src/version.h              |    2 +-
 src/xutil.c                |   23 +-
 src/yovmenu.c              |    2 +-
 web/welcome.html           |   11 +
 39 files changed, 1251 insertions(+), 1363 deletions(-)
 delete mode 100644 misc/plan.1.orig
 create mode 100644 web/welcome.html

diff --git a/HISTORY b/HISTORY
index 1146252..bd4040d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,493 +1,532 @@
-====== 1.0 release 5/16/93 =======
-
-====== 1.1 release 6/13/93 =======
-
-NEW PLATFORMS:
-
-    *  OSF1/AXP, by Dave Hill <[e-mail]>
-    *  IBM/AIX, by Johan Eksteen <[e-mail]>
-               and Vance R. Bass <[e-mail]>
-               and David W. Sanderson <[e-mail]>
-    *  HP/UX 9.01, by Sylvain Picard <[e-mail]>
-    *  NCR, by Keith Shafer <[e-mail]>
-    *  SUN, by Dave Brennan <[e-mail]>
-    *  ULTRIX 4.3, by Jeroen C. Kessels <[e-mail]>
-
-    [Note that some of the patches I received for these systems were
-     mutually exclusive. I had to manually merge them into the baseline
-     sources. I can't test them; if they don't work, complain to me and
-     not to the authors listed above. [e-mail]]
-
-NEW FEATURES:
-
-    *  fancy holiday parser
-    *  optional fast advance-warning column in list menus
-    *  new -K option of pland to kill daemon (for ~/.logout)
-    *  new option: don't show expired entries in today's day box
-    *  appointments without time field added (for birthdays etc)
-    *  snoozing alarms for 5 minutes
-
-MAJOR BUGFIXES:
-
-    *  pland no longer crashes if database becomes empty
-    *  plan no longer crashes when there are more than 100 entries
-    *  months outside the current DST zone were sometimes one day off;
-       rewrote time conversion routines to not use localtime and mktime
-    *  recycle ending date didn't work
-    *  readfile now avoids feof(), it seems to be broken on some systems
-    *  if colors cannot be allocated, use black&white rather than exiting
-
-OTHER CHANGES:
-
-    *  added time display in month calendar menu
-    *  if appts don't fit in day box, print three dots
-    *  in year view, click month to see that month
-    *  -s option does not start daemon, and now does not print warnings
-    *  notifier now beeps
-    *  Done button is now always the rightmost button, Quit renamed to Done
-    *  use tzset() to ensure that DST is interpreted correctly
-    *  multiple expose events mostly eliminated
-    *  notifier now deals correctly with empty messages, no more warnings
-    *  new Makefile option to remove all pulldown menu separator lines
-    *  help messages and other typos fixed
-    *  bottom day box note was incorrectly clipped
-    *  fflushed stdout after printing resources
-    *  fixed list locking problem in sublist.c
-    *  fixed keyword search for single-character search strings
-    *  it's no longer necessary to press Return in keyword search
-    *  X resources are now correctly propagated to submenus
-    *  sometimes day boxes stayed shaded yellow after the day menu exits
-
-
-====== 1.1.1 release 6/20/93 =======
-
-NEW PLATFORMS:
+====== 1.12 released 17.10.17 =======
 
-    *  MIPS Magnum, by Milton Scritsmier <[e-mail]>
-    *  SNI SINIX 5.4, by Martin Kraemer <martin@deejai>
-    *  Data General DG/UX, Makefile patches by Andy Dennie
-       <[e-mail]>
-
-BUGFIXES:
-
-    *  fixed major bug that lost paths beginning with ~, like ~/.dayplan
-    *  holiday parser: <Nth> <weekday> syntax didn't work correctly
-    *  daemon didn't recycle appointments if plan wasn't running
-    *  corrected and added German holidays
-    *  new dutch holiday file, by Guido van Rossum <[e-mail]>
-    *  -iconic option doesn't cause popups to come up iconic any more
-    *  dates in ~/.dayplan now stored with years in 4-digit format
-    *  replaced caddr_t with XtPointer, some HPs wouldn't compile otherwise
-    *  fixed undefined __DATE__ problem on Ultrix
-    *  fixed bug in appointment list re-allocation
-    *  new color resources to make the month view look like the year view
-    *  repeat-until date fixed
-
-
-====== 1.1.2 release 6/28/93 =======
+FEATURES:
+    * feature by Ralf Paaschen: can page through months with PageUp, PageDown,
+      Home, and End keys
+    * the manpages reflect the Debian Linux paths.
+    * the "make linux" Makefile target is now 64 bits; use "make linux32" for
+      32 bits. Just "make" is still equivalent to "make debian".
 
-NEW PLATFORMS:
 
-    *  Another SNI Sinix 5.4x Makefile patch by Gerald Rinske
-       <[e-mail]>
-    *  NCR, by Keith Shafer <[e-mail]>
-    *  SCO Open Desktop/Open Server 3.0, Makefile patches by Nathan Peterson
-       <[e-mail]>
-    *  Solaris 2.2, by Jean-Claude Giese <[e-mail]>
-    *  USL's SVR4.2 V1 with mdev package, by Peter Lord <[e-mail]>
+====== 1.11 released 4.3.14 =======
 
-BUGFIXES:
+BUG FIXES:
+    * Petter Reinholdtsen
+      - make the -L option of pland the default on Debian, considered safer
+      - standalone mode accepts 4-digit years in dates: [[yyyy]mmdd]
+      - the number of Unix groups a user belongs to is now unlimited
+      - hardening: plan could be crashed by adding % codes in language files
+      - fixed syntax errors in Bavarion holiday file
+      - don't strip executable, the Debian installer does that (bug #437776)
+      - fix compiler warnings, enable more compiler checks on Debian
+      - fix manpage typos
+      - fixed Debian regex compilation with FreeBSD kernel (Bug #414130)
+      - moved plan and pland pid temp files from /tmp to ~/.plan.dir
+    * new compilation target: "make debian". Must run "./configure" first.
+    * updated "./configure" script with new Debian paths
+    * removed -lXp from linux link line, that library is no longer needed
+    * added restart and (dummy) force-reload to /etc/init.d/netplan.boot:
+      Debian plan 1.10.1-5 E init.d-script-does-not-implement-required-option
+    * sourcing /lib/lsb/init-function to /etc/init.d/netplan.boot:
+      Debian plan 1.10.1-5 W init.d-script-does-not-source-init-functions
+
+
+====== 1.10.2 released 9.12.08 =======
 
-    *  daemon now exits automatically when user logs out
-    *  new French and Dutch holiday files
-    *  fixed Makefile bug for Ultrix and sung (-DGMTOFF)
-    *  fixed help button in holiday menu, it used to cancel the menu
+BUG FIXES:
+    * fixed OpenSuSE 10.3 link error, by Hitoshi Yamauchi <[e-mail]>
+    * updated Spanish language support, by Gerardo Cafferata
+      <[e-mail]>
 
 
-====== 1.2 PL 0 release 10/11/93 =======
+====== 1.10.1 released 3.7.07 =======
 
-NEW FEATURES:
+BUG FIXES:
+    * fixed "last weekday in month" expressions in holiday file, by Arnaud
+      Giersch <[e-mail]>
+    * fixed mother's day definition in French holiday file, by Arnaud Giersch
+      <[e-mail]>
 
-    *  week views that graphs hours vs. weekdays
-    *  reads other people's appointments and displays them in the week view
-    *  show every instance of a repeating entry
-    *  new syntax: "nth weekday before/after date" (Advent/Buss&Bettag)
-    *  recycler: every/Nth/last <weekday> of the month
-    *  distinguish private and public appointments
 
-OTHER CHANGES:
+====== 1.10 released 9.4.07 =======
 
-    *  option to switch off time in icon
-    *  parse TZ directly, don't use standard library for timezone calc
-    *  if there is a /tmp/.planUID, check if it's valid
-    *  added error popup for "another plan is running"
-    *  display holiday at the top of the day menu
-    *  scroll bars in help windows
-    *  improved help messages
-    *  year up/down now changes year menu too
-    *  separate path for manpages
-    *  documented important resources
+FEATURES:
+    * implemented limited read-only support for vCalendar/iCalendar (.ics)
+      files (Apple, Zimbra, Lotus, etc), which can be specified in File ->
+      File list like other files. Repetition information is ignored.
+    * added "make linux64" target. Some 64-bit Linux installations, notably
+      OpenSUSE 10.2, omit 32-bit libraries or links, causing compilation errors
+      for -lXt and others.
+    * ported to MacOS X with X11 and OpenMotif. Requires X11 from the MacOS X
+      install DVD, and OpenMotif from www.ist-inc.com/DOWNLOADS/motif_files/
+      openmotif-compat-2.1.31_IST.macosx10.3.dmg . The X server must run, and
+      DISPLAY must be set properly (like, localhost:0) or plan won't start up.
+      This is not a proper Aqua/Cocoa/Carbon port, although I made some feeble
+      attempts to fix the color scheme.
+    * new Polish language file by Jaroslaw Arlet <[e-mail]>
+    * new command-line option -Y allows entering annual (yearly) appointments,
+      by Steffen Pietsch <[e-mail]>
+    * when alarms trigger, '%' codes in the short note text, message, and the
+      script are expanded. (See the help text in plan's Message/Script help.)
+      Eg., you can write message texts like "remember to see %U on %D at %T".
+	  %N    the short note text
+	  %M    the message text
+	  %S    the script text
+	  %D    the final trigger date
+	  %T    the final trigger time
+	  %L    the length in hours:minutes
+	  %F    the file the appointment is stored in, or "private"
+	  %U    your login name
+	  %%	a percent sign, '%'
 
+BUG FIXES:
+    * fixed a timezone bug that could make alarms go off exactly 24 hours late,
+      Aaron Kaplan <[e-mail]>
+    * manpage files were installed without the trailing ".1" and ".4"
+    * fixed compiler errors under Cygwin because the symbol linux was not set.
+    * added -m32 option for Linux; gcc 4 defaults to 64 bits but the required
+      libraries are not usually installed.
+    * entering a day of the month as a date will now correctly find the next
+      date with that day. A bug caused it to switch to a random date in 2000.
+    * fixed a language file read error that omitted a trailing null byte.
+      By Julien Soula <[e-mail]>
+    * an incomplete X resource file crashed plan. Now defaults are used; the
+      resulting windows are not very usable but it doesn't crash.
 
-====== 1.2 PL 1 release 10/16/93 =======
 
-NEW PLATFORMS:
+====== 1.9 released 6.2.05 =======
 
-    *  BSDI386 and BSDI386 with gcc, by Tetsuji Rai <[e-mail]>
+FEATURES:
+    * saved space in various calendar views such as the year overview
+    * the week view repeats the hour title every few day rows; it was too easy
+      to get lost without scrolling all the time
+    * remove obsolete warning windows when the next warning or the main alarm
+      is reached.
+    * Linux: when a lockfile from a previous plan process is found, do not kill
+      it if it's dead and some non-plan process now uses the old process ID.
+    * if user "netplan" exists on the system, netplan runs as that user instead
+      of nobody. Needed for Debian. Petter Reinholdtsen <[e-mail]>
+    * added Belgian French holiday file, Nicolas E'vrard <[e-mail]>
+    * command-line option -V: experimental and incomplete vCalendar export.
+      File can be read by calendar programs such as Mozilla Calendar.
+    * plan is now distributed under the GPL license, at your choice.
+    * netplan has a new option -s that sends all messages to syslog.
 
-NEW FEATURES:
+BUG FIXES:
+    * fixed Italian language file, Carlo Mandelli
+      <[e-mail]>
+    * fixed misspelling in the Italian language file, littledark
+      <[e-mail]>
+    * "Delete past entries" did not remove repeating entries whose end date is
+      in the past, Aaron Kaplan <[e-mail]>
+    * fixed choice 1 of configure script on Solaris, Aaron Kaplan
+      <[e-mail]>
+    * after running a long time (months), alarms stopped triggering. Fixed by
+      Aaron Kaplan <[e-mail]>
+    * fixed Spanish holiday file, Fernando Tricas "Garci'a"
+      <[e-mail]>
+    * fixed loads of inane gcc warning messages
 
-    *  time adjustment and timezone config menu
-    *  use search paths for executables and help file
 
+====== 1.8.7 released 30.9.03 =======
 
-====== 1.2 PL 2 release 11/10/93 =======
+FEATURES:
+    * deleted support for SCO
+    * pland -p pops up all alarms that triggered since the last time pland
+      ran, not just those from the past three hours, by Brian L. Shaver
+      <[e-mail]>
+    * more room for appointments in year overview, moved year to left edge
 
 BUG FIXES:
+    * newly entered appointments no longer vanish from the edit menu.
+    * fixed errno compiler errors on SMP systems, Thomas Ribbrock
+      <[e-mail]>
+    * Italian language translations by Paolo Panizza <[e-mail]> were
+      missing from the 1.8.5 and 1.8.6 distributions, now included
 
-    *  non-interactive mode no longer removes lockfile
-    *  minor cleanups in the help text
 
+====== 1.8.6 released 18.3.03 =======
 
-====== 1.2 PL 3 release 11/21/93 =======
+FEATURES:
+    * reversed the change in 1.8.5, at popular demand, that lets a personal
+      holiday file replace the system holiday file. plan 1.8.6 again reads
+      both, system first. The new "reset" keywords can be used to clear all
+      system holidays, following an idea by Heiko Schlichting.
 
 BUG FIXES:
+    * the edit menu was broken in 1.8.5, fixed by Heiko Schlichting
+      <[e-mail]>
 
-    *  fixed repeat-until in recycling menu
 
+====== 1.8.5 released 16.2.03 =======
 
-====== 1.2 PL 4 release 12/12/93 =======
+FEATURES:
+    * plan's FTP home site has a new name: plan.ftp.fu-berlin.de, shown in
+      the About popup. The old address will continue to work. (Thanks, Heiko!)
+    * set locale to support other character sets such as Czech, by Petr Kristan
+      <[e-mail]>
+    * OpenBSD port by Armin Wolfermann <[e-mail]>
+    * new plan2vcs perl script that converts plan appointments to korganizer
+      format, by Bert Bos <[e-mail]>
+    * if there is a ~/.holiday file, don't read LIB/holiday as well.
+    * skip junk in entries synced from PalmPilot DateBk4 messages, by Johan
+      Vromans <[e-mail]>
+    * allow new holiday syntax "workday before/after <date>", by Ian Holland
+      <[e-mail]>
+    * Italian language translations by Paolo Panizza <[e-mail]>
+    * accept yyyy/mm/dd date input, Brian T. Schellenberger <[e-mail]>
+    * Slovak holidays by Mikulas Sustak <[e-mail]>
 
 BUG FIXES:
+    * fixed Debian bug 157425: color selection dropbox always starts on Default
+    * Suns apparently still run X11R5 and don't have XtSignalId et. al.
+    * configure script had problems with defaults when using bash (Michael
+      Mauch <[e-mail]>
+    * fixed configure script problems on Solaris 2.6, by Horst Scheuermann
+      <[e-mail]>
+    * fixed Dutch Driekoningen holiday date, by Johan Vromans
+      <[e-mail]>
+    * IBM AIX doesn't have Xt timers and doesn'd compile plan 1.8.4, excluded
+      XFree workaround for IBM
+    * week number 2 appeared twice in 2001. Fixed by Helmut Jarausch
+      <[e-mail]>
+    * Search->One file could not select the "own" file (top menu choice).
+    * cleanup: removed remaining K&R varargs and sunkr target
+    * fixed '@' user notation in netplan server, by Gennadi Umanski
+      <[e-mail]>
+    * fixed Japanese string converion, by Tomoko Hayashi <[e-mail]>
+    * other people's .dayplan file references ('L' lines in ~/.dayplan) over-
+      wrote own file entries (Heiko Schlichting <[e-mail]>)
 
-    *  preventing user from entering user directory before user name (crash)
-    *  added -DRABBITS on HPs because utmp appears to be unreliable
-    *  removed #ifdef NCR around FIXMBAR in calmenu.c, fixes empty pulldowns
-    *  replace fchmod with chmod (SCO has no fchmod)
-    *  Ultrix 4.3A has fcntl.h in sys
-    *  OSF/1 and Ultrix require -DRABBITS
-    *  later instances of repeating week bars got overdrawn by other bars
-    *  Makefile OSF_C: added -DOSF
-    *  put notifier -d into help text
-    *  when searching for programs (find_file), ignore directories
-    *  replace palatino with a standard font
-    *  fast warning on; bring up appt menu; fast warning off -> core
-    *  read_file ignores timezone setting
-    *  repeat-every-n-days could slow down redrawing significantly
-    *  if a user is added to the week view, pland sometimes died
-
-NEW FEATURES:
-
-    *  raise week and year window when user requests one
-    *  -hhmm notation for appt length (until hhmm)
-    *  +n notation for parsing dates
-    *  if note begins with '-' or '=', remove from month/year/week or m/y view
-    *  help-on-context buttons in the help window
-    *  quit button for year view
-    *  resource to put black frame into today's day box (for 1-bit graphics)
-
-NEW PLATFORMS:
-
-    *  Linux, by Dirk Melchers <[e-mail]>
-    *  SunSoft Interactive (ISC) 4.0, by [e-mail] (Andrew Fullford)
 
+====== 1.8.4 released 17.7.00 =======
 
-====== 1.3 release 6/1/94 =======
+FEATURES:
+    * Changed configure script, Makefile, and manpages to conform to Debian
+      Linux conventions, Yann Dirson <[e-mail]>
+    * another configure preset for SuSE Linux
+    * new SysV alarm signals that prod the X timer events that write modified
+      data, as a workaround for broken XFree86 X servers, by Francis Montagnac
+      <[e-mail]>
+    * netplan now listens on two ports (unless overriden in /etc/services):
+      5444 for backwards compatibility, and 2983, the new IANA-registered port.
+    * "user" lines in netplan ACLs now accept "user@host" arguments, by Jochen
+      Bern <[e-mail]>
+    * the "another plan window is running, kill/continue" popup now blocks
+      until answered.
+    * OpenMotif support (XFree 4.0.1, OpenMotif 2.1.30) by Wes Kaefer
+      <[e-mail]>
 
 BUG FIXES:
-    *  non-interactive mode and -v should not init X
-    *  clip bars in week views at midnight
-    *  Suns have no utopia
-    *  no stdarg.h (Sparc 1+,h SunOS 4.1.3, X11R5pl25, Motif 1.2.1)
-    *  week view range menu was mangled on Suns and a few others
-    *  HPs may get unknown color background
-    *  bars of appts with no time don't reserve space in week chart
-    *  crash if null user is entered
-    *  align ':' in times vertically in month day boxes (hi Andreas)
-    *  pulldown string resources now hardcoded, easier to maintain this way
-    *  crashes when accessing other users fixed (fix by Rob Gabbard)
-    *  couldn't enter durations "12:xx" in 12-hour mode
-    *  when switching 12/24 hour mode, time display now changes immediately
-    *  fall back to "variable" or "fixed" font if some font can't be found
-    *  long "small" holiday names in large month day boxes could overrun buffer
-    *  various minor fixes in the week menu, some bars were drawn incorrectly
-
-NEW FEATURES:
-    *  PostScript output, by Karl Bunch <[e-mail]>
-    *  Japanese version, by Ogura Yoshito <[e-mail]>
-    *  support for SGI desktop look&feel
-    *  new RGB icon picture for SGIs running the 4Dwm window manager
-    *  holiday file accepts #include statements if /lib/cpp is available
-    *  optional user name in week view before note (new week config popup)
-    *  rearranged header above month view
-    *  reads LIB/holiday after reading ~/.holiday
-    *  new recycle option: every year (for birthdays etc)
-    *  -t option that prints appointments on a day to stdout
-    *  Delete-past-entry command now has five maximum-age choices
-    *  EditRes, by Klaus Guntermann <[e-mail]>
-    *  better parse_timestring: 100 -> 1:00
-    *  click day in week view -> edit day
-    *  swedish holiday file, by Kristian Wedberg <[e-mail]>
-    *  switch to today / to a specific date using a text entry popup
-    *  today now highlighted green in week view
-    *  in fast warning entry mode, entering '=' uses default warning times
-    *  first partial week in Jan is counted as 1. See FULLWEEKS in mondraw.c.
-    *  NODAEMON_ONCE in popup.c is defined to suppress multiple error popups
-
-NEW PLATFORMS:
-    *  SunOS 4.1.3 with K&R cc, replaces stdarg with varargs if -DVARARGS,
-       by Michael P. Shevenell <[e-mail]>
-    *  Sony NEWS with/without gcc, by Ogura Yoshito <[e-mail]>
-    *  Sequent running Dynix/ptx v2.[12], by Mike Gilpin <[e-mail]>
+    * OS/2 Makefile fixes, Alexander Mai <[e-mail]>
+    * fixes by Francis Montagnac <[e-mail]>:
+      - reading and writing of appt files of another user could access this
+        user's file instead, by Francis Montagnac
+      - don't redraw twice after deleting, can crash, by Francis Montagnac
+      - warn when using more than one server, by Francis Montagnac
+      - don't expand home-dirs in "File List" but put simply "~user". This
+        prevent absolute pathnames in dayplan for user appointment files.
+      - change writefile to return true for any readonly files, without doing
+        anything. Fix call of fclose on NULL when creating a new file.
+      - fix accept_new_list to update the views even for non server files.
+      - fix in resolve_tilde: ~user gave /home/user/user
+    * color-shaded backgrounds in month view are now printed, by Brad Jorsch
+      <[e-mail]>
+    * huge numbers of lines in the large month view can cause heap corruption,
+      by Paul Anderson <[e-mail]>
+    * fixed umlauts in Austrian holiday file, by Friedrich Leisch
+      <[e-mail]>
+    * note: on SGI IRIX6 I appear to be unable to compile with -mips2, sorry.
 
-NOTE: the comment character in ~/.holiday files was changed from '#' to ':'
-      to allow cpp to parse the file. Not changing these characters will cause
-      cpp "undefined control" errors.
 
+====== 1.8.3 released 8.12.99 =======
 
-====== 1.3.1 released 7/11/94 =======
+FEATURES:
+    * new options -N, -c, and -h to control more options when adding entries
+      from the command line (Tovar <[e-mail]>)
 
 BUG FIXES:
-    *  DEC alpha: fixed black-on-black notifier windows
-    *  XtPopup order wrong for Sun X11R5 in create_adjust_popup
-    *  -geometry didn't work
-    *  repeat on last weekday of a month didn't work
-    *  ISO characters in calendar windows didn't work
-    *  stripping leading blanks from config exec cmds, confused some shells
-    *  improved 12-hour time parsing, "5p" is now accepted in place of "5:00p"
-    *  appt menu: press date, press time with no entry -> wrong default in date
-    *  corrected left adjustment of appts without time in the month menu
-    *  Linux has problems with XtDestroyWidget. Workaround leaks memory!
-    *  fixed pland crashes after many sighup's if compiled without -DRABBITS
-
-NEW PLATFORMS:
-    *  IBM PS/2, AIX 1.3, gcc, by David W. Schuler <[e-mail]>
-
+    * Fixed language file order, causing untranslated messages. Also replaced
+      OK button with Kill button in "another plan is running" dialog. Thomas
+      Henlich <[e-mail]>
+    * fixed manpage names, Kai Großjohann <[e-mail]>
+    * fixed pascha (Orthodox Easter) calculation and added greek holiday file,
+      Efthimios Mavrogeorgiadis <[e-mail]>
+    * fixed timezones on the other side of the dateline (Truxton Fulton
+      <[e-mail]>)
+    * fixed toggle buttons in print menu (Ekkehard Hoffmann <[e-mail]>)
+    * new timezone code for DEC OSF/1 (Petrie L M <[e-mail]>)
+    * client connection failures now close the connection cleanly and do not
+      leak memory
+    * non-netplan files incorrectly became read-only after the first change
+    * fixed recognition of -u users (Ekkehard Hoffmann <[e-mail]>)
+    * changed two-digit year display in month/year printouts to four digits
+      (Goran Larsson <[e-mail]>)
 
-====== 1.3.2 released 11/11/94 =======
 
-NEW PLATFORMS:
-    *  Convex C220
-    *  SGI IRIX 6.0
+====== 1.8.2 released 5.7.99 =======
 
 FEATURES:
-    *  Australian holiday file, by Peter Turnbull ([e-mail])
-    *  new date format added: "-n" is n days ago (useful for -t option)
+    * Spanish language support by Manuel Soriano <[e-mail]>
+    * Port to LynxOS mag 2.5.1 092297-D i386 by Marius Groeger <[e-mail]>
+    * if the X server fails to send X timer events, switch to synchronous file
+      writing to avoid data loss. Works around bug or incompatibility in XFree.
+    * new script to convert Microsoft Schedule+ files to .dayplan format by
+      Cy Schubert - ITSD Open Systems Group <[e-mail]>
 
 BUG FIXES:
-    *  only refresh changed window regions (Daniel Williams <[e-mail]>
-    *  week view ignored other user's appts that were earlier than first own
-    *  history files no longer run through cpp if file is empty ("error 0")
-    *  in the Adjust Time menu, the hour was printed incorrectly
-    *  new TZ parser for SVR4 syntax, by Klaus Guntermann <guntermann@
-       iti.informatik.th-darmstadt.de>
-    *  fast warning entry reversed early and late ([e-mail])
-    *  output of plan -t disappeared if stdout was redirected
-    *  date input now less eager to default to today's date
-
+    * fixed configure script problems and clarified man page locations
+    * more fixes by Phil Sackinger <[e-mail]>
+    * fixed output of -W -i for web interface
+    * the .plan.dir choice in the configure script caused path trouble in plan
+    * another PostScript bug fix causing text in wrong positions fixed by
+      Daniel Robitaille <[e-mail]>
+    * more OS/2+X patches by Alexander Mai <[e-mail]>
+    * weekday before/after syntax was wrong in holiday parser, Thomas Henlich
+      <[e-mail]> and Henning Daum <[e-mail]>
+    * LessTif 0.88.1 fix by Thomas Henlich <[e-mail]>
+    * improved man pages, foreground/background is now configurable from the
+      script for Debian/Linux compatibility, netplan should not always run as
+      nobody, and a French holiday fix by Yann Dirson <[e-mail]>
+    * enter webplan mode if the program is called "webplan", reading netplan
+      user list crashed if there were no users, fixed possible crash when
+      closing file list menu, renamed welcome.html to bottom.html by Murray
+      Jensen <[e-mail]>
 
-====== 1.4 released 2/22/95 =======
 
-NEW PLATFORMS:
-    *  UnixWare 1.1 and 2.0, [e-mail]
+====== 1.8.1 released 16.5.99 =======
 
 FEATURES:
-    *  PostScript printouts of week views
-    *  appointments of other users or shared lists can be displayed in the
-       month and/or week views, and can be created, deleted, and modified. No
-       inetd daemon yet, but proposed "workgroup" functions are implemented.
-    *  appointments of other users can optionally trigger own alarms
-    *  up to four exception dates per appt where alarm is suspended, fill-in
-       appointments for each of these can be created automatically ("split")
-    *  appointment texts in month view can be highlighted with one of 8 colors
-    *  options and preferences consolidated into new calendar config popup
-    *  config first week of year (full or partial)
-    *  appointments can now be selectively removed from month/year/week views
-    *  number of days in week view is now configurable (1..28 days)
-    *  user list now accepts file names in addition to directories
-    *  added flags to omit appointments in printouts
-    *  printout now uses message text if there is no note
-    *  do scripts even if alarms are turned off
-    *  files are written using backup and temp copies to recover from errors
-    *  dump to stdout with -t now accepts second parameter for number of days
-    *  entries without time may be displayed as large bar in week view
+    * Japanese port of 1.8 by Takafumi Hayashi <[e-mail]>
+    * port to OS/2 with X by Alexander Mai <[e-mail]>
+    * new configure script that simplifies modifications for default, SGI,
+      and Linux installations.
 
 BUG FIXES:
-    *  updated Swedish holiday file
-    *  when cursor is in note column, pressing lock made appt disappear
-    *  don't use the plainfile/. trick, DEC's ASF claims the directory exists!
-    *  appt menu: press date, press time -> wrong default in date
-    *  default for print is now month, not year
-    *  week view overlaps were wrong if start<minhour, some bars were missing
-
+    * plan -F: stdout could not be redirected, added missing fflush
+    * various error popups are now modal, to prevent them from being overlooked
+    * small Ultrix fixes (no pland -l) by Maarten Vergauwen
+      <[e-mail]>
+    * fixed month and year PostScript printing, texts were in the wrong places
 
-====== 1.4.1 released 4/1/95 (mailing list release only) =======
 
-NEW PLATFORMS:
-    * Solaris2 with gcc port, [e-mail] (Bo Kullmar)
+====== 1.8 released 30.3.99 =======
 
 FEATURES:
-    * -o print other users too, -T is like -t but with end times, not lengths
-    * print-only-my-appointments toggle added, Richard G. Hash ([e-mail])
-
-BUG FIXES:
-    * alarm mode button in Config->User popup was lost
-    * UnixWare needs -lgen to compile
-    * if there was no .dayplan, the week view ranges were not initialized
-    * the ?: operator in the holiday parser didn't work, Kai Hofmann
-      <[e-mail]>
-    * notes were invisible in week view in Japanese mode, Takanori Nishijima
-      <[e-mail]>
-
-
-====== 1.4.2 released 5/23/95 =======
-
-FEATURES:
-    * if pland is started after an alarm time but before its end, trigger it
-    * the own-only flag in appointment entry menus is saved for future menus
-    * debugging option -d for pland, more info about what is going on
-    * pland makes sure that its version number matches plan
-    * delete-pending-selection mode for holiday and message text windows
+    * CGI scripts and HTML pages for web browser access, Michel Bourget
+      <[e-mail]> (hacked by [e-mail], bugs are
+      probably my fault)
+    * national language support and a German language file. No support for
+      pulldown accelerators. Foreign-language help files are supported but
+      none are supplied yet.
+    * French language file by Guy Brand <[e-mail]>
+    * new automatic DST mode that attempts to get the time from the system
+      (experimental, available only for some systems, mostly untested)
+    * simple Todo appointments that keep appearing after they first trigger
+    * implemented default advance-warning times (Config->Calendar views)
+    * color PostScript printouts (Kevin Earls <[e-mail]>)
+    * new config mode that allows daemon to exeute insecure netplan scripts
+    * new config mode that makes Thursday the selector for the first week
+    * new combination holiday file by Walter Brown <[e-mail]>
+    * new Portuguese holiday file by Jose Paulo Moitinho de Almeida
+      <[e-mail]>
+    * support for Christian Orthodox Easter (new holiday keyword "pascha")
+    * ported again to FreeBSD (Stefan `Sec` Zehl <[e-mail]>)
+    * converted remaining old code to ANSI C
+    * new Czech holiday file by Hanus Adler <[e-mail]>
 
 BUG FIXES:
-    * lock could crash if argv[0] is very long ([e-mail] (Mike Eggleston))
-    * better handling of user name input
-    * much better performance if many other users exist but are disabled
-    * no longer detects spurious file write errors
-    * notifier position now uses better randomization to avoid piling up
-    * PostScript printouts often printed disabled appointments
-    * Sync button in week view could lose recently edited appointments
-    * no more "cannot write backup" messages on IBM systems
-    * time displayed after startup could be wrong for up to one minute
+    * Linux once again scrambled some header files and made plan uncompilable
+    * small holidays crash day view (Sjoerd Mullender <[e-mail]>
+    * if pland was started between 0:00 and 2:59:59, it overlooked appointments
+    * fixed "W:" note prefix (Sjoerd Mullender <[e-mail]>)
+    * netplan identd queries went to the local host instead of the remote host
+    * fixed Y2K problem in PostScript printout. It works now but I don't under-
+      stand why. Fixed by Vincent Everett <[e-mail]>.
+    * plan -t/-T will now mark warnings with "Warn:".
+    * fixed removal of appointment edit menu for LessTif (Anders Melchiorsen
+      <[e-mail]>)
+    * netplan: group authentication and memory allocation bug fixed by Jens
+      Krinke <[e-mail]>
+    * purge unnecessary lines in empty edit menus, manually adjust edit list
+      size to fix LessTif problem (Anders Melchiorsen <[e-mail]>)
+    * toggle buttons in print menu did not work with some Motif implementations
+    * notifier now resizes correctly, text area grows instead of buttons
+    * day view got holidays wrong near the end of the year (Anders Melchiorsen
+      <[e-mail]>)
+    * LessTif optimizations (Rick Scott <[e-mail]>)
+    * user ID was freed twice in netplan (Jeff Dairiki <[e-mail]>)
+    * it is now possible to inspect messages attached to read-only appts
+    * plan -t had multiday problems (Aaron Kaplan <[e-mail]>)
+    * fixed PostScript Y2K bug (James E. Rowley <[e-mail]>)
+    * fixed zombie problem caused by plan automatically starting pland
 
 
-====== 1.4.3 released 7/7/95 =======
+====== 1.7.2 released 14.7.98 =======
+
+FEATURES:
+    * Japanese port updated by OGURA Yoshito <[e-mail]>,
+      NISHIJIMA Takanori <[e-mail]>
+    * new resource showIconDate puts date and time into icon label
+    * day view now shows holidays
+    * pland -s sleeps while user is logged out but stays around
+    * pland -t prints alarms to stdout instead of popping up windows
+    * plan -S starts pland if it does not exist without asking
+    * plan '22.11.99 15:23' now also works, replacement for plan [mmdd]hhmm
+    * dates with years in the range 0..37 now mean 2000..2037, it is no longer
+      necessary to enter four-digit years after 1999.
+    * support for window managers handling client window groups (Pete Bentley
+      <[e-mail]>).
 
 BUG FIXES:
-    * pland didn't pop up advance-warning popups
+    * when changing appt time to "-", clear length and advance time fields
+    * goto and goto-today did not switch day view
+    * no longer prints wrong time after startup (Adrian Miranda <[e-mail]>)
 
 
-====== 1.4.4 released 9/19/95 =======
+====== 1.7.1 released 2/22/98 =======
 
 FEATURES:
-    * Italian holiday file (Riccardo Scateni ([e-mail]))
-    * user assignment popup shows multi-column user list if the list is long
-    * notifier popups contain user, length, end time, and optional note string
-    * "Execute" commands in alarm options may contain %s, replaced with note
+    * pland only checks for logout after verifying that the login was noted
 
 BUG FIXES:
-    * notifier snooze now works (Karsten Gaier)
-    * pland ignored some repeating appointments
-    * plan -t yesterday now works
-    * error message bugs for fonts, colors, and holiday syntax (Bob Tomlinson)
-
-
-====== 1.4.5 released 12/14/95 =======
+    * fixed netplan ACL malloc (Harald Böhme <[e-mail]>)
+    * fixed drag&drop crash (Cy Schubert <[e-mail]>)
 
-Special thanks to Johan Borkhuis <[e-mail]> for his work!
 
-NEW PLATFORMS:
-    * Apollo Domain/OS (Vince Skahan <[e-mail]>)
+====== 1.7.1 released 2/22/98 =======
 
 FEATURES:
-    * empty day boxes in month view show previous/next month (Johan Borkhuis)
-    * week views can switch years (Johan Borkhuis)
-    * user selection popup in appt entry menu got DONE button (Johan Borkhuis)
+    * Danish holiday file (Arne Norre Ekstroem <[e-mail]>)
 
 BUG FIXES:
-    * added void declarations, moved externals to conf.h (Johan Borkhuis)
+    * month view crashed if large holiday messages fall on grayed-out days
+    * random text when the first day of a multiday holiday overlaps another
+    * netplan authentication by host failed on little-endian machines
+    * fixed a PostScript bug that prevented printing months and years >= 2000
+    * some online help messages in the edit menu were assigned incorrectly
+    * fixed File->delete past entries (Pace Willisson <[e-mail]>)
+    * command-line appointment entry did not update netplan database
+    * drag-and-drop wireframes are more visible
+    * HP/UX 9 target is now "hp9", "hp" is HP/UX 10; updated Control Data
+      EP/IX 2.1.1 target (Geert Albert Smant <[e-mail]>)
+    * new target "hpg" for building plan on HP/UX10 systems with gcc
+    * print iso-latin characters (Detlef Liem <[e-mail]>)
+    * fixed netplan "group" verification (Jens Krinke <[e-mail]>)
+    * no locking on OSF/1 (Henrik Seidel <[e-mail]>)
+    * grok date+time entries that begin with a blank were parsed incorrectly
+    * when entering a new appointment, the time field opens blank, not 0:00
+    * fixes for FreeBSD (Stefan `Sec` Zehl <[e-mail]>)
 
 
-====== 1.4.7 (1.5 beta) released 2/22/96 =======
+====== 1.7 released 1/1/98 =======
 
-NEW PLATFORMS:
-    * Makefile change for Solaris 2.4 by Paul Eggert <[e-mail]>
+Special thanks to Georg-Wilhelm Koltermann <[e-mail]>, who
+sent a large number of improvements and bug fixes, especially in netplan.
+His changes (sometimes modified by me) are marked (gwk) below.
 
 FEATURES:
-    * new IP server for distributed file management, safe multiuser access
-    * new year overview that plots appointment groups on a 365-day timeline
-    * new resource plan*noteWidth for width of note column in entry dialog
-    * plan doesn't allow entry of stop-repeating date < trigger date
-    * single-number time entries "0".."23" are interpreted as 0:00..23:00
+    * redesigned appointment entry: direct entry of multiday appts, up/down
+      arrow buttons for most fields
+    * implemented advance warnings several days ahead
+    * netplan overhaul: (gwk)
+      .  symbolic host/user/group names
+      .  multiple groups per user (a la BSD)
+      .  magic 'owner' ACL record, applies if file name == user name
+      .  detect ACL file changes and re-read automatically
+      .  support for identd (RFC 1413) authentication
+    * clicking on empty space in year overviews calls appt edit menu
+    * appointment color entry uses X OptionMenu on systems that support it
+    * now 16 instead of 8 group colors available in the file list menu
+    * added keyboard accelerators for common pulldown menu items
+    * Norwegian holidays (Petter Reinholdtsen <[e-mail]>)
+    * Austrian holidays (Friedrich Leisch <[e-mail]>)
+    * Hungarian holidays (Kelemen Péter <[e-mail]>)
+    * FreeBSD Makefile and patches (Stefan `Sec` Zehl <[e-mail]>)
+    * SNI Sinix 5.42 Makefile (Bernhard Metzger <[e-mail]>)
 
 BUG FIXES:
-    * fixed shift/reduce conflicts ('%' operator had no association priority)
-    * some systems required print mode button to be pressed twice, fixed
-    * Linux picked a default forground color that made help texts unreadable
-
-Note: the default LIB directory is now /usr/local/lib, not /usr/local/bin.
+    * netplan overhaul: (gwk)
+      .  fixed file readonly mgmt, now kept per client open, not per file
+      .  fixed row ID wraparounds
+      .  files read were initialized as "modified", causing writeback.
+      .  file reference counter must only be incremented for the first
+         open by a specific client (pland reopens many times)
+      .  ACL netmask defaults to 255.255.255.255, not to the whole network
+      .  fixed readonly or inaccessible files for an user's own appts
+      .  plan could crash when modifying appts read from a crashed netplan
+      .  host names in the ACL may now contain '-' characters
+    * fixed bad attachment in month view, caused LessTif problems (gwk)
+    * private appointments were often written to the server (gwk)
+    * year overview skipped daily appts if the first day was an exception (gwk)
+    * lost exception dates if the dialog was closed by pressing "split" (gwk)
+    * split exceptions appeared in the day view but turned blank when any
+      field was clicked for editing. (gwk)
+    * if pland was started by plan instead of from the user's .xsession file,
+      it inherited a copy of plan's file descriptors and never closed them,
+      leading to stale locks and dangling netplan connections (gwk)
+    * netplan ACL could ignore lines and failed for large ACL files. Also,
+      little-endian machines got IP addresses wrong. (Bruno Achauer
+      <[e-mail]>)
+    * BSD fixes (Jay Vassos-Libove <[e-mail]>)
+    * netplan could crash if a data file grows (Dag Nygren <[e-mail]>)
+    * fixed a file descriptor leak in the help system
+    * year and year-overview mode buttons in the Print menu were swapped
+    * auto DST did not work in the southern hemisphere, where begin > end
+      (Glen Pringle <[e-mail]>)
 
 
-====== 1.4.8 (1.5 beta2) released 3/8/96 =======
+====== 1.6.1 released 4/12/97 =======
 
 FEATURES:
-    * new Cancel button in File list
-    * pressing Return on Note column auto-confirms again
-    * netplan now writes files periodically and tries to write when crashing
-    * netplan can now safely be started as root or setuid root. Instead of
-      refusing to start, it switches to compiled-in <nobody> UID and GID.
-      netplan can now be started in /etc/rc2.d/S99netplan or /etc/rc.local.
+    * implemented simple access list features in netplan
+    * Belgian holiday file (Danny Backx <[e-mail]>)
+    * pland got new -l/-L options to enable/disable auto-exit on logout
+    * fixes to compile under NetBSD 2.1 (Petter Reinholdtsen <[e-mail]>)
 
 BUG FIXES:
-    * desensitize text instead of printing '---' in File list
-    * ensure that names in File list are unique by appending 'x'
-    * netplan now fails if its home directory doesn't exist
-    * plan crashed on Suns with "no memory" when connecting to netplan
-    * replaced references to obsolete menus and terms in the help texts
+    * the prev/next buttons in the day and week views no longer crash plan
+    * opening a nonexisting file on a netplan server could crash the server
+    * views no longer lose window margins and resize correctly under X11R6.4 
+    * year views now draw significantly faster (factor >100 for some files)
+    * text in week bars exceed normal max length (<[e-mail]>)
+    * pland deleted past appointments on servers
+    * can no longer re-assign appointments in or to write-protected files
+    * edit menu: deleting with Note selected doesn't delete wrong appt now
 
 
-====== 1.5 released 3/22/96 =======
+====== 1.6 released 2/5/97 =======
+
+FEATURES:
+    * new day view (does not work in Japanese yet, sorry)
+    * configuration option to use main window for all views
+    * read-only access to xmbase-grok databases (see Help->Database access)
+    * improved holiday grammar, Erwin Achermann <[e-mail]>
+    * new netplan -f option to prevent daemonizing, like -d but without logging
 
 BUG FIXES:
-    * netplan accepted far fewer clients than available file descriptors allow
+    * now translating national special characters to PostScript when printing
+    * fixed crash under DEC OSF/1, which doesn't declare malloc in <malloc.h>
+    * fixed crash if drawn strings contain characters not defined in the font
 
 
-====== 1.5.1 released 4/21/96 =======
+====== 1.5.4 released 11/14/96 =======
 
 FEATURES:
-    * Japanese support (Ogura Yoshito <[e-mail]>)
-    * added resource to restrict month views to the days of that month
+    * Finnish holiday file by Steven Wahlberg <[e-mail]>
 
 BUG FIXES:
-    * pland now refuses to execute scripts that come from an (insecure) server
-    * newly entered appointments could end up in the wrong file on the server
-    * on first startup, the top line in the file list contained a garbage path
-    * missing colon in three default resources (plan -d)
-    * SCO has no fchmod and needs -lsocket ([e-mail])
-    * a resource list was too small (Ogura Yoshito <[e-mail]>)
-    * command-line appointment entry (plan hhmm text...) didn't work
-    * it's now necessary to enter an appointment before choosing its file assoc
-    * plan -t without -o never printed anything
-    * IP port number now byte-swapped for Linux (Klaus.Steinberger@Physik.
-      Uni-Muenchen.DE)
-
+    * wrong date defaults in appointment entry dialogs fixed
+    * changing appointment group fixed by Johan Vromans <[e-mail]>
 
-====== 1.5.2 released 8/1/96 =======
 
-NEW PLATFORMS:
-    * Sequent Dynix/ptx 4.0 or 4.1 (Mike Gilpin <[e-mail]>)
+====== 1.5.3 released 8/1/96 =======
 
 FEATURES:
-
-BUG FIXES:
-    * -t/-T options don't need the X server (Glenn Trigg <[e-mail]>)
-    * -t/-T options were using the wrong timezone
-    * scripts were rejected as insecure even when read from local files
-    * week view printouts with "omit all appointments" ticked crashed plan
-    * file list modifications were not immediately written back to the files
-    * when editing an appointment, it moved in list if others have same time
-    * print month: all appointments missing if "omit other users" flag is on
-    * if trying to kill old plan process, make sure its pid was different
-    * press on Note, then Delete -> deletes wrong appointment. No longer.
-
-
-====== 1.5.3 released 8/1/96 =======
-
-FEATURES:
-    * new search modes: one file, private only
-    * new alternative small month view
-    * preference menu now scrolls if the screen is too small (640x480)
-    * new GPS week mode (GPS=Global Positioning System)
+    * new search modes: one file, private only
+    * new alternative small month view
+    * preference menu now scrolls if the screen is too small (640x480)
+    * new GPS week mode (GPS=Global Positioning System)
 
 BUG FIXES:
     * modified file list was not immediately written back to disk
@@ -501,482 +540,485 @@ BUG FIXES:
     * fixed various minor porting issues (struct list->plist, file->pfile)
 
 
-====== 1.5.4 released 11/14/96 =======
+====== 1.5.2 released 8/1/96 =======
+
+NEW PLATFORMS:
+    * Sequent Dynix/ptx 4.0 or 4.1 (Mike Gilpin <[e-mail]>)
 
 FEATURES:
-    * Finnish holiday file by Steven Wahlberg <[e-mail]>
 
 BUG FIXES:
-    * wrong date defaults in appointment entry dialogs fixed
-    * changing appointment group fixed by Johan Vromans <[e-mail]>
+    * -t/-T options don't need the X server (Glenn Trigg <[e-mail]>)
+    * -t/-T options were using the wrong timezone
+    * scripts were rejected as insecure even when read from local files
+    * week view printouts with "omit all appointments" ticked crashed plan
+    * file list modifications were not immediately written back to the files
+    * when editing an appointment, it moved in list if others have same time
+    * print month: all appointments missing if "omit other users" flag is on
+    * if trying to kill old plan process, make sure its pid was different
+    * press on Note, then Delete -> deletes wrong appointment. No longer.
 
 
-====== 1.6 released 2/5/97 =======
+====== 1.5.1 released 4/21/96 =======
 
 FEATURES:
-    * new day view (does not work in Japanese yet, sorry)
-    * configuration option to use main window for all views
-    * read-only access to xmbase-grok databases (see Help->Database access)
-    * improved holiday grammar, Erwin Achermann <[e-mail]>
-    * new netplan -f option to prevent daemonizing, like -d but without logging
+    * Japanese support (Ogura Yoshito <[e-mail]>)
+    * added resource to restrict month views to the days of that month
 
 BUG FIXES:
-    * now translating national special characters to PostScript when printing
-    * fixed crash under DEC OSF/1, which doesn't declare malloc in <malloc.h>
-    * fixed crash if drawn strings contain characters not defined in the font
+    * pland now refuses to execute scripts that come from an (insecure) server
+    * newly entered appointments could end up in the wrong file on the server
+    * on first startup, the top line in the file list contained a garbage path
+    * missing colon in three default resources (plan -d)
+    * SCO has no fchmod and needs -lsocket ([e-mail])
+    * a resource list was too small (Ogura Yoshito <[e-mail]>)
+    * command-line appointment entry (plan hhmm text...) didn't work
+    * it's now necessary to enter an appointment before choosing its file assoc
+    * plan -t without -o never printed anything
+    * IP port number now byte-swapped for Linux (Klaus.Steinberger@Physik.
+      Uni-Muenchen.DE)
 
 
-====== 1.6.1 released 4/12/97 =======
+====== 1.5 released 3/22/96 =======
+
+BUG FIXES:
+    * netplan accepted far fewer clients than available file descriptors allow
+
+
+====== 1.4.8 (1.5 beta2) released 3/8/96 =======
 
 FEATURES:
-    * implemented simple access list features in netplan
-    * Belgian holiday file (Danny Backx <[e-mail]>)
-    * pland got new -l/-L options to enable/disable auto-exit on logout
-    * fixes to compile under NetBSD 2.1 (Petter Reinholdtsen <[e-mail]>)
+    * new Cancel button in File list
+    * pressing Return on Note column auto-confirms again
+    * netplan now writes files periodically and tries to write when crashing
+    * netplan can now safely be started as root or setuid root. Instead of
+      refusing to start, it switches to compiled-in <nobody> UID and GID.
+      netplan can now be started in /etc/rc2.d/S99netplan or /etc/rc.local.
 
 BUG FIXES:
-    * the prev/next buttons in the day and week views no longer crash plan
-    * opening a nonexisting file on a netplan server could crash the server
-    * views no longer lose window margins and resize correctly under X11R6.4 
-    * year views now draw significantly faster (factor >100 for some files)
-    * text in week bars exceed normal max length (<[e-mail]>)
-    * pland deleted past appointments on servers
-    * can no longer re-assign appointments in or to write-protected files
-    * edit menu: deleting with Note selected doesn't delete wrong appt now
+    * desensitize text instead of printing '---' in File list
+    * ensure that names in File list are unique by appending 'x'
+    * netplan now fails if its home directory doesn't exist
+    * plan crashed on Suns with "no memory" when connecting to netplan
+    * replaced references to obsolete menus and terms in the help texts
 
 
-====== 1.7 released 1/1/98 =======
+====== 1.4.7 (1.5 beta) released 2/22/96 =======
 
-Special thanks to Georg-Wilhelm Koltermann <[e-mail]>, who
-sent a large number of improvements and bug fixes, especially in netplan.
-His changes (sometimes modified by me) are marked (gwk) below.
+NEW PLATFORMS:
+    * Makefile change for Solaris 2.4 by Paul Eggert <[e-mail]>
 
 FEATURES:
-    * redesigned appointment entry: direct entry of multiday appts, up/down
-      arrow buttons for most fields
-    * implemented advance warnings several days ahead
-    * netplan overhaul: (gwk)
-      .  symbolic host/user/group names
-      .  multiple groups per user (a la BSD)
-      .  magic 'owner' ACL record, applies if file name == user name
-      .  detect ACL file changes and re-read automatically
-      .  support for identd (RFC 1413) authentication
-    * clicking on empty space in year overviews calls appt edit menu
-    * appointment color entry uses X OptionMenu on systems that support it
-    * now 16 instead of 8 group colors available in the file list menu
-    * added keyboard accelerators for common pulldown menu items
-    * Norwegian holidays (Petter Reinholdtsen <[e-mail]>)
-    * Austrian holidays (Friedrich Leisch <[e-mail]>)
-    * Hungarian holidays (Kelemen Péter <[e-mail]>)
-    * FreeBSD Makefile and patches (Stefan `Sec` Zehl <[e-mail]>)
-    * SNI Sinix 5.42 Makefile (Bernhard Metzger <[e-mail]>)
+    * new IP server for distributed file management, safe multiuser access
+    * new year overview that plots appointment groups on a 365-day timeline
+    * new resource plan*noteWidth for width of note column in entry dialog
+    * plan doesn't allow entry of stop-repeating date < trigger date
+    * single-number time entries "0".."23" are interpreted as 0:00..23:00
 
 BUG FIXES:
-    * netplan overhaul: (gwk)
-      .  fixed file readonly mgmt, now kept per client open, not per file
-      .  fixed row ID wraparounds
-      .  files read were initialized as "modified", causing writeback.
-      .  file reference counter must only be incremented for the first
-         open by a specific client (pland reopens many times)
-      .  ACL netmask defaults to 255.255.255.255, not to the whole network
-      .  fixed readonly or inaccessible files for an user's own appts
-      .  plan could crash when modifying appts read from a crashed netplan
-      .  host names in the ACL may now contain '-' characters
-    * fixed bad attachment in month view, caused LessTif problems (gwk)
-    * private appointments were often written to the server (gwk)
-    * year overview skipped daily appts if the first day was an exception (gwk)
-    * lost exception dates if the dialog was closed by pressing "split" (gwk)
-    * split exceptions appeared in the day view but turned blank when any
-      field was clicked for editing. (gwk)
-    * if pland was started by plan instead of from the user's .xsession file,
-      it inherited a copy of plan's file descriptors and never closed them,
-      leading to stale locks and dangling netplan connections (gwk)
-    * netplan ACL could ignore lines and failed for large ACL files. Also,
-      little-endian machines got IP addresses wrong. (Bruno Achauer
-      <[e-mail]>)
-    * BSD fixes (Jay Vassos-Libove <[e-mail]>)
-    * netplan could crash if a data file grows (Dag Nygren <[e-mail]>)
-    * fixed a file descriptor leak in the help system
-    * year and year-overview mode buttons in the Print menu were swapped
-    * auto DST did not work in the southern hemisphere, where begin > end
-      (Glen Pringle <[e-mail]>)
+    * fixed shift/reduce conflicts ('%' operator had no association priority)
+    * some systems required print mode button to be pressed twice, fixed
+    * Linux picked a default forground color that made help texts unreadable
 
+Note: the default LIB directory is now /usr/local/lib, not /usr/local/bin.
 
-====== 1.7.1 released 2/22/98 =======
+
+====== 1.4.5 released 12/14/95 =======
+
+Special thanks to Johan Borkhuis <[e-mail]> for his work!
+
+NEW PLATFORMS:
+    * Apollo Domain/OS (Vince Skahan <[e-mail]>)
 
 FEATURES:
-    * Danish holiday file (Arne Norre Ekstroem <[e-mail]>)
+    * empty day boxes in month view show previous/next month (Johan Borkhuis)
+    * week views can switch years (Johan Borkhuis)
+    * user selection popup in appt entry menu got DONE button (Johan Borkhuis)
 
 BUG FIXES:
-    * month view crashed if large holiday messages fall on grayed-out days
-    * random text when the first day of a multiday holiday overlaps another
-    * netplan authentication by host failed on little-endian machines
-    * fixed a PostScript bug that prevented printing months and years >= 2000
-    * some online help messages in the edit menu were assigned incorrectly
-    * fixed File->delete past entries (Pace Willisson <[e-mail]>)
-    * command-line appointment entry did not update netplan database
-    * drag-and-drop wireframes are more visible
-    * HP/UX 9 target is now "hp9", "hp" is HP/UX 10; updated Control Data
-      EP/IX 2.1.1 target (Geert Albert Smant <[e-mail]>)
-    * new target "hpg" for building plan on HP/UX10 systems with gcc
-    * print iso-latin characters (Detlef Liem <[e-mail]>)
-    * fixed netplan "group" verification (Jens Krinke <[e-mail]>)
-    * no locking on OSF/1 (Henrik Seidel <[e-mail]>)
-    * grok date+time entries that begin with a blank were parsed incorrectly
-    * when entering a new appointment, the time field opens blank, not 0:00
-    * fixes for FreeBSD (Stefan `Sec` Zehl <[e-mail]>)
+    * added void declarations, moved externals to conf.h (Johan Borkhuis)
 
 
-====== 1.7.1 released 2/22/98 =======
+====== 1.4.4 released 9/19/95 =======
 
 FEATURES:
-    * pland only checks for logout after verifying that the login was noted
+    * Italian holiday file (Riccardo Scateni ([e-mail]))
+    * user assignment popup shows multi-column user list if the list is long
+    * notifier popups contain user, length, end time, and optional note string
+    * "Execute" commands in alarm options may contain %s, replaced with note
 
 BUG FIXES:
-    * fixed netplan ACL malloc (Harald Böhme <[e-mail]>)
-    * fixed drag&drop crash (Cy Schubert <[e-mail]>)
-
+    * notifier snooze now works (Karsten Gaier)
+    * pland ignored some repeating appointments
+    * plan -t yesterday now works
+    * error message bugs for fonts, colors, and holiday syntax (Bob Tomlinson)
 
-====== 1.7.2 released 14.7.98 =======
 
-FEATURES:
-    * Japanese port updated by OGURA Yoshito <[e-mail]>,
-      NISHIJIMA Takanori <[e-mail]>
-    * new resource showIconDate puts date and time into icon label
-    * day view now shows holidays
-    * pland -s sleeps while user is logged out but stays around
-    * pland -t prints alarms to stdout instead of popping up windows
-    * plan -S starts pland if it does not exist without asking
-    * plan '22.11.99 15:23' now also works, replacement for plan [mmdd]hhmm
-    * dates with years in the range 0..37 now mean 2000..2037, it is no longer
-      necessary to enter four-digit years after 1999.
-    * support for window managers handling client window groups (Pete Bentley
-      <[e-mail]>).
+====== 1.4.3 released 7/7/95 =======
 
 BUG FIXES:
-    * when changing appt time to "-", clear length and advance time fields
-    * goto and goto-today did not switch day view
-    * no longer prints wrong time after startup (Adrian Miranda <[e-mail]>)
+    * pland didn't pop up advance-warning popups
 
 
-====== 1.8 released 30.3.99 =======
+====== 1.4.2 released 5/23/95 =======
 
 FEATURES:
-    * CGI scripts and HTML pages for web browser access, Michel Bourget
-      <[e-mail]> (hacked by [e-mail], bugs are
-      probably my fault)
-    * national language support and a German language file. No support for
-      pulldown accelerators. Foreign-language help files are supported but
-      none are supplied yet.
-    * French language file by Guy Brand <[e-mail]>
-    * new automatic DST mode that attempts to get the time from the system
-      (experimental, available only for some systems, mostly untested)
-    * simple Todo appointments that keep appearing after they first trigger
-    * implemented default advance-warning times (Config->Calendar views)
-    * color PostScript printouts (Kevin Earls <[e-mail]>)
-    * new config mode that allows daemon to exeute insecure netplan scripts
-    * new config mode that makes Thursday the selector for the first week
-    * new combination holiday file by Walter Brown <[e-mail]>
-    * new Portuguese holiday file by Jose Paulo Moitinho de Almeida
-      <[e-mail]>
-    * support for Christian Orthodox Easter (new holiday keyword "pascha")
-    * ported again to FreeBSD (Stefan `Sec` Zehl <[e-mail]>)
-    * converted remaining old code to ANSI C
-    * new Czech holiday file by Hanus Adler <[e-mail]>
+    * if pland is started after an alarm time but before its end, trigger it
+    * the own-only flag in appointment entry menus is saved for future menus
+    * debugging option -d for pland, more info about what is going on
+    * pland makes sure that its version number matches plan
+    * delete-pending-selection mode for holiday and message text windows
 
 BUG FIXES:
-    * Linux once again scrambled some header files and made plan uncompilable
-    * small holidays crash day view (Sjoerd Mullender <[e-mail]>
-    * if pland was started between 0:00 and 2:59:59, it overlooked appointments
-    * fixed "W:" note prefix (Sjoerd Mullender <[e-mail]>)
-    * netplan identd queries went to the local host instead of the remote host
-    * fixed Y2K problem in PostScript printout. It works now but I don't under-
-      stand why. Fixed by Vincent Everett <[e-mail]>.
-    * plan -t/-T will now mark warnings with "Warn:".
-    * fixed removal of appointment edit menu for LessTif (Anders Melchiorsen
-      <[e-mail]>)
-    * netplan: group authentication and memory allocation bug fixed by Jens
-      Krinke <[e-mail]>
-    * purge unnecessary lines in empty edit menus, manually adjust edit list
-      size to fix LessTif problem (Anders Melchiorsen <[e-mail]>)
-    * toggle buttons in print menu did not work with some Motif implementations
-    * notifier now resizes correctly, text area grows instead of buttons
-    * day view got holidays wrong near the end of the year (Anders Melchiorsen
-      <[e-mail]>)
-    * LessTif optimizations (Rick Scott <[e-mail]>)
-    * user ID was freed twice in netplan (Jeff Dairiki <[e-mail]>)
-    * it is now possible to inspect messages attached to read-only appts
-    * plan -t had multiday problems (Aaron Kaplan <[e-mail]>)
-    * fixed PostScript Y2K bug (James E. Rowley <[e-mail]>)
-    * fixed zombie problem caused by plan automatically starting pland
-
-
-====== 1.8.1 released 16.5.99 =======
-
-FEATURES:
-    * Japanese port of 1.8 by Takafumi Hayashi <[e-mail]>
-    * port to OS/2 with X by Alexander Mai <[e-mail]>
-    * new configure script that simplifies modifications for default, SGI,
-      and Linux installations.
+    * lock could crash if argv[0] is very long ([e-mail] (Mike Eggleston))
+    * better handling of user name input
+    * much better performance if many other users exist but are disabled
+    * no longer detects spurious file write errors
+    * notifier position now uses better randomization to avoid piling up
+    * PostScript printouts often printed disabled appointments
+    * Sync button in week view could lose recently edited appointments
+    * no more "cannot write backup" messages on IBM systems
+    * time displayed after startup could be wrong for up to one minute
 
-BUG FIXES:
-    * plan -F: stdout could not be redirected, added missing fflush
-    * various error popups are now modal, to prevent them from being overlooked
-    * small Ultrix fixes (no pland -l) by Maarten Vergauwen
-      <[e-mail]>
-    * fixed month and year PostScript printing, texts were in the wrong places
 
+====== 1.4.1 released 4/1/95 (mailing list release only) =======
 
-====== 1.8.2 released 5.7.99 =======
+NEW PLATFORMS:
+    * Solaris2 with gcc port, [e-mail] (Bo Kullmar)
 
 FEATURES:
-    * Spanish language support by Manuel Soriano <[e-mail]>
-    * Port to LynxOS mag 2.5.1 092297-D i386 by Marius Groeger <[e-mail]>
-    * if the X server fails to send X timer events, switch to synchronous file
-      writing to avoid data loss. Works around bug or incompatibility in XFree.
-    * new script to convert Microsoft Schedule+ files to .dayplan format by
-      Cy Schubert - ITSD Open Systems Group <[e-mail]>
+    * -o print other users too, -T is like -t but with end times, not lengths
+    * print-only-my-appointments toggle added, Richard G. Hash ([e-mail])
 
 BUG FIXES:
-    * fixed configure script problems and clarified man page locations
-    * more fixes by Phil Sackinger <[e-mail]>
-    * fixed output of -W -i for web interface
-    * the .plan.dir choice in the configure script caused path trouble in plan
-    * another PostScript bug fix causing text in wrong positions fixed by
-      Daniel Robitaille <[e-mail]>
-    * more OS/2+X patches by Alexander Mai <[e-mail]>
-    * weekday before/after syntax was wrong in holiday parser, Thomas Henlich
-      <[e-mail]> and Henning Daum <[e-mail]>
-    * LessTif 0.88.1 fix by Thomas Henlich <[e-mail]>
-    * improved man pages, foreground/background is now configurable from the
-      script for Debian/Linux compatibility, netplan should not always run as
-      nobody, and a French holiday fix by Yann Dirson <[e-mail]>
-    * enter webplan mode if the program is called "webplan", reading netplan
-      user list crashed if there were no users, fixed possible crash when
-      closing file list menu, renamed welcome.html to bottom.html by Murray
-      Jensen <[e-mail]>
-
-
-====== 1.8.3 released 8.12.99 =======
-
-FEATURES:
-    * new options -N, -c, and -h to control more options when adding entries
-      from the command line (Tovar <[e-mail]>)
+    * alarm mode button in Config->User popup was lost
+    * UnixWare needs -lgen to compile
+    * if there was no .dayplan, the week view ranges were not initialized
+    * the ?: operator in the holiday parser didn't work, Kai Hofmann
+      <[e-mail]>
+    * notes were invisible in week view in Japanese mode, Takanori Nishijima
+      <[e-mail]>
 
-BUG FIXES:
-    * Fixed language file order, causing untranslated messages. Also replaced
-      OK button with Kill button in "another plan is running" dialog. Thomas
-      Henlich <[e-mail]>
-    * fixed manpage names, Kai Großjohann <[e-mail]>
-    * fixed pascha (Orthodox Easter) calculation and added greek holiday file,
-      Efthimios Mavrogeorgiadis <[e-mail]>
-    * fixed timezones on the other side of the dateline (Truxton Fulton
-      <[e-mail]>)
-    * fixed toggle buttons in print menu (Ekkehard Hoffmann <[e-mail]>)
-    * new timezone code for DEC OSF/1 (Petrie L M <[e-mail]>)
-    * client connection failures now close the connection cleanly and do not
-      leak memory
-    * non-netplan files incorrectly became read-only after the first change
-    * fixed recognition of -u users (Ekkehard Hoffmann <[e-mail]>)
-    * changed two-digit year display in month/year printouts to four digits
-      (Goran Larsson <[e-mail]>)
 
+====== 1.4 released 2/22/95 =======
 
-====== 1.8.4 released 17.7.00 =======
+NEW PLATFORMS:
+    *  UnixWare 1.1 and 2.0, [e-mail]
 
 FEATURES:
-    * Changed configure script, Makefile, and manpages to conform to Debian
-      Linux conventions, Yann Dirson <[e-mail]>
-    * another configure preset for SuSE Linux
-    * new SysV alarm signals that prod the X timer events that write modified
-      data, as a workaround for broken XFree86 X servers, by Francis Montagnac
-      <[e-mail]>
-    * netplan now listens on two ports (unless overriden in /etc/services):
-      5444 for backwards compatibility, and 2983, the new IANA-registered port.
-    * "user" lines in netplan ACLs now accept "user@host" arguments, by Jochen
-      Bern <[e-mail]>
-    * the "another plan window is running, kill/continue" popup now blocks
-      until answered.
-    * OpenMotif support (XFree 4.0.1, OpenMotif 2.1.30) by Wes Kaefer
-      <[e-mail]>
+    *  PostScript printouts of week views
+    *  appointments of other users or shared lists can be displayed in the
+       month and/or week views, and can be created, deleted, and modified. No
+       inetd daemon yet, but proposed "workgroup" functions are implemented.
+    *  appointments of other users can optionally trigger own alarms
+    *  up to four exception dates per appt where alarm is suspended, fill-in
+       appointments for each of these can be created automatically ("split")
+    *  appointment texts in month view can be highlighted with one of 8 colors
+    *  options and preferences consolidated into new calendar config popup
+    *  config first week of year (full or partial)
+    *  appointments can now be selectively removed from month/year/week views
+    *  number of days in week view is now configurable (1..28 days)
+    *  user list now accepts file names in addition to directories
+    *  added flags to omit appointments in printouts
+    *  printout now uses message text if there is no note
+    *  do scripts even if alarms are turned off
+    *  files are written using backup and temp copies to recover from errors
+    *  dump to stdout with -t now accepts second parameter for number of days
+    *  entries without time may be displayed as large bar in week view
 
 BUG FIXES:
-    * OS/2 Makefile fixes, Alexander Mai <[e-mail]>
-    * fixes by Francis Montagnac <[e-mail]>:
-      - reading and writing of appt files of another user could access this
-        user's file instead, by Francis Montagnac
-      - don't redraw twice after deleting, can crash, by Francis Montagnac
-      - warn when using more than one server, by Francis Montagnac
-      - don't expand home-dirs in "File List" but put simply "~user". This
-        prevent absolute pathnames in dayplan for user appointment files.
-      - change writefile to return true for any readonly files, without doing
-        anything. Fix call of fclose on NULL when creating a new file.
-      - fix accept_new_list to update the views even for non server files.
-      - fix in resolve_tilde: ~user gave /home/user/user
-    * color-shaded backgrounds in month view are now printed, by Brad Jorsch
-      <[e-mail]>
-    * huge numbers of lines in the large month view can cause heap corruption,
-      by Paul Anderson <[e-mail]>
-    * fixed umlauts in Austrian holiday file, by Friedrich Leisch
-      <[e-mail]>
-    * note: on SGI IRIX6 I appear to be unable to compile with -mips2, sorry.
+    *  updated Swedish holiday file
+    *  when cursor is in note column, pressing lock made appt disappear
+    *  don't use the plainfile/. trick, DEC's ASF claims the directory exists!
+    *  appt menu: press date, press time -> wrong default in date
+    *  default for print is now month, not year
+    *  week view overlaps were wrong if start<minhour, some bars were missing
 
 
-====== 1.8.5 released 16.2.03 =======
+====== 1.3.2 released 11/11/94 =======
+
+NEW PLATFORMS:
+    *  Convex C220
+    *  SGI IRIX 6.0
 
 FEATURES:
-    * plan's FTP home site has a new name: plan.ftp.fu-berlin.de, shown in
-      the About popup. The old address will continue to work. (Thanks, Heiko!)
-    * set locale to support other character sets such as Czech, by Petr Kristan
-      <[e-mail]>
-    * OpenBSD port by Armin Wolfermann <[e-mail]>
-    * new plan2vcs perl script that converts plan appointments to korganizer
-      format, by Bert Bos <[e-mail]>
-    * if there is a ~/.holiday file, don't read LIB/holiday as well.
-    * skip junk in entries synced from PalmPilot DateBk4 messages, by Johan
-      Vromans <[e-mail]>
-    * allow new holiday syntax "workday before/after <date>", by Ian Holland
-      <[e-mail]>
-    * Italian language translations by Paolo Panizza <[e-mail]>
-    * accept yyyy/mm/dd date input, Brian T. Schellenberger <[e-mail]>
-    * Slovak holidays by Mikulas Sustak <[e-mail]>
+    *  Australian holiday file, by Peter Turnbull ([e-mail])
+    *  new date format added: "-n" is n days ago (useful for -t option)
 
 BUG FIXES:
-    * fixed Debian bug 157425: color selection dropbox always starts on Default
-    * Suns apparently still run X11R5 and don't have XtSignalId et. al.
-    * configure script had problems with defaults when using bash (Michael
-      Mauch <[e-mail]>
-    * fixed configure script problems on Solaris 2.6, by Horst Scheuermann
-      <[e-mail]>
-    * fixed Dutch Driekoningen holiday date, by Johan Vromans
-      <[e-mail]>
-    * IBM AIX doesn't have Xt timers and doesn'd compile plan 1.8.4, excluded
-      XFree workaround for IBM
-    * week number 2 appeared twice in 2001. Fixed by Helmut Jarausch
-      <[e-mail]>
-    * Search->One file could not select the "own" file (top menu choice).
-    * cleanup: removed remaining K&R varargs and sunkr target
-    * fixed '@' user notation in netplan server, by Gennadi Umanski
-      <[e-mail]>
-    * fixed Japanese string converion, by Tomoko Hayashi <[e-mail]>
-    * other people's .dayplan file references ('L' lines in ~/.dayplan) over-
-      wrote own file entries (Heiko Schlichting <[e-mail]>)
-
+    *  only refresh changed window regions (Daniel Williams <[e-mail]>
+    *  week view ignored other user's appts that were earlier than first own
+    *  history files no longer run through cpp if file is empty ("error 0")
+    *  in the Adjust Time menu, the hour was printed incorrectly
+    *  new TZ parser for SVR4 syntax, by Klaus Guntermann <guntermann@
+       iti.informatik.th-darmstadt.de>
+    *  fast warning entry reversed early and late ([e-mail])
+    *  output of plan -t disappeared if stdout was redirected
+    *  date input now less eager to default to today's date
 
-====== 1.8.6 released 18.3.03 =======
 
-FEATURES:
-    * reversed the change in 1.8.5, at popular demand, that lets a personal
-      holiday file replace the system holiday file. plan 1.8.6 again reads
-      both, system first. The new "reset" keywords can be used to clear all
-      system holidays, following an idea by Heiko Schlichting.
+====== 1.3.1 released 7/11/94 =======
 
 BUG FIXES:
-    * the edit menu was broken in 1.8.5, fixed by Heiko Schlichting
-      <[e-mail]>
+    *  DEC alpha: fixed black-on-black notifier windows
+    *  XtPopup order wrong for Sun X11R5 in create_adjust_popup
+    *  -geometry didn't work
+    *  repeat on last weekday of a month didn't work
+    *  ISO characters in calendar windows didn't work
+    *  stripping leading blanks from config exec cmds, confused some shells
+    *  improved 12-hour time parsing, "5p" is now accepted in place of "5:00p"
+    *  appt menu: press date, press time with no entry -> wrong default in date
+    *  corrected left adjustment of appts without time in the month menu
+    *  Linux has problems with XtDestroyWidget. Workaround leaks memory!
+    *  fixed pland crashes after many sighup's if compiled without -DRABBITS
 
+NEW PLATFORMS:
+    *  IBM PS/2, AIX 1.3, gcc, by David W. Schuler <[e-mail]>
 
-====== 1.8.7 released 30.9.03 =======
 
-FEATURES:
-    * deleted support for SCO
-    * pland -p pops up all alarms that triggered since the last time pland
-      ran, not just those from the past three hours, by Brian L. Shaver
-      <[e-mail]>
-    * more room for appointments in year overview, moved year to left edge
+====== 1.3 release 6/1/94 =======
 
 BUG FIXES:
-    * newly entered appointments no longer vanish from the edit menu.
-    * fixed errno compiler errors on SMP systems, Thomas Ribbrock
-      <[e-mail]>
-    * Italian language translations by Paolo Panizza <[e-mail]> were
-      missing from the 1.8.5 and 1.8.6 distributions, now included
-
-
-====== 1.9 released 6.2.05 =======
-
-FEATURES:
-    * saved space in various calendar views such as the year overview
-    * the week view repeats the hour title every few day rows; it was too easy
-      to get lost without scrolling all the time
-    * remove obsolete warning windows when the next warning or the main alarm
-      is reached.
-    * Linux: when a lockfile from a previous plan process is found, do not kill
-      it if it's dead and some non-plan process now uses the old process ID.
-    * if user "netplan" exists on the system, netplan runs as that user instead
-      of nobody. Needed for Debian. Petter Reinholdtsen <[e-mail]>
-    * added Belgian French holiday file, Nicolas E'vrard <[e-mail]>
-    * command-line option -V: experimental and incomplete vCalendar export.
-      File can be read by calendar programs such as Mozilla Calendar.
-    * plan is now distributed under the GPL license, at your choice.
-    * netplan has a new option -s that sends all messages to syslog.
+    *  non-interactive mode and -v should not init X
+    *  clip bars in week views at midnight
+    *  Suns have no utopia
+    *  no stdarg.h (Sparc 1+,h SunOS 4.1.3, X11R5pl25, Motif 1.2.1)
+    *  week view range menu was mangled on Suns and a few others
+    *  HPs may get unknown color background
+    *  bars of appts with no time don't reserve space in week chart
+    *  crash if null user is entered
+    *  align ':' in times vertically in month day boxes (hi Andreas)
+    *  pulldown string resources now hardcoded, easier to maintain this way
+    *  crashes when accessing other users fixed (fix by Rob Gabbard)
+    *  couldn't enter durations "12:xx" in 12-hour mode
+    *  when switching 12/24 hour mode, time display now changes immediately
+    *  fall back to "variable" or "fixed" font if some font can't be found
+    *  long "small" holiday names in large month day boxes could overrun buffer
+    *  various minor fixes in the week menu, some bars were drawn incorrectly
+
+NEW FEATURES:
+    *  PostScript output, by Karl Bunch <[e-mail]>
+    *  Japanese version, by Ogura Yoshito <[e-mail]>
+    *  support for SGI desktop look&feel
+    *  new RGB icon picture for SGIs running the 4Dwm window manager
+    *  holiday file accepts #include statements if /lib/cpp is available
+    *  optional user name in week view before note (new week config popup)
+    *  rearranged header above month view
+    *  reads LIB/holiday after reading ~/.holiday
+    *  new recycle option: every year (for birthdays etc)
+    *  -t option that prints appointments on a day to stdout
+    *  Delete-past-entry command now has five maximum-age choices
+    *  EditRes, by Klaus Guntermann <[e-mail]>
+    *  better parse_timestring: 100 -> 1:00
+    *  click day in week view -> edit day
+    *  swedish holiday file, by Kristian Wedberg <[e-mail]>
+    *  switch to today / to a specific date using a text entry popup
+    *  today now highlighted green in week view
+    *  in fast warning entry mode, entering '=' uses default warning times
+    *  first partial week in Jan is counted as 1. See FULLWEEKS in mondraw.c.
+    *  NODAEMON_ONCE in popup.c is defined to suppress multiple error popups
+
+NEW PLATFORMS:
+    *  SunOS 4.1.3 with K&R cc, replaces stdarg with varargs if -DVARARGS,
+       by Michael P. Shevenell <[e-mail]>
+    *  Sony NEWS with/without gcc, by Ogura Yoshito <[e-mail]>
+    *  Sequent running Dynix/ptx v2.[12], by Mike Gilpin <[e-mail]>
+
+NOTE: the comment character in ~/.holiday files was changed from '#' to ':'
+      to allow cpp to parse the file. Not changing these characters will cause
+      cpp "undefined control" errors.
+
+
+====== 1.2 PL 4 release 12/12/93 =======
 
 BUG FIXES:
-    * fixed Italian language file, Carlo Mandelli
-      <[e-mail]>
-    * fixed misspelling in the Italian language file, littledark
-      <[e-mail]>
-    * "Delete past entries" did not remove repeating entries whose end date is
-      in the past, Aaron Kaplan <[e-mail]>
-    * fixed choice 1 of configure script on Solaris, Aaron Kaplan
-      <[e-mail]>
-    * after running a long time (months), alarms stopped triggering. Fixed by
-      Aaron Kaplan <[e-mail]>
-    * fixed Spanish holiday file, Fernando Tricas "Garci'a"
-      <[e-mail]>
-    * fixed loads of inane gcc warning messages
 
+    *  preventing user from entering user directory before user name (crash)
+    *  added -DRABBITS on HPs because utmp appears to be unreliable
+    *  removed #ifdef NCR around FIXMBAR in calmenu.c, fixes empty pulldowns
+    *  replace fchmod with chmod (SCO has no fchmod)
+    *  Ultrix 4.3A has fcntl.h in sys
+    *  OSF/1 and Ultrix require -DRABBITS
+    *  later instances of repeating week bars got overdrawn by other bars
+    *  Makefile OSF_C: added -DOSF
+    *  put notifier -d into help text
+    *  when searching for programs (find_file), ignore directories
+    *  replace palatino with a standard font
+    *  fast warning on; bring up appt menu; fast warning off -> core
+    *  read_file ignores timezone setting
+    *  repeat-every-n-days could slow down redrawing significantly
+    *  if a user is added to the week view, pland sometimes died
+
+NEW FEATURES:
 
-====== 1.10 released 9.4.07 =======
+    *  raise week and year window when user requests one
+    *  -hhmm notation for appt length (until hhmm)
+    *  +n notation for parsing dates
+    *  if note begins with '-' or '=', remove from month/year/week or m/y view
+    *  help-on-context buttons in the help window
+    *  quit button for year view
+    *  resource to put black frame into today's day box (for 1-bit graphics)
+
+NEW PLATFORMS:
+
+    *  Linux, by Dirk Melchers <[e-mail]>
+    *  SunSoft Interactive (ISC) 4.0, by [e-mail] (Andrew Fullford)
 
-FEATURES:
-    * implemented limited read-only support for vCalendar/iCalendar (.ics)
-      files (Apple, Zimbra, Lotus, etc), which can be specified in File ->
-      File list like other files. Repetition information is ignored.
-    * added "make linux64" target. Some 64-bit Linux installations, notably
-      OpenSUSE 10.2, omit 32-bit libraries or links, causing compilation errors
-      for -lXt and others.
-    * ported to MacOS X with X11 and OpenMotif. Requires X11 from the MacOS X
-      install DVD, and OpenMotif from www.ist-inc.com/DOWNLOADS/motif_files/
-      openmotif-compat-2.1.31_IST.macosx10.3.dmg . The X server must run, and
-      DISPLAY must be set properly (like, localhost:0) or plan won't start up.
-      This is not a proper Aqua/Cocoa/Carbon port, although I made some feeble
-      attempts to fix the color scheme.
-    * new Polish language file by Jaroslaw Arlet <[e-mail]>
-    * new command-line option -Y allows entering annual (yearly) appointments,
-      by Steffen Pietsch <[e-mail]>
-    * when alarms trigger, '%' codes in the short note text, message, and the
-      script are expanded. (See the help text in plan's Message/Script help.)
-      Eg., you can write message texts like "remember to see %U on %D at %T".
-	  %N    the short note text
-	  %M    the message text
-	  %S    the script text
-	  %D    the final trigger date
-	  %T    the final trigger time
-	  %L    the length in hours:minutes
-	  %F    the file the appointment is stored in, or "private"
-	  %U    your login name
-	  %%	a percent sign, '%'
+
+====== 1.2 PL 3 release 11/21/93 =======
 
 BUG FIXES:
-    * fixed a timezone bug that could make alarms go off exactly 24 hours late,
-      Aaron Kaplan <[e-mail]>
-    * manpage files were installed without the trailing ".1" and ".4"
-    * fixed compiler errors under Cygwin because the symbol linux was not set.
-    * added -m32 option for Linux; gcc 4 defaults to 64 bits but the required
-      libraries are not usually installed.
-    * entering a day of the month as a date will now correctly find the next
-      date with that day. A bug caused it to switch to a random date in 2000.
-    * fixed a language file read error that omitted a trailing null byte.
-      By Julien Soula <[e-mail]>
-    * an incomplete X resource file crashed plan. Now defaults are used; the
-      resulting windows are not very usable but it doesn't crash.
 
+    *  fixed repeat-until in recycling menu
 
-====== 1.10.1 released 3.7.07 =======
+
+====== 1.2 PL 2 release 11/10/93 =======
 
 BUG FIXES:
-    * fixed "last weekday in month" expressions in holiday file, by Arnaud
-      Giersch <[e-mail]>
-    * fixed mother's day definition in French holiday file, by Arnaud Giersch
-      <[e-mail]>
+
+    *  non-interactive mode no longer removes lockfile
+    *  minor cleanups in the help text
+
+
+====== 1.2 PL 1 release 10/16/93 =======
+
+NEW PLATFORMS:
+
+    *  BSDI386 and BSDI386 with gcc, by Tetsuji Rai <[e-mail]>
+
+NEW FEATURES:
+
+    *  time adjustment and timezone config menu
+    *  use search paths for executables and help file
+
+
+====== 1.2 PL 0 release 10/11/93 =======
+
+NEW FEATURES:
+
+    *  week views that graphs hours vs. weekdays
+    *  reads other people's appointments and displays them in the week view
+    *  show every instance of a repeating entry
+    *  new syntax: "nth weekday before/after date" (Advent/Buss&Bettag)
+    *  recycler: every/Nth/last <weekday> of the month
+    *  distinguish private and public appointments
+
+OTHER CHANGES:
+
+    *  option to switch off time in icon
+    *  parse TZ directly, don't use standard library for timezone calc
+    *  if there is a /tmp/.planUID, check if it's valid
+    *  added error popup for "another plan is running"
+    *  display holiday at the top of the day menu
+    *  scroll bars in help windows
+    *  improved help messages
+    *  year up/down now changes year menu too
+    *  separate path for manpages
+    *  documented important resources
+
+
+====== 1.1.2 release 6/28/93 =======
+
+NEW PLATFORMS:
+
+    *  Another SNI Sinix 5.4x Makefile patch by Gerald Rinske
+       <[e-mail]>
+    *  NCR, by Keith Shafer <[e-mail]>
+    *  SCO Open Desktop/Open Server 3.0, Makefile patches by Nathan Peterson
+       <[e-mail]>
+    *  Solaris 2.2, by Jean-Claude Giese <[e-mail]>
+    *  USL's SVR4.2 V1 with mdev package, by Peter Lord <[e-mail]>
+
+BUGFIXES:
+
+    *  daemon now exits automatically when user logs out
+    *  new French and Dutch holiday files
+    *  fixed Makefile bug for Ultrix and sung (-DGMTOFF)
+    *  fixed help button in holiday menu, it used to cancel the menu
+
+
+====== 1.1.1 release 6/20/93 =======
+
+NEW PLATFORMS:
+
+    *  MIPS Magnum, by Milton Scritsmier <[e-mail]>
+    *  SNI SINIX 5.4, by Martin Kraemer <martin@deejai>
+    *  Data General DG/UX, Makefile patches by Andy Dennie
+       <[e-mail]>
+
+BUGFIXES:
+
+    *  fixed major bug that lost paths beginning with ~, like ~/.dayplan
+    *  holiday parser: <Nth> <weekday> syntax didn't work correctly
+    *  daemon didn't recycle appointments if plan wasn't running
+    *  corrected and added German holidays
+    *  new dutch holiday file, by Guido van Rossum <[e-mail]>
+    *  -iconic option doesn't cause popups to come up iconic any more
+    *  dates in ~/.dayplan now stored with years in 4-digit format
+    *  replaced caddr_t with XtPointer, some HPs wouldn't compile otherwise
+    *  fixed undefined __DATE__ problem on Ultrix
+    *  fixed bug in appointment list re-allocation
+    *  new color resources to make the month view look like the year view
+    *  repeat-until date fixed
+
+
+====== 1.1 release 6/13/93 =======
+
+NEW PLATFORMS:
+
+    *  OSF1/AXP, by Dave Hill <[e-mail]>
+    *  IBM/AIX, by Johan Eksteen <[e-mail]>
+               and Vance R. Bass <[e-mail]>
+               and David W. Sanderson <[e-mail]>
+    *  HP/UX 9.01, by Sylvain Picard <[e-mail]>
+    *  NCR, by Keith Shafer <[e-mail]>
+    *  SUN, by Dave Brennan <[e-mail]>
+    *  ULTRIX 4.3, by Jeroen C. Kessels <[e-mail]>
+
+    [Note that some of the patches I received for these systems were
+     mutually exclusive. I had to manually merge them into the baseline
+     sources. I can't test them; if they don't work, complain to me and
+     not to the authors listed above. [e-mail]]
+
+NEW FEATURES:
+
+    *  fancy holiday parser
+    *  optional fast advance-warning column in list menus
+    *  new -K option of pland to kill daemon (for ~/.logout)
+    *  new option: don't show expired entries in today's day box
+    *  appointments without time field added (for birthdays etc)
+    *  snoozing alarms for 5 minutes
+
+MAJOR BUGFIXES:
+
+    *  pland no longer crashes if database becomes empty
+    *  plan no longer crashes when there are more than 100 entries
+    *  months outside the current DST zone were sometimes one day off;
+       rewrote time conversion routines to not use localtime and mktime
+    *  recycle ending date didn't work
+    *  readfile now avoids feof(), it seems to be broken on some systems
+    *  if colors cannot be allocated, use black&white rather than exiting
+
+OTHER CHANGES:
+
+    *  added time display in month calendar menu
+    *  if appts don't fit in day box, print three dots
+    *  in year view, click month to see that month
+    *  -s option does not start daemon, and now does not print warnings
+    *  notifier now beeps
+    *  Done button is now always the rightmost button, Quit renamed to Done
+    *  use tzset() to ensure that DST is interpreted correctly
+    *  multiple expose events mostly eliminated
+    *  notifier now deals correctly with empty messages, no more warnings
+    *  new Makefile option to remove all pulldown menu separator lines
+    *  help messages and other typos fixed
+    *  bottom day box note was incorrectly clipped
+    *  fflushed stdout after printing resources
+    *  fixed list locking problem in sublist.c
+    *  fixed keyword search for single-character search strings
+    *  it's no longer necessary to press Return in keyword search
+    *  X resources are now correctly propagated to submenus
+    *  sometimes day boxes stayed shaded yellow after the day menu exits
+
+
+====== 1.0 release 5/16/93 =======
diff --git a/holiday/holiday_bavarian b/holiday/holiday_bavarian
index 1bf25b3..fded0ce 100644
--- a/holiday/holiday_bavarian
+++ b/holiday/holiday_bavarian
@@ -18,7 +18,7 @@
 : Spargel...
 :  wird bis höchstens JOHANNI gestochen.
 : Regen...
-:  Wenns ans SIEBENSCHLÄFER regnet, so regnet's sieben Wochen.
+:  Wenns ans SIEBENSCHLÄFER regnet, so regnets sieben Wochen.
 :
 
 :
@@ -46,7 +46,7 @@ small        "Weihnachten"         weekend on 25.12. length 2 days
 small        "Sylvester"                   on 31.12.
 
 : 
-: 3) Devil's Grandmothers Days
+: 3) Devils Grandmothers Days
 : 
       blue   "Sommerzeit"                  on last sunday in march
       blue   "Winterzeit"                  on last sunday in october
diff --git a/language/plan.lang.spanish b/language/plan.lang.spanish
index 4507272..637cd94 100644
--- a/language/plan.lang.spanish
+++ b/language/plan.lang.spanish
@@ -1,5 +1,5 @@
 \n(Tentativa de acceso al fichero "%s".)
-\nPlanificadir versión %s\nCompilado %s\n\nAutor: Thomas Driemeyer\n<[e-mail], [e-mail]>\n\nSuscripciones en [e-mail]. \n  O visita la Web:\n\nhttp://www.bitrot.de\nhttp://www.in-berlin.de/User/bitrot\n\nLos fuentes estan disponibles en: \nftp://bitrot.in-berlin.de/pub/plan\nftp://plan.ftp.fu-berlin.de\n
+\nPlanificador versión %s\nCompilado %s\n\nAutor: Thomas Driemeyer\n<[e-mail], [e-mail]>\n\nSuscripciones en [e-mail]. \n  O visita la Web:\n\nhttp://www.bitrot.de\nhttp://www.in-berlin.de/User/bitrot\n\nLos fuentes estan disponibles en: \nftp://bitrot.in-berlin.de/pub/plan\nftp://plan.ftp.fu-berlin.de\n
  (propietario)
  (solo lectura)
  (alerta)
@@ -7,19 +7,19 @@
 %d de las %d citas de la base grok\n%s han sido ignoradas\npor una fecha/hora no valida.
 %s es una\nbase de datos grok, no soportada
 %s es una\nbase de datos xmbase-grok, no es posible escribir en el fichero
-%s: %s en la lineas %d en %s\n
-%s: %s: linea no valida:\n%s
+%s: %s en la líneas %d en %s\n
+%s: %s: línea no válida:\n%s
 %s: %s: no encontrado\n
 %s: CUIDADO : Imposible de encontrar %s\n
 %s: CUIDADO : No se puede leer el nombre del usuario.\n%s
-%s: WARNING: can't signal daemon: 
+%s: CUIDADO : No se puede avisar al demonio: 
 %s: CUIDADO : Imposible iniciar %s: 
 %s: CUIDADO : El fichero %s es la versión 
 %s: CUIDADO : fork imposible\n
-%s: impossible registrar el color %s\n
-%s: impossible crear %s: 
-%s: impossible la evaluación ~%s en %s, utilización de .\n
-%s: impossible escribir en %s: 
+%s: imposible registrar el color %s\n
+%s: imposible crear %s: 
+%s: imposible la evaluación ~%s en %s, utilización de .\n
+%s: imposible escribir en %s: 
 %s: creación del fichero llave imposible
 %s: apertura del fichero llave imposible
 %s: lectura del fichero llave imposible
@@ -29,10 +29,10 @@
 %s: fracaso en la terminacion del proceso %d propietario del fichero llave %s\n
 %s: Imposible bloquear la base depués de 3 minutos, no obstante se permite el acceso\n
 %s: generación del script "%s"\n
-%s: script sín seguridad ignorado
+%s: script sin seguridad ignorado
 %s: Terminando con la señal %d\n
 %s: Desconexión, me callo...
-%s: Ningun mailer definido\n
+%s: Ningun correo definido\n
 %s: Falta memoria ¿ Como es eso ?
 %s: demonio plan calendar, versión %s.\n
 %s: relectura de la base de datos\n
@@ -48,7 +48,7 @@
 -K\tsolo mata el demonio existente\n
 -L es por defecto. Intenta -l si has iniciado demasiados pland.\n
 -L\tno verifica utmp (utmp tiene errores a menudo)\n
--d\tdebug: en primer plano, mostrara todas las acciones\n
+-d\tdebug: en primer plano, mostrará todas las acciones\n
 -k\tmata el demonio existente y continua\n
 -l es por defecto. Intenta -d o -L si pland ya existia antes.\n
 -l\tvigila utmp y sale cuando el usuario se deconecta\n
@@ -57,8 +57,8 @@
 Formato de tiempo 12h am/pm
 <desconocido>
 ALARMA a %d:%02d%c
-A proposito
-A proposito...
+A propósito
+A propósito...
 Añadir
 Ajustar la hora
 Ajustar la hora...
@@ -74,14 +74,14 @@ Color del texto de la cita:
 Abril
 Agosto
 Auto borrado de las entradas pasadas
-Ventanas redimensionadas automaticamente
-DST automatico en el calendario Juliano
-Ficheros disponibles :
+Ventanas redimensionadas automáticamente
+DST automático en el calendario Juliano
+Ficheros disponibles:
 Ficheros disponibles, seleccionar y añadir:
 Iniciar la vista en
 Recorrer
 Recorrer el servidor
-Parametrado de la vista del calendario
+Ajustar la vista del calendario
 Vistas del calendario...
 Imposible encontrar un fichero/esqueleto Postcript\n "%s"
 Anular
@@ -89,41 +89,41 @@ Imposible cambiar el grupo del propietario
 Imposible cambiar el camino del propietario
 Conexión imposible al \nserveur netplan %s
 Imposible suprimir el fichero del propietario
-Imposible modificar los apuntes de %s porque\nfueron leidos de una base de datos grok. Salvar no esta\nimplementado para bases de datos grok. El fichero es\n%s
+Imposible modificar los apuntes de %s porque\nfueron leídos de una base de datos grok. Salvar no esta\nimplementado para bases de datos grok. El fichero es\n%s
 No puedo modificar apuntes de %s,\nno tengo permiso de escritura para %s\ o bien %s/.dayplan.\n\nRe-verifica los permisos con Fichero->Releer datos.\nNo puede deshabilitar apuntes individuales, pero puede\ndeshabilitar todos con Configuración->Usuario popup lista.
 No puedo modificar apuntes de %s,\nservidor en %s deniega permiso de escritura.\nRe-verifica los permisos con Fichero->Releer datos.\nNo puede deshabilitar apuntes individuales, pero tu\npuedes deshabilitarlos todos con Configuración->Usuario popup lista.
 Imposible desplazarse a ese lugar, abandono.
 Imposible redirigir la apertura hacia ")%s"
 Imposible recortar una entrada que comporta una repetición no diaria
-Borrar
+Limpiar
 Impresión color
 Fondo coloreado para los otros ficheros
-Parametros
+Parámetros
 Confirmar
 Contexto
 Continuar
-Continuar sín demonio
+Continuar sin demonio
 Acceso a base de datos
 Fecha
-Fecha a mostrar :
+Fecha a mostrar:
 Día
 Vista del día
 Ajustes DST son
 Diciembre
 Defecto
-Alertas por defecto :
-Definir festivos...
+Alertas por defecto:
+Definir feriados...
 Borrar
 Borrar los apuntes pasados
-Ignorar
-Mostrar :
+Salir
+Mostrar:
 No mostrar citas en la vista diaria
 No mostrar citas en la vista del mes
 No mostrar citas en la vista de la semana
 No mostrar citas en la vista del año
 No mostrar citas en la vista del año
 No mostrar citas pasadas en la vista del día
-Terminado
+Aceptar
 Duplicar
 ERROR :\n\n
 Pre-alarma:
@@ -156,8 +156,8 @@ La primera semana debe ser completa
 La primera semana debe contener un jueves
 Vie
 Obtener ayuda
-Opciones globales :
-Ir a la fecha
+Opciones globales:
+Ir a la fecha:
 Ir a hoy
 Ir a...
 Ventana verde
@@ -165,7 +165,7 @@ Grupo
 Selección del grupo
 Estimar
 Ayuda
-Festivos
+Feriados
 Introducción
 Enero
 Julio
@@ -175,54 +175,54 @@ Terminar
 Idioma
 Idiomas
 Mes extendido
-Raya larga para los apuntes de semana sín hora
+Raya larga para los apuntes de semana sin hora
 Ultimo
-Ultimo día : no repetir el
+Ultimo día: no repetir el
 Post-Alarma:
 Irrompible
 Rompible
 Camino local
-Conexión perdida con el servidor netplan %s.\n\nVuelve a iniciar la SVO, y elije\n`Fichero->Releer ficheros' para reconectarte.\nPuedes haber perdido tus más recientes modificaciones.
+Conexión perdida con el servidor Netplan %s.\n\nVuelve a iniciar la SVO, y elije\n`Fichero->Releer ficheros' para reconectarte.\nPuedes haber perdido tus más recientes modificaciones.
 Correo:
 Marzo
 Mayo
 Mensaje
 Lun
 Mes
-Opciones de vistas por mes :
-Formato de fecha mes/dia/año
+Opciones de vistas por mes:
+Formato de fecha mes/día/año
 Nombre
 El nombre no es único, rechazado
 Redes
 Siguiente
 Próxima semana
-Sín alarma el
+Sin alarma el
 Ninguno
 Nota
 Noviembre
 Octubre
 Omitir todas las citas
 Omitir las citas de los demás
-Omitir las ditas privadas
+Omitir las citas privadas
 Ayuda contextual
 Un fichero...
-Solo el propietario puede escribir ficheros de citas
-Opciones :
+Sólo el propietario puede escribir ficheros de citas
+Opciones:
 Otro
 Propietario
 Solo propietario
 Solo propietario
 El camino no es único, rechazado
 Fijar
-Ingresar la fecho u hora primero
+Ingresar la fecha u hora primero
 Por Favor, termina de definir la lista de fichero\ny la red, antes de realizar apuntes.
-Prcd.
+Anterior
 Imprimir
 fallo en la impresión, abandono com error %d\nVerifica el comando de impresión.
-Modo de impresión :
+Modo de impresión:
 Imprimir...
 Privado
-Problemas con el fichero festivos %s:\n%.80s linea %d
+Problemas con el fichero feriados %s:\n%.80s linea %d
 Salir
 Ventana roja
 Expresión regular
@@ -232,8 +232,8 @@ Repetir cada a
 Repetir el
 Repetir el
 Releer los ficheros
-Ejecutar los scripts netplan (¡ La seguridad puede estar comprometida !)
-Sab
+Ejecutar los scripts Netplan (¡La seguridad puede estar comprometida!)
+Sáb
 Planificador
 Planificador de reciclado
 Buscar
@@ -253,39 +253,39 @@ Shell Script
 Mostrar las fechas Julianas
 Mostrar las horas de las alarmas adelantadas
 Nombres de ficheros de fichero en la barra de los labeles
-Mostrar las dictas de un solo día
+Mostrar las citas de un solo día
 Mostrar los números de la semana
 Mes reducido
-Otro usuario esta editandoi este apunto. Reintentalo más tarde.
+Otro usuario esta editando este apunte. Reintentar más tarde.
 Lo siento, no existe ayuda
 Lo siento, no existe ayuda,\n%s no ha sido encontrado
 Elegir
-Desligar
-Orden impresión :
+Desconec.
+Orden impresión:
 Iniciar el demonio
 Error de conversion de cadena de caracteres.\n
 Dom
-Sincro
-El primer fichero de la lista\n(%s)\nno debe sr una base de datos grok!\nDe intentar continuar podrias perder datos.
-El servidor netplan reporta un error\ncuando este registro es guardado. Mira\nlos permisos de acceso.\n
-La nueva fecha es posterior a la fecha de disparo,\n %s. La última fecha disparo ha sido deshabilitada.
-El nuevo idioma sera actrivo\ndespués de reiniciar plan.
-La nueva fecha disparo es anterior a la\nfecha disparo, %s. Ignorado.
-El otro programa no ha acabado.\n
+Sincro.
+El primer fichero de la lista\n(%s)\nno debe ser una base de datos grok!\nDe intentar continuar podrias perder datos.
+El servidor netplan reporta un error\ncuando se guarda este registro. Mira\nlos permisos de acceso.\n
+La nueva fecha es posterior a la fecha inicial,\n %s. La última fecha inicial ha sido deshabilitada.
+El nuevo idioma se activara\ndespués de reiniciar Plan.
+La nueva fecha inicial es anterior a la\nfecha inicial, %s. Ignorado.
+El otro programa no ha terminado.\n
 Mes actual
 Semana actual
 Jue
 Hora
 El huso horario es GMT
 Hoy
-Manaña
+Mañana
 Demasiados errores, abandono.\n
 Problemas
 Prueba utilizar la opción -L.\n
 Mar
 Deshacer
 Uso: pland [-dkKlL]\n
-Utzar los números de semana GPS
+Usar los números de semana GPS
 Mostrar las vistas en la ventana principal
 Utilizar el botón derecho para configurar el color
 Fichero usuario %s en máquina %s: imposible conectar\n
@@ -301,7 +301,7 @@ Cuidado: alarma a %d:%02d%c
 CUIDADO: chmod 0600 imposible con la cita\nen la base %s
 CUIDADO: Ficheros de configuración y datos %s no son accesibles en escritura\n
 CUIDADO: tu propio fichero de datos %s no es accesible en escritura\n
-Mie
+Mié
 Semana
 Semana (Composición)
 Semana (Retrato)
@@ -315,8 +315,8 @@ A
 Resumen del año
 Vista del año
 Ventana amarilla
-Aqui tienes %d citas, y\n%d en el servidor %s. Salvado %s\nen %s desechado viejas\citas de %s.
-Tu fichero de citas es de solo lectura seule !
+Aquí tienes %d citas, y\n%d en el servidor %s. Salvado %s\nen %s desechado viejas\citas de %s.
+Tu fichero de citas es de solo lectura!
 YrOv
 Acercar
 aún inactivos
@@ -331,8 +331,8 @@ acceso imposible
 imposible conectar el servidor de identificación de %s\n
 imposible terminat con el demonio %s 
 imposible abrir un socket para la identificación
-dias
-dias:
+días
+días:
 defecto
 fin:
 cada...
@@ -344,7 +344,7 @@ cuarto...
 Respuesta recibida "%s"\n
 incompleto
 Ultimo...
-Dura.:
+Durac.:
 duración %d:%02d, hasta %d:%02d%c
 min:
 faltante
@@ -365,7 +365,7 @@ Fechados de m
 Fechados de más de una semana
 Fechados de más de un año
 opt:
-proprio
+propio
 plan: conectado al servidor %s: %s
 do.
 segundo...
diff --git a/misc/netplan.1 b/misc/netplan.1
index cfc83f6..8ae96f0 100644
--- a/misc/netplan.1
+++ b/misc/netplan.1
@@ -11,9 +11,8 @@ netplan \- IP server for plan(1) appointment lists
 .B netplan
 is an IP server that serves calendar data to
 .BR plan (1)
-programs. It maintains a directory, by default /usr/local/lib/netplan.dir
-or /usr/freeware/lib/netplan.dir (SGI) or /usr/lib/plan/netplan.dir
-(Debian Linux), that contains calendar files and an access list file.
+programs. It maintains the /var/lib/plan/netplan.dir directory, that
+contains calendar files and an access list file.
 .B plan
 users can name files and hosts in their file list dialog, which causes
 .B plan
@@ -50,16 +49,14 @@ clienthost support identd). If a client host that does not support identd
 connects to a
 .B netplan
 server run with -a, it will have no or restricted access. Also, if you
-use -a, you must have a .netplan-acl file or no access is granted to
+use -a, you must have a netplan-acl file or no access is granted to
 anybody; see below.
 
 .SH FILES
 .LP
 All files accessible to
 .B netplan
-are stored in a directory netplan.dir which resides in the directory LIB
-as set in the Makefile, /usr/local/lib or /usr/freeware/lib (SGI) or
-/usr/lib/plan (Debian Linux) by default.
+are stored in the /var/lib/plan/netplan.dir directory.
 .B netplan
 will not access any files that are not in this directory or in subdirectories
 of this directory. It will also refuse to access softlinks and files with
@@ -67,15 +64,15 @@ multiple hard links. This prevents users from linking normally inaccessible
 files to netplan.dir and accessing them through
 .B netplan .
 Finally, files beginning with a dot are rejected to prevent access
-to .netplan-acl and other future configuration files.
+to netplan-acl and other future configuration files.
 
 .LP
-netplan.dir may also contain a file .netplan-acl that controls which user
+/etc/plan/ may also contain a file netplan-acl that controls which user
 can access which file. If the file is missing, no restrictions are imposed
 unless
 .B netplan
 is started with the -a option, in which case no access to any file is
-granted. The syntax for .netplan-acl file is a sequence of rules like this:
+granted. The syntax for netplan-acl file is a sequence of rules like this:
 
 .nf
     name | owner | * : [permit | deny] [read] [write] [delete]
@@ -199,6 +196,14 @@ no challenge-response encryption is used to guarantee secure transactions.
 This may or may not change in future versions. In this version, access
 lists provide only a moderate protection.
 
+.SS DEBIAN NOTE
+.LP
+The location for /etc/plan/netplan-acl is specific to Debian
+GNU/Linux.  For compliance with FSSTND/FHS, it has been moved there
+from its traditional /var/lib/plan/netplan.dir/.netplan-acl location.
+The program still accesses that file via a symlink located at the
+traditional location.
+
 .SS SEE ALSO
 .BR plan (1).
 
diff --git a/misc/netplan.boot b/misc/netplan.boot
index 6f25b1f..8e7de34 100644
--- a/misc/netplan.boot
+++ b/misc/netplan.boot
@@ -4,6 +4,9 @@
 # Michel Bourget Mon Feb 17 10:57:14 EST 1997
 # "$Revision: 1.0 $"
 
+# Debian wants this to support systemctl
+test -f /lib/lsb/init-functions && . /lib/lsb/init-functions
+
 IS_ON=/sbin/chkconfig
 
 if $IS_ON verbose ; then       # For a verbose startup and shutdown
@@ -60,7 +63,15 @@ case "$1" in
 	$ECHO "Netplan: stopped."
 	;;
 
+  'restart')
+	$0 stop
+	$0 start
+	;;
+
+  'force-reload')
+	;;
+
   *)
-	echo "usage: $0 {start|stop}"
+	echo "usage: $0 {start|stop|restart}"
 	;;
 esac
diff --git a/misc/plan.1 b/misc/plan.1
index 71ab3e5..8f5d54d 100644
--- a/misc/plan.1
+++ b/misc/plan.1
@@ -12,12 +12,12 @@ notifier \- X/Motif text displayer for
 [options]
 .br
 .B plan
-[mmdd]hhmm [options] [\fImessage\fR]*
+[[yyyy]mmdd]hhmm [options] [\fImessage\fR]*
 .br
 .B pland
 [-d] -[kK] -[lL]
 .br
-.B notifier
+.B /usr/lib/plan/notifier
 [-hdv123] [-t\fItitle\fR] [-s\fIsubtitle\fR] [-i\fIicontitle\fR] [file]
 
 .SH DESCRIPTION
@@ -65,12 +65,12 @@ Don't fork on startup. This is useful for debugging.
 .IP \-k
 If there appears to be another
 .B plan
-running, start up anyway. This is useful if a /tmp/.plan<uid> file got
+running, start up anyway. This is useful if a ~/.plan.dir/lock.plan file got
 accidentally left behind, and plan fails to check whether the older plan
 still exists. This option is largely obsolete in version 1.2.
 
 .SS OPTIONS OF PLAN, APPEND MODE
-.IP [mmdd]hhmm
+.IP [[yyyy]mmdd]hhmm
 Add an appointment at mm/dd hh:mm (month/day hours:minutes). If mmdd is not
 specified, today's date is used. No menus will start up. No option may be
 specified. Instead of the mmddhhmm notation, a date and time may be specified,
@@ -97,7 +97,7 @@ example, "-D 2 -O 2 -O 4" means the 2nd and 4th Tuesdays of each month.
 -O 6 means the last one.
 .IP \-e\ D
 The new appointment stops repeating on date D. D is a string such as
-'31.12.' or '12/31'.
+\'31.12.' or '12/31'.
 .IP \-w\ N
 Set the early warning time of the new appointment to N minutes.
 .IP \-W\ N
@@ -190,7 +190,8 @@ in. If not, exit. This is the default on SGI, Sun, and other SYSV systems.
 and running pland with the \-d options reports ``logout, exiting'' for no
 apparent reason. On many systems utmp is not reliable, and some programs
 like xterm so not create utmp records unless configured properly. Use \-L
-on such systems.
+on such systems.  This has been made the default for Debian GNU/Linux,
+as it is safer that \-l.
 .IP \-k
 If another daemon exists, kill it and restart.
 .IP \-K
@@ -222,89 +223,71 @@ In addition to these options, plan and notifier support the usual X options
 -iconic and -geometry.
 
 .SH FILES
-.LP
-Below, DIR and LIB refer to the installation directories specified at the
-beginning of the Makefile when the programs were compiled. By defauly,
-they are /usr/local/bin and /usr/local/lib, or /usr/freeware/bin and
-/usr/freeware/lib on SGI, or /usr/bin, /usr/sbin, and /usr/lib/plan on
-Debian Linux, respectively. These are the directories where
-.BR plan
-and
-.BR pland
-first search for executables and plan.help (LIB first, then DIR). Next,
-$PLAN_PATH and $PATH are searched, and finally, a built-in search path that
-also contains "." as its last item.
-.IP ~/.dayplan
+In Debian, all user files are located in the
+.I ~/.plan.dir/
+directory, and slightly renamed.
+.IP ~/.plan.dir/dayplan
 Database with all public entries and configuration options of
 .BR plan .
 See plan(4) for details.
-.IP ~/.dayplan.priv
+.IP ~/.plan.dir/dayplan.priv
 Database with all private entries.
-.IP ~/.holiday
+.IP ~/.plan.dir/holiday
 Definition of holidays. See the help text for the "Define Holiday" popup
 menu that can be installed with the Holiday pulldown.
-.IP /tmp/.planUID
+.IP ~/.plan.dir/lock.plan
 Lockfile that contains the PID of
 .BR plan .
 Used to prevent multiple
 .B plan
 instances, and to send HUP signals to if a non-interactive
 .B plan
-invocation changed the database. UID is the user's numerical user ID.
-.IP /tmp/.plandUID
+invocation changed the database.
+.IP ~/.plan.dir/lock.pland
 Lockfile that contains the PID of the
 .B pland
 daemon. Used to prevent multiple daemons, and to send HUP signals to if
-the database changed for any reason. UID is the user's numerical user ID.
-.IP DIR/plan
+the database changed for any reason.
+.IP /usr/bin/plan
 .br
 The
 .B plan
 program.
-.IP LIB/pland
+.IP /usr/bin/pland
 The
 .B pland
-daemon. It must be in the DIR or LIB directory, or in one of the directories
-in one of the search paths.
-.IP LIB/notifier
+daemon.
+.IP /usr/lib/plan/notifier
 The
 .B notifier
-program. It must be in the DIR or LIB directory, or in one of the directories
-in one of the search paths.
-.IP LIB/plan.help
+program.
+.IP /usr/share/plan/plan.help
 The online help texts used by
 .BR plan .
-It must be in the DIR or LIB directory, or in one of the directories
-in one of the search paths.
-.IP LIB/plan.help.X
+.IP /usr/lib/plan/plan.help.X
 This help file replaces plan.help if the language is set to X in the Config
 Languages pulldown menu.
-.IP LIB/holiday
+.IP /etc/plan/holiday
 Definition of system standard holidays. They are read before ~/.holiday,
 and can be overridden in ~/.holiday. They must be edited manually with a
-text editor.
-.IP LIB/plan_cal.ps
+text editor.  This files used to live in /usr/lib/plan/.
+.IP /usr/lib/plan/plan_cal.ps
 A PostScript skeleton file required for month and year calendar printouts.
-.IP LIB/plan.lang.english
+.IP /usr/lib/plan/plan.lang.english
 The standard message file. All messages used in
 .B plan
 must be listed here in ASCII order. If this file is missing, only English
 messages are supported.
-.IP LIB/plan.lang.X
+.IP /usr/lib/plan/plan.lang.X
 The message file for language X. At startup,
 .B plan
-scans the LIB directory and puts every file X it finds into the Config
+scans the /usr/lib/plan directory and puts every file X it finds into the Config
 Language pulldown menu. A message is translated by first looking it up in the
 plan_cal_english file. If the message is found in line n, it is translated
 by using line n of plan.lang.X instead if X was selected with the Language
 pulldown. See the Languages item in the online help menu for instructions
 for creating new language files.
 .LP
-Note that previous versions put all executables into the DIR directory.
-Beginning with 1.4.7, all executables except
-.B plan
-are in LIB. To avoid finding obsolete executables first, LIB is searched
-befor DIR.
 Note that, though
 .BR netplan (8)
 supports primitive access control (which requires editing a access
@@ -328,3 +311,9 @@ with the line "subscribe plan" (without the quotes) in the message body (not
 the subject).
 .LP
 See http://www.bitrot.de/plan.html for new releases.
+
+.SS DEBIAN NOTE
+.LP
+Please note that the Debian GNU/Linux package does not install all
+executables in the locations where the upstream author places them.
+The locations documented in this manpage are the Debian ones.
diff --git a/misc/plan.1.orig b/misc/plan.1.orig
deleted file mode 100644
index f00cb42..0000000
--- a/misc/plan.1.orig
+++ /dev/null
@@ -1,326 +0,0 @@
-.TH PLAN 1
-.SH NAME
-plan \- interactive X/Motif calendar and day planner
-.br
-pland \- daemon for
-.I plan
-.br
-notifier \- X/Motif text displayer for
-
-.SH SYNOPSIS
-.B plan
-[options]
-.br
-.B plan
-[mmdd]hhmm [options] [\fImessage\fR]*
-.br
-.B pland
-[-d] -[kK] -[lL]
-.br
-.B notifier
-[-hdv123] [-t\fItitle\fR] [-s\fIsubtitle\fR] [-i\fIicontitle\fR] [file]
-
-.SH DESCRIPTION
-.B plan
-is a schedule planner based on X/Motif. It displays a month calendar
-similar to xcal, but every day box is large enough to show appointments
-in small print. By pressing on a day box, the appointments for that day
-can be listed and edited. This manual page describes the command line
-options of
-.BR plan .
-For information on how to use
-.BR plan ,
-refer to the on-line help pages.
-.LP
-.B plan
-has three modes: GUI, which starts up with a window in interactive mode,
-append, which adds an appointment from the command line without windows,
-and batch, which prints miscellaneous information without windows. Batch
-mode is mainly useful for external scripts (CGI and otherwise) that process
-appointment data.
-.LP
-.B pland
-is a daemon that watches for appointment triggers. The daemon is normally
-started from your .sgisession or .xsession file. It puts itself in the
-background. If
-.B plan
-is started, it checks for the existence of the daemon, and offers to start
-one if it can't find it.
-.LP
-.B notifier
-displays the standard input in a window, with appropriate titles and
-background colors. The only program that ever uses it is the daemon; it
-is a separate program only to keep the daemon small.
-
-.SS OPTIONS OF PLAN, GUI MODE
-.IP \-s
-Standalone, don't offer to start daemon if none exists. Without daemon, no
-appointment alarms and warnings will trigger. If a daemon happens to exist,
-it is notified when the database changes, but no warning is printed if it
-doesn't.
-.IP \-S
-When plan starts up, silently start the daemon if it does not exist.
-.IP \-f
-Don't fork on startup. This is useful for debugging.
-.IP \-k
-If there appears to be another
-.B plan
-running, start up anyway. This is useful if a /tmp/.plan<uid> file got
-accidentally left behind, and plan fails to check whether the older plan
-still exists. This option is largely obsolete in version 1.2.
-
-.SS OPTIONS OF PLAN, APPEND MODE
-.IP [mmdd]hhmm
-Add an appointment at mm/dd hh:mm (month/day hours:minutes). If mmdd is not
-specified, today's date is used. No menus will start up. No option may be
-specified. Instead of the mmddhhmm notation, a date and time may be specified,
-such as '24.12. 12:34'.
-.IP \-u\ U
-add appointment to user file U instead of your own appointment file.
-.IP \-l\ T
-Set the length of the new appointment to N, in the form hours:minutes.
-.IP \-n\ T
-Set new appointment will have no time associated with it. This overrides
-the time set with the [mmdd]hhmm option, which must be specified anyway.
-.IP \-r\ N
-The new appointment repeats every N days. N is an integer greater than zero.
-.IP \-d\ N
-The new appointment repeats on day N of the month. N is an integer between
-1 and 31. There can be multiple -d options.
-.IP \-D\ N
-The new appointment repeats on weekday N. N=0 indicates Monday, 1 is Tuesday,
-2 is Wednesday, 3 is Thursday, 4 is Friday, 5 is Saturday, and 6 is Sunday.
-There can be multiple -D options.
-.IP \-e\ D
-The new appointment stops repeating on date D. D is a string such as
-'31.12.' or '12/31'.
-.IP \-w\ N
-Set the early warning time of the new appointment to N minutes.
-.IP \-W\ N
-Set the late warning time of the new appointment to N minutes.
-.IP [message]*
-The note message associated with the new appointment. It should be quoted
-if it contains shell metacharacters.
-
-.SS OPTIONS OF PLAN, BATCH MODE
-.IP \-h
-List available options.
-.IP \-d
-Print fallback X resources and exit. The output can be appended directly
-to the ~/.Xdefaults file for modification of the geometry, color, and font
-defaults.
-.IP \-v
-Print the program version and patchlevel and exit.
-.IP \-W\ [S]
-Indicates that
-.B plan
-is not called by a user but by the web front-end. In this case, there
-are no ``own'' appointments because the CGI script that executes
-.B plan
-is probably run by the pseudo-user ``nobody'' or ``httpd''. A dummy user
-``webplan'' is substituted instead, whose home directory is assumed to
-be /tmp. All database files from netplan server S will be read. If S is
-omitted, ``localhost'' is assumed. This mode is possible only if there
-is a netplan server running on S (or localhost). This option is also
-available with -t mode and in non-interactive mode; in this case it
-determines which files can be listed with -o -t, and which files can be
-edited.
-.IP \-F
-Print a list of all appointment files found on a given netplan server.
-By default the server on the local host is queried, unless a -W option
-specifies another server host.
-.IP \-H\ Y
-Print all holidays in the year Y (1970..2037) to stdout and exit. This
-is used by the web front-end.
-.IP \-o
-If used with -t or -T, also prints appointments of all users configured
-with the Config->Users popup.
-.IP \-u\ L
-If used with -t or -T, prints appointments of all users named in the
-comma-separated list L. The -o and -u options are mutually exclusive.
-.IP \-t\ [D\ [n]]
-Print a list of today's appointments to stdout. Don't start up interactive
-windows. The exit status is 0 if there are appointments on the specified
-date, and 1 otherwise. If a date D is specified, print appointments on that
-date. All standard date specifiers work:
-.RS
-.IP -t\ +3 13
-Print appointments in three days
-.IP -t\ -1 13
-Print yesterday's appointments
-.IP -t\ tomorrow 13
-Print appointments for tomorrow
-.IP -t\ thursday 13
-Print appointments for Thursday
-.IP -t\ 25.12. 13
-Print appointments for Christmas, if 24-hour mode is selected
-.IP -t\ 12/25 13
-Print appointments for Christmas, if 12-hour mode is selected.
-12/24 hour mode is selected with the Config pulldown in the main window.
-.LP
-If a second argument n is given, n days are printed beginning with day D.
-The default is 1. For example, "plan -t today 7" prints one week.
-.RE
-.IP \-T\ [D\ [n]]
-Same as -t, but print the end time instead of the length (hi Vera).
-.IP \-i
-If used with the -t or -T options, print the data in a form that is easy
-to parse for other programs. This is used by the web front-end.
-.IP \-W\ [S]
-switch to web front-end mode and read the files from the netplan server
-on host S, or localhost if S is omitted. These files can then be chosen
-from with -u. See above for details.
-
-.SS OPTIONS OF PLAND
-.IP \-d
-Debug mode. Runs pland in the foreground without forking, and prints
-debugging information. Recommended if pland seems to die unexpectedly.
-(The most common cause of disappearing pland's is a nonfunctional utmp;
-if -d is used pland recommends to recompile with the -DRABBITS option.)
-This option must precede the other options.
-.IP \-l
-Periodically check the system utmp to see if the user is still logged
-in. If not, exit. This is the default on SGI, Sun, and other SYSV systems.
-.IP \-L
-(capital L) Do not check utmp. Use this option if pland dies frequently,
-and running pland with the \-d options reports ``logout, exiting'' for no
-apparent reason. On many systems utmp is not reliable, and some programs
-like xterm so not create utmp records unless configured properly. Use \-L
-on such systems.
-.IP \-k
-If another daemon exists, kill it and restart.
-.IP \-K
-(capital K) If another daemon exists, kill it and exit.
-
-.SS OPTIONS OF NOTIFIER
-.IP \-h
-List available options.
-.IP \-d
-Print fallback X resources and exit. The output can be appended directly
-to the ~/.Xdefaults file for modification of the geometry, color, and font
-defaults.
-.IP \-v
-Print the program version and patchlevel and exit.
-.IP \-1
-Set the window background color to green (early warning).
-.IP \-2
-Set the window background color to yellow (late warning).
-.IP \-3
-Set the window background color to red (alarm). This is the default.
-.IP \-t\fItitle\fR
-Set the title string above the message text (which is read from stdin).
-.IP \-s\fIsubtitle\fR
-Set the subtitle string below the main title, in a small font.
-.IP \-i\fIicontitle\fR
-Set the icon title string that is printed below the mwm/4Dwm icon.
-.LP
-In addition to these options, plan and notifier support the usual X options
--iconic and -geometry.
-
-.SH FILES
-.LP
-Below, DIR and LIB refer to the installation directories specified at the
-beginning of the Makefile when the programs were compiled. By defauly,
-they are /usr/local/bin and /usr/local/lib, or /usr/freeware/bin and
-/usr/freeware/lib on SGI, or /usr/bin, /usr/sbin, and /usr/lib/plan on
-Debian Linux, respectively. These are the directories where
-.BR plan
-and
-.BR pland
-first search for executables and plan.help (LIB first, then DIR). Next,
-$PLAN_PATH and $PATH are searched, and finally, a built-in search path that
-also contains "." as its last item.
-.IP ~/.dayplan
-Database with all public entries and configuration options of
-.BR plan .
-See plan(4) for details.
-.IP ~/.dayplan.priv
-Database with all private entries.
-.IP ~/.holiday
-Definition of holidays. See the help text for the "Define Holiday" popup
-menu that can be installed with the Holiday pulldown.
-.IP /tmp/.planUID
-Lockfile that contains the PID of
-.BR plan .
-Used to prevent multiple
-.B plan
-instances, and to send HUP signals to if a non-interactive
-.B plan
-invocation changed the database. UID is the user's numerical user ID.
-.IP /tmp/.plandUID
-Lockfile that contains the PID of the
-.B pland
-daemon. Used to prevent multiple daemons, and to send HUP signals to if
-the database changed for any reason. UID is the user's numerical user ID.
-.IP DIR/plan
-.br
-The
-.B plan
-program.
-.IP LIB/pland
-The
-.B pland
-daemon. It must be in the DIR or LIB directory, or in one of the directories
-in one of the search paths.
-.IP LIB/notifier
-The
-.B notifier
-program. It must be in the DIR or LIB directory, or in one of the directories
-in one of the search paths.
-.IP LIB/plan.help
-The online help texts used by
-.BR plan .
-It must be in the DIR or LIB directory, or in one of the directories
-in one of the search paths.
-.IP LIB/plan.help.X
-This help file replaces plan.help if the language is set to X in the Config
-Languages pulldown menu.
-.IP LIB/holiday
-Definition of system standard holidays. They are read before ~/.holiday,
-and can be overridden in ~/.holiday. They must be edited manually with a
-text editor.
-.IP LIB/plan_cal.ps
-A PostScript skeleton file required for month and year calendar printouts.
-.IP LIB/plan.lang.english
-The standard message file. All messages used in
-.B plan
-must be listed here in ASCII order. If this file is missing, only English
-messages are supported.
-.IP LIB/plan.lang.X
-The message file for language X. At startup,
-.B plan
-scans the LIB directory and puts every file X it finds into the Config
-Language pulldown menu. A message is translated by first looking it up in the
-plan_cal_english file. If the message is found in line n, it is translated
-by using line n of plan.lang.X instead if X was selected with the Language
-pulldown. See the Languages item in the online help menu for instructions
-for creating new language files.
-.LP
-Note that previous versions put all executables into the DIR directory.
-Beginning with 1.4.7, all executables except
-.B plan
-are in LIB. To avoid finding obsolete executables first, LIB is searched
-befor DIR.
-Note that, though
-.BR netplan (8)
-supports primitive access control (which requires editing a access
-list text file on the server host), no support for access control is
-provided by the
-.BR plan
-front-end in this version. Refer to
-.BR netplan (8)
-for details.
-
-.SS SEE ALSO
-plan(4), netplan(8)
-
-.SS AUTHOR
-Thomas Driemeyer <[e-mail]>
-.LP
-Please send all complaints, comments, bug fixes, and porting experiences to
-me. Always include your plan version as reported by "plan -v" in your mail.
-To be added to the mailing list, send mail to [e-mail]
-with the line "subscribe plan" (without the quotes) in the message body (not
-the subject).
-.LP
-See http://www.bitrot.de/plan.html for new releases.
diff --git a/misc/plan.1cat b/misc/plan.1cat
index 89a3fda..817dea2 100644
--- a/misc/plan.1cat
+++ b/misc/plan.1cat
@@ -10,7 +10,7 @@ NNAAMMEE
 
 SSYYNNOOPPSSIISS
        ppllaann [options]
-       ppllaann [mmdd]hhmm [options] [_m_e_s_s_a_g_e]*
+       ppllaann [[yyyy]mmdd]hhmm [options] [_m_e_s_s_a_g_e]*
        ppllaanndd [-d] -[kK] -[lL]
        nnoottiiffiieerr  [-hdv123]  [-t_t_i_t_l_e]  [-s_s_u_b_t_i_t_l_e] [-i_i_c_o_n_t_i_t_l_e]
        [file]
@@ -65,7 +65,7 @@ DDEESSCCRRIIPPTTIIOONN
 
 
    OOPPTTIIOONNSS OOFF PPLLAANN,, AAPPPPEENNDD MMOODDEE
-       [mmdd]hhmm
+       [[yyyy]mmdd]hhmm
               Add  an  appointment  at  mm/dd  hh:mm   (month/day
               hours:minutes).  If  mmdd is not specified, today's
               date is used. No menus will start up. No option may
diff --git a/misc/plan.4 b/misc/plan.4
index e7c2b56..cf8b1b8 100644
--- a/misc/plan.4
+++ b/misc/plan.4
@@ -24,7 +24,7 @@ HEADER TYPES:
 .IP o
 Options. The argument consists of 14 consecutive flag characters,
 and five numerical arguments.
-'-' means an option is off, everything else means the option is on.
+\'-' means an option is off, everything else means the option is on.
 In order, the flags are:
 .RS
 .IP s
@@ -116,7 +116,7 @@ flag is on.
 .IP y
 Year overview options. There are 10 consecutive flag characters
 and three numerical arguments.
-'-' means an option is off, everything else means the option is on.
+\'-' means an option is off, everything else means the option is on.
 Only one flag is currently defined:
 .RS
 .IP s
diff --git a/src/Makefile b/src/Makefile
index 442e534..74690b7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -143,8 +143,13 @@ FBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\
 	  -DSTDLIBMALLOC
 OBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
 	  -DNO_MOTIF -DSTDLIBMALLOC
-LINUX_C	= -W -Wall -m32 -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux
-LINUX64_C = -W -Wall -m64 -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux
+LINUX_C	= -W -Wall -m32 -I/usr/X11R6/include -I/usr/include/X11 \
+	  -DNOLOCK -DLINUX -Dlinux
+LINUX64_C = -W -Wall -m64 -I/usr/X11R6/include -I/usr/include/X11 \
+	  -DNOLOCK -DLINUX -Dlinux
+DEBIAN_C = -W -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes \
+	  -Wstrict-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -m32 \
+	  -I/usr/X11R6/include -DNOLOCK -DLINUX -Dlinux -DRABBITS
 SVR4_C	= -DSVR4 -DSYSV -DOLDTZ -DUSERAND -DPID_T=long -DNOMSEP
 NEWS_C	= -DNEWSOS4 -DNOMSEP -DSUN -DBSD -DRABBITS -DNGROUPS_MAX=16\
 	  -DPID_T="int" -Dconst=""
@@ -227,6 +232,8 @@ OBSD_L1	= -L/usr/local/lib -lXm -L/usr/X11R6/lib -lXt -lX11
 OBSD_L2	= -lc
 LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lXm -lXt -lX11 -lXpm -lc -lXext -lICE -lX11
 LINUX_L2= -lc
+DEBIAN_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lXm -lXt -lX11 -lXpm -lc -lXext -lICE -lX11
+DEBIAN_L2= -lc
 SLINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM /usr/X11R6/lib/libXm.a -lXt -lX11 /usr/X11R6/lib/libXpm.a -lc -lXext -lSM -lICE -lX11
 SLINUX_L2= -lc
 SVR4_L1	= -lXm -lXt -lX11 -lgen -lsocket -lnsl
@@ -428,6 +435,9 @@ linux:
 linux64:
 	env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all
 
+debian:
+	env CF="$(DEBIAN_C)" L1F="$(DEBIAN_L1)" L2F="$(DEBIAN_L2)" MYCC=gcc make all
+
 slinux:
 	env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=gcc make all
 
@@ -583,7 +593,7 @@ install:
 	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0
 	mkdir -p $(DESTDIR)$(HELP)
 	cp ../language/plan.help $(DESTDIR)$(HELP)
-	-strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
+#	-strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
 	-chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan
 	-chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.*
 	-(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0
@@ -621,7 +631,7 @@ LDIR	= /usr/X11R6/lib
 BINDIR	= plan-$(VERSION)
 gMYCC	= gcc
 gCF	= -m32 -I/usr/X11R6/include -D_POSIX_SOURCE -DNOLOCK -DLINUX -Dlinux
-gL1F	= -L$(LDIR) $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lICE -lXp -lX11
+gL1F	= -L$(LDIR) $(LDIR)/libXm.a -lXt -lX11 $(LDIR)/libXpm.a -lc -lXext -lICE -lX11
 gL2F	= -lc
 
 linuxtar: $(P_OBJ) $(D_OBJ) $(N_OBJ) $(S_OBJ) $(MAKEFILE) README.linuxbin
@@ -646,4 +656,4 @@ tar:
 	mv Makefile.save Makefile
 
 rpm: tar
-	cd ..; rpmbuild -vv -ba plan-1.10-20070416.spec
+	cd ..; rpmbuild -vv -ba plan-1.10.1-20070703.spec
diff --git a/src/calmenu.c b/src/calmenu.c
index 262479f..944a319 100644
--- a/src/calmenu.c
+++ b/src/calmenu.c
@@ -64,7 +64,7 @@ Widget			mainview;	/* area in main window below menubar */
 #define XM_VA_SEPARATOR XmVaSEPARATOR,
 #endif
 
-#define MAXLANGUAGES 20
+#define MAXLANGUAGES 30
 static char *language_name[MAXLANGUAGES];
 
 
@@ -220,30 +220,43 @@ void create_cal_widgets(
 	s[ 5] = XmStringCreateSimple(_("Year Overview"));
 	s[ 6] = XmStringCreateSimple(_("Goto today"));
 	s[ 7] = XmStringCreateSimple(_("Goto..."));
-	s[ 8] = XmStringCreateSimple("Ctrl-D");
-	s[ 9] = XmStringCreateSimple("Ctrl-W");
-	s[10] = XmStringCreateSimple("Ctrl-N");
-	s[11] = XmStringCreateSimple("Ctrl-M");
-	s[12] = XmStringCreateSimple("Ctrl-Y");
-	s[13] = XmStringCreateSimple("Ctrl-O");
-	s[14] = XmStringCreateSimple("Ctrl-T");
-	s[15] = XmStringCreateSimple("Ctrl-G");
+	s[ 8] = XmStringCreateSimple("Goto January");
+	s[ 9] = XmStringCreateSimple("Goto December");
+	s[10] = XmStringCreateSimple("Goto previous month");
+	s[11] = XmStringCreateSimple("Goto next month");
+	s[12] = XmStringCreateSimple("Ctrl-D");
+	s[13] = XmStringCreateSimple("Ctrl-W");
+	s[14] = XmStringCreateSimple("Ctrl-N");
+	s[15] = XmStringCreateSimple("Ctrl-M");
+	s[16] = XmStringCreateSimple("Ctrl-Y");
+	s[17] = XmStringCreateSimple("Ctrl-O");
+	s[18] = XmStringCreateSimple("Ctrl-T");
+	s[19] = XmStringCreateSimple("Ctrl-G");
+	s[20] = XmStringCreateSimple("Pos1");
+	s[21] = XmStringCreateSimple("End");
+	s[22] = XmStringCreateSimple("Prior");
+	s[23] = XmStringCreateSimple("Next");
+
 	menu = XmVaCreateSimplePulldownMenu(menubar, "view", 3,
 			(XtCallbackProc)view_callback,
 			FIX_MENUBAR
-			XmVaPUSHBUTTON, s[0], 'D', "Ctrl<Key>D", s[8],
-			XmVaPUSHBUTTON, s[1], 'W', "Ctrl<Key>W", s[9],
-			XmVaPUSHBUTTON, s[2], 'S', "Ctrl<Key>N", s[10],
-			XmVaPUSHBUTTON, s[3], 'M', "Ctrl<Key>M", s[11],
-			XmVaPUSHBUTTON, s[4], 'Y', "Ctrl<Key>Y", s[12],
-			XmVaPUSHBUTTON, s[5], 'O', "Ctrl<Key>O", s[13],
+			XmVaPUSHBUTTON, s[0],  'D', "Ctrl<Key>D", s[12],
+			XmVaPUSHBUTTON, s[1],  'W', "Ctrl<Key>W", s[13],
+			XmVaPUSHBUTTON, s[2],  'S', "Ctrl<Key>N", s[14],
+			XmVaPUSHBUTTON, s[3],  'M', "Ctrl<Key>M", s[15],
+			XmVaPUSHBUTTON, s[4],  'Y', "Ctrl<Key>Y", s[16],
+			XmVaPUSHBUTTON, s[5],  'O', "Ctrl<Key>O", s[17],
 			XM_VA_SEPARATOR
-			XmVaPUSHBUTTON, s[6], 't', "Ctrl<Key>T", s[14],
-			XmVaPUSHBUTTON, s[7], 'G', "Ctrl<Key>G", s[15],
+			XmVaPUSHBUTTON, s[6],  't', "Ctrl<Key>T", s[18],
+			XmVaPUSHBUTTON, s[7],  'G', "Ctrl<Key>G", s[19],
+			XmVaPUSHBUTTON, s[8],  'j', "<Key>Home",  s[20],
+			XmVaPUSHBUTTON, s[9],  'd', "<Key>End",   s[21],
+			XmVaPUSHBUTTON, s[10], 'p', "<Key>Prior", s[22],
+			XmVaPUSHBUTTON, s[11], 'n', "<Key>Next",  s[23],
 			NULL);
 	XtAddCallback(menu, XmNhelpCallback, (XtCallbackProc)help_callback,
 			(XtPointer)"pd_view");
-	for (n=0; n < 16; n++)
+	for (n=0; n < 24; n++)
 		XmStringFree(s[n]);
 
 	s[0] = XmStringCreateSimple(_("On context"));
@@ -695,7 +708,8 @@ static void search_callback(
 		break;
 
 	  case 7:						/* One file */
-		create_user_sel_popup(menubar, -1, (BOOL (*)())list_by_user);
+		create_user_sel_popup(menubar, -1,
+					(BOOL (*)(int))list_by_user);
 		break;
 
 	  case 8:						/* Search */
@@ -760,6 +774,38 @@ static void view_callback(
 	  case 7:						/* goto */
 		create_goto_popup();
 		break;
+
+	  case 8:						/* January */
+		curr_month = 0;
+		draw_month_year();
+		redraw_all_views();
+		break;
+
+	  case 9:						/* December */
+		curr_month = 11;
+		draw_month_year();
+		redraw_all_views();
+		break;
+
+	  case 10:				        	/* prev month*/
+		if (curr_month == 0) {
+		    curr_month = 11;
+		    curr_year--;
+		} else
+		    curr_month--;
+		draw_month_year();
+		redraw_all_views();
+		break;
+
+	  case 11:					        /* next month*/
+		if (curr_month == 11) {
+		    curr_month = 0;
+		    curr_year++;
+		} else
+		    curr_month++;
+		draw_month_year();
+		redraw_all_views();
+		break;
 	}
 }
 
diff --git a/src/configure b/src/configure
index 0c55ba1..3ffe2be 100755
--- a/src/configure
+++ b/src/configure
@@ -107,18 +107,18 @@ case ${in:-1} in
 	MAN=/usr/share/man/man
 	CATMAN=NONE
 	PLANHOME=.plan.dir
-	PLANLOCK=
-	PLANDLOCK=
+	PLANLOCK="~/.plan.dir/lock.plan"
+	PLANDLOCK="~/.plan.dir/lock.pland"
 	INCDIR=
 	LEX=lex
 	YACC=yacc
-	NOB_UID=65534
-	NOB_GID=65534
+	NOB_UID=63434
+	NOB_GID=63434
 	CPP_PATH='/usr/bin/cpp -P -I$(HELP)'
 	DOFORK=FALSE
 	JAPAN=
 	DEBUG="-O2"
-	DEFTARGET=linux
+	DEFTARGET=debian
 	HOLIDAY=NONE
 	;;
   5)	DIR=/usr/X11R6/bin		# SuSE Linux
@@ -134,8 +134,8 @@ case ${in:-1} in
 	INCDIR=
 	LEX=lex
 	YACC=yacc
-	NOB_UID=65534
-	NOB_GID=65534
+	NOB_UID=63434
+	NOB_GID=63434
 	CPP_PATH='/usr/bin/cpp -P -I$(HELP)'
 	DOFORK=FALSE
 	JAPAN=
diff --git a/src/daemon.c b/src/daemon.c
index 5f48d3f..4420bba 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -114,7 +114,7 @@ static time_t		last_alarm;	/* Last time alarm was checked for */
 int			curr_year;	/* dummy for DST calculating routines*/
 Widget			mainwindow;	/* dummy for error popup in network.c*/
 					/* dummy functions, never used: */
-int	  write_one_entry    (UNUSED int (*a)(), UNUSED struct entry *e)
+int	  write_one_entry    (UNUSED int (*a)(char *), UNUSED struct entry *e)
 							{return(0);}
 XtInputId register_X_input   (UNUSED int a)		{return(0);}
 void	  unregister_X_input (UNUSED XtInputId a)	{}
@@ -1131,7 +1131,7 @@ void update_last_alarm(void)
 		fclose(fp);
 	} else
 		if (debug)
-			printf(_("unable to update last alarm\n"));
+			printf("%s", _("unable to update last alarm\n"));
 }
 
 
@@ -1156,7 +1156,7 @@ time_t read_last_alarm(void)
 	} else {
 		result = ANCIENT;
 		if (debug)
-			printf(_("last alarm not present\n"));
+			printf("%s", _("last alarm not present\n"));
 	}
 	return(result);
 }
@@ -1170,16 +1170,16 @@ static void usage(void)
 {
 	fprintf(stderr, _("%s: plan calendar daemon, version %s.\n"),
 					progname, VERSION JAPANVERSION);
-	fprintf(stderr, _("Usage: pland [-dkKtslL]\n"));
-	fprintf(stderr, _("-d\tdebug: stay in foreground, print actions\n"));
-	fprintf(stderr, _("-k\tkill existing daemon, then continue\n"));
-	fprintf(stderr, _("-K\tkill existing daemon only\n"));
-	fprintf(stderr, _("-t\tdon't pop up notifier windows, print to stdout\n"));
-	fprintf(stderr, _("-s\twatch utmp and sleep while user is logged out\n"));
-	fprintf(stderr, _("-l\twatch utmp and exit when user logs out\n"));
-	fprintf(stderr, _("-L\tdon't watch utmp (utmp is often buggy)\n"));
-	fprintf(stderr, _("-p\treport missed alarms when starting.\n"));
-	fprintf(stderr,
+	fprintf(stderr, "%s", _("Usage: pland [-dkKtslL]\n"));
+	fprintf(stderr, "%s", _("-d\tdebug: stay in foreground, print actions\n"));
+	fprintf(stderr, "%s", _("-k\tkill existing daemon, then continue\n"));
+	fprintf(stderr, "%s", _("-K\tkill existing daemon only\n"));
+	fprintf(stderr, "%s", _("-t\tdon't pop up notifier windows, print to stdout\n"));
+	fprintf(stderr, "%s", _("-s\twatch utmp and sleep while user is logged out\n"));
+	fprintf(stderr, "%s", _("-l\twatch utmp and exit when user logs out\n"));
+	fprintf(stderr, "%s", _("-L\tdon't watch utmp (utmp is often buggy)\n"));
+	fprintf(stderr, "%s", _("-p\treport missed alarms when starting.\n"));
+	fprintf(stderr, "%s",
 #	ifdef RABBITS
 		_("-L is the default. Try -l if you get too many pland's.\n"));
 #	else
diff --git a/src/daymenu.c b/src/daymenu.c
index d343bd4..4e98683 100644
--- a/src/daymenu.c
+++ b/src/daymenu.c
@@ -29,7 +29,6 @@
 #include <Xm/Protocols.h>
 #include "cal.h"
 
-extern MOUSE locate_in_day_calendar();
 static void prev_callback(Widget, int, XmToggleButtonCallbackStruct *);
 static void next_callback(Widget, int, XmToggleButtonCallbackStruct *);
 static void done_callback(Widget, int, XmToggleButtonCallbackStruct *);
diff --git a/src/edit.c b/src/edit.c
index 8eeda71..06ca761 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -162,7 +162,7 @@ void got_entry_press(
 
 	  case SC_USER:
 		create_user_sel_popup(lw->entry[y][x], name_to_user(ep->user),
-						(BOOL (*)())got_new_user);
+						(BOOL (*)(int))got_new_user);
 		break;
 
 	  case SC_TIME:
diff --git a/src/file_r.c b/src/file_r.c
index e7523c7..7bd71ed 100644
--- a/src/file_r.c
+++ b/src/file_r.c
@@ -247,7 +247,7 @@ static int readfile(
 			create_error_popup(0, 0,
 			     _("%s is a\ngrok database, not supported"), path);
 #else
-			extern FORM *form_create();
+			extern FORM *form_create(void);
 			struct user *up = &user[u];
 			if (!u)
 				create_error_popup(0, 0, _("The first file in the file list\n(%s)\nmust not be a grok database!\nTrying to continue, you may lose data."), path);
@@ -596,7 +596,7 @@ void parse_file_line(
 				tm.tm_year -= 1900;
 			ep->except[n] = tm_to_time(&tm);
 		} else
-			fprintf(stderr,
+			fprintf(stderr, "%s",
 				_("too many exception dates for appt"));
 		break;
 
diff --git a/src/file_w.c b/src/file_w.c
index 9b3b9e8..b33f996 100644
--- a/src/file_w.c
+++ b/src/file_w.c
@@ -135,7 +135,7 @@ void write_mainlist(void)
  */
 
 static FILE *curr_fp;
-static int write_to_file(line) char *line;
+static int write_to_file(char *line)
 	{ errno = 0; fprintf(curr_fp, "%s", line);
 	  return(errno && errno != ENOTTY); }
 
diff --git a/src/g_dbfile.c b/src/g_dbfile.c
index 75d6ebc..da6a837 100644
--- a/src/g_dbfile.c
+++ b/src/g_dbfile.c
@@ -271,7 +271,8 @@ static int compare_name(
 	MYCONST void	*u,
 	MYCONST void	*v)
 {
-	return(strcmp(*(char **)u, *(char **)v));
+	return(strcmp(*(MYCONST char * MYCONST *)u,
+		      *(MYCONST char * MYCONST *)v));
 }
 
 static BOOL read_dir_or_file(
diff --git a/src/g_formop.c b/src/g_formop.c
index 175aa7a..67038c0 100644
--- a/src/g_formop.c
+++ b/src/g_formop.c
@@ -39,7 +39,9 @@
 #define YSNAP(y)	((y)-(y)%form->yg)
 
 #ifndef GROK
+void clone_chart_component(UNUSED CHART *to, UNUSED CHART *from);
 void clone_chart_component(UNUSED CHART *to, UNUSED CHART *from) {}
+void del_chart_component(UNUSED ITEM *item);
 void del_chart_component(UNUSED ITEM *item) {}
 extern ITEM *item_clone(ITEM *);
 extern void item_delete(FORM *, int);
diff --git a/src/holiday.c b/src/holiday.c
index d6088c2..583630c 100644
--- a/src/holiday.c
+++ b/src/holiday.c
@@ -76,6 +76,7 @@ extern short	monthlen[12];
 extern short	monthbegin[12];
 
 
+int yyerror(char *msg);
 int yyerror(char *msg)
 {
 	fprintf(stderr, _("%s: %s in line %d of %s\n"), progname,
diff --git a/src/main.c b/src/main.c
index 12bb060..d5128c1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,6 +29,7 @@
 #include <Xm/Text.h>
 #include <X11/StringDefs.h>
 #include <sys/stat.h>				  /* umask() */
+#include <assert.h>
 #include "cal.h"
 #include "version.h"
 
@@ -51,7 +52,7 @@ static void init_fonts		(void);
 static void init_daemon		(void);
 static void timer_callback	(XtPointer, XtIntervalId *);
 static void socket_callback	(XtPointer, int *, XtInputId *);
-extern void run_daemon		();
+extern void run_daemon		(Widget);
 #if !defined(SUN) && !defined(IBM)
 static XtSignalId sig_id;
 static void sig_callback	(XtPointer, XtSignalId *);
@@ -324,7 +325,7 @@ static void non_interactive(
 	struct tm	tm1;			/* for time conversion */
 	time_t		trigger;		/* trigger date and time */
 	char		msg[1024];		/* note from command line */
-	int		n, i, j;		/* char and arg counters */
+	int		n, i, j, l;		/* char and arg counters */
 	char		lockfile[80];		/* plan lockfile, for sighup */
 	char		*flags;			/* where to hide reminder */
 	FILE		*fp;			/* for reading lockfile */
@@ -338,18 +339,19 @@ static void non_interactive(
 	for (j=0; j < n; j++)
 		if (argv[1][j] < '0' || argv[1][j] > '9')
 			break;
-	if (j == n) {				/* digits only: [mmdd]hhmm */
-		if (n != 4 && n != 8 && j == n)
+	if (j == n) {			/* digits only: [[yyyy]mmdd]hhmm */
+		if (n != 4 && n != 8 && n != 12 && j == n)
 			usage();
-		i = atoi(argv[1]);
+		l = atoi(argv[1]);
 		now = get_time();
 		tm = time_to_tm(now);
 		tm1.tm_sec   = 0;
-		tm1.tm_min   = i % 100;
-		tm1.tm_hour  = (i/100) % 100;
-		tm1.tm_mday  = n == 8 ? (i/10000)%100     : tm->tm_mday;
-		tm1.tm_mon   = n == 8 ? (i/1000000)%100-1 : tm->tm_mon;
-		tm1.tm_year  = curr_year + (tm1.tm_mon < tm->tm_mon);
+		tm1.tm_min   = l % 100;
+		tm1.tm_hour  = (l/100) % 100;
+		tm1.tm_mday  = n==8 || n==12 ? (l/10000)%100     : tm->tm_mday;
+		tm1.tm_mon   = n==8 || n==12 ? (l/1000000)%100-1 : tm->tm_mon;
+                tm1.tm_year  = n==12 ? ((l/100000000)%10000)-1900
+                                     : curr_year + (tm1.tm_mon < tm->tm_mon);
 		trigger = tm_to_time(&tm1);
 	} else {				/* try free-form date+time */
 		trigger = parse_datetimestring(argv[1]);
@@ -632,7 +634,7 @@ static void usage(void)
 	    "\t-k\t\tignore lock file and start up in any case\n");
 	fprintf(stderr,
 	    "append usage: %s %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", progname,
-	    "[mmdd]hhmm [options] [message]*\n",
+	    "[[yyyy]mmdd]hhmm [options] [message]*\n",
 	    "\tAdd appointment at mm/dd hh:mm (default is today).\n",
 	    "\tOptions:\n",
 	    "\t-u U\t\tapply to user U instead of own appointments\n",
@@ -753,8 +755,8 @@ static void init_resources(void)
     get_rsrc(&c->year_margin,    "yearMargin",     "YearMargin",   XtRInt, 0);
     get_rsrc(&c->year_gap,	 "yearGap",        "YearGap",      XtRInt, 0);
     get_rsrc(&c->year_title,     "yearTitle",      "YearTitle",    XtRInt, 0);
-    get_rsrc(&c->yearbox_xs,     "yearBoxWidth",   "YearBoxWidth", XtRInt, 80);
-    get_rsrc(&c->yearbox_ys,     "yearBoxHeight",  "YearBoxHeight",XtRInt, 40);
+    get_rsrc(&c->yearbox_xs,     "yearBoxWidth",   "YearBoxWidth", XtRInt, 20);
+    get_rsrc(&c->yearbox_ys,     "yearBoxHeight",  "YearBoxHeight",XtRInt, 20);
     get_rsrc(&c->day_margin,     "dayMargin",      "dayMargin",    XtRInt, 0);
     get_rsrc(&c->day_gap,        "dayGap",         "dayGap",       XtRInt, 0);
     get_rsrc(&c->day_headline,   "dayHeadline",    "dayHeadline",  XtRInt, 0);
diff --git a/src/netplan.c b/src/netplan.c
index 2c89102..80ed553 100644
--- a/src/netplan.c
+++ b/src/netplan.c
@@ -42,13 +42,18 @@ typedef void *Widget;	/* dummy for prototype declarations in config.h */
 
 #define ACLCHKINTER 60          /* interval (secs) for check of the acl file */
 
+void *allocate(int n);
+void *reallocate(void *o, int n);
+void release(void *p);
+char *mystrdup(const char *s);
+
 char			*progname;	/* name of this program, argv[0] */
 static BOOL		debug;		/* foreground, logging is enabled */
 static BOOL		foregnd;	/* foreground without logging */
 BOOL			verbose;	/* debug mode, don't daemonize */
 BOOL			to_syslog;	/* print to syslog, not stderr */
 static BOOL		allow_all;	/* no access list, never deny */
-static int		nclients;	/* size of array */
+static int		nclients;	/* max # of clients */
 static unsigned int	row_id = 1;	/* next available row ID */
 static int		max_files;	/* size of file_list array */
 static struct pfile	*file_list;	/* array of open files */
@@ -91,7 +96,7 @@ void *allocate(int n)
 	{void *p = malloc(n); if (!p) fatal("no memory"); return(p);}
 void *reallocate(void *o, int n)
 	{void *p = o ? realloc(o, n) : malloc(n);
-	 if (!p) fatal("no memory"); return(p);}
+	 if (!p) {fatal("no memory");} return(p);}
 void release(void *p)
 	{if (p) free(p);}
 char *mystrdup(const char *s)
@@ -129,7 +134,7 @@ int main(
 	struct timeval	timeout;	/* for auto-sync after ten seconds */
 	fd_set		rd, wr, ex;	/* returned fd masks from select */
 	int		fd;		/* file descriptor/counter */
-	int		c, i, n, on;
+	int		c, n, on;
 	struct client	*cp;
 	time_t          last_acl_check = 0;
 	time_t          acl_mod_time = 0;
@@ -265,6 +270,9 @@ int main(
 			allow_all = TRUE;
 		}
 	}
+        /* Assume 8 bit per char and one bit per file descriptor in
+         * fd_set to get the capasity of fd_set and thus the max
+         * number of clients. */
 	nclients = sizeof(fd_set)*8;			/* max # of clients */
 	client_list = allocate(nclients * sizeof(struct client));
 	memset(client_list, 0, nclients * sizeof(struct client));
@@ -330,12 +338,12 @@ int main(
 				memset(cp, 0, sizeof(struct client));
 				memcpy(&cp->addr, &addr, len);
 				cp->uid     = nobody_uid;
+				cp->gids    = allocate(sizeof(*(cp->gids)));
+				cp->gidcount= 1;
 				cp->gids[0] = nobody_gid;
 				cp->descr   = mystrdup(nobody);
 				cp->user    = mystrdup(nobody);
 				cp->port    = netplan_port[c];
-				for (i=1; i < NGROUPS_MAX; i++)
-					cp->gids[i] = -1;
 
 				logger("client %d (%.200s) connected from %s\n"
 					       ,fd, cp->descr, ip_addr(&addr));
@@ -404,19 +412,28 @@ static void setup_gids(
 	struct group	*gr;
 	int		ngroups = 0;
 	char		**p;
+	int             groupcount;
 
+	/* Unspecified if the default gid is included or not, so add
+	   one just in case. */
+	groupcount = getgroups(0, NULL) + 1;
+	cp->gids = allocate(groupcount * sizeof(*(cp->gids)));
 	cp->gids[ngroups++] = gid;
 	setgrent();
 	while ((gr = getgrent()))
 		for (p=gr->gr_mem; *p; p++)
 			if (!strcmp(user, *p)) {
-				if (ngroups < NGROUPS_MAX)
+				if (ngroups < groupcount)
 					cp->gids[ngroups] = gr->gr_gid;
 				ngroups++;
 				break;
 			}
-	if (ngroups > NGROUPS_MAX)
-		logger("too many groups (%d, used %d)\n", ngroups,NGROUPS_MAX);
+	if (ngroups > groupcount) {
+		logger("too many groups (%d, used %d)\n", ngroups, groupcount);
+		cp->gidcount = groupcount;
+	} else
+		cp->gidcount = ngroups;
+
 }
 
 
@@ -525,6 +542,7 @@ static void close_client(
 
 	for (fid=0; fid < max_files; fid++)
 		close_file(fid, fd);
+	release(c->gids);
 	release(c->descr);
 	release(c->user);
 	release(c->in.data);
@@ -650,7 +668,7 @@ static void eval_message(
 						"user %.100s, uid %d, gids",
 						fd, c->user, c->uid);
 				p = buf + strlen(buf);
-				for (i=0; i<NGROUPS_MAX && c->gids[i]>=0; i++){
+				for (i=0; i<c->gidcount && c->gids[i]>=0; i++){
 					sprintf(p, " %d", c->gids[i]);
 					p += strlen(p);
 				}
@@ -684,7 +702,7 @@ static void eval_message(
 			sprintf(buf, "client %d is %.200s (uid %d, gids",
 				 			fd, arg, c->uid);
 			p = buf + strlen(buf);
-			for (i=0; i < NGROUPS_MAX && c->gids[i] >= 0; i++) {
+			for (i=0; i < c->gidcount && c->gids[i] >= 0; i++) {
 				sprintf(p, " %d", c->gids[i]);
 				p += strlen(p);
 			}
diff --git a/src/netplan.h b/src/netplan.h
index bcfbff1..cd4b974 100644
--- a/src/netplan.h
+++ b/src/netplan.h
@@ -56,7 +56,8 @@ struct client {
 	char		*descr;		/* client-provided self-description */
 	char            *user;          /* user name if authenticated */
 	unsigned int	uid;	        /* client-provided user/group ID */
-	int             gids[NGROUPS_MAX];/* group access list */
+	int             gidcount;       /* number of in group entries */
+	int             *gids;          /* group access list */
 	BOOL            auth_fail;	/* required identd check failed */
 	int		port;		/* accept socket to client */
 	struct sockaddr_in addr;	/* contains IP addr and port */
diff --git a/src/netplan_acl.c b/src/netplan_acl.c
index e35aa3d..9c4ac28 100644
--- a/src/netplan_acl.c
+++ b/src/netplan_acl.c
@@ -459,12 +459,14 @@ void acl_verify(
 		  case aGROUP:
 			if (c->auth_fail)
 				continue;
-			for (found=FALSE, i=0; !found && i < acl->ndata;
-								!found && i++)
+			for (found=FALSE, i=0; !found && i < acl->ndata; ) {
 				for (j=0; j<NGROUPS_MAX && c->gids[j]>=0; j++)
 					if ((found = (int)acl->ugid[i] ==
 						     (int)c->gids[j]))
 						break;
+				if (!found)
+					i++;
+			}
 			break;
 
 		  case aHOST:
diff --git a/src/network.c b/src/network.c
index 68a4248..bc95f4e 100644
--- a/src/network.c
+++ b/src/network.c
@@ -300,7 +300,7 @@ Full reply message in error was:\n%s"),
  */
 
 static int  host_fd;
-static BOOL write_to_net(line) char *line;
+static BOOL write_to_net(char *line)
 	{ puts_server(host_fd, line); return(TRUE); }
 
 BOOL server_entry_op(
diff --git a/src/notifier.c b/src/notifier.c
index aed6844..ac1c924 100644
--- a/src/notifier.c
+++ b/src/notifier.c
@@ -17,8 +17,6 @@
 #include <Xm/Xm.h>
 #include <X11/StringDefs.h>
 #include "cal.h"
-#undef COL_RED
-#undef NCOLS
 #include "notifier.h"
 #include "version.h"
 #include "bm_noticon.h"
@@ -44,8 +42,8 @@ static void init_colors		(void);
 Display			*display;		/* common server */
 GC			gc;			/* common graphics context */
 char			*progname;		/* argv[0] */
-Pixel			color[NCOLS];		/* colors: COL_* */
-Pixel			bkcolor = COL_RED;	/* background color (COL_*) */
+Pixel			color[N_NCOLS];		/* colors: N_COL_* */
+Pixel			bkcolor = N_COL_RED;	/* background color (N_COL_*)*/
 XtAppContext		app;			/* application handle */
 static Widget		toplevel;		/* widget tree */
 
@@ -184,13 +182,13 @@ int main(
 					i = -1;
 					break;
 				  case '1':
-					bkcolor = COL_GREEN;
+					bkcolor = N_COL_GREEN;
 					break;
 				  case '2':
-					bkcolor = COL_YELLOW;
+					bkcolor = N_COL_YELLOW;
 					break;
 				  case '3':
-					bkcolor = COL_RED;
+					bkcolor = N_COL_RED;
 					break;
 				  default:
 					usage();
@@ -347,13 +345,13 @@ static void init_colors(void)
 	char			*c, *n, class_name[256];
 
 	cmap = DefaultColormap(display, DefaultScreen(display));
-	for (i=0; i < NCOLS; i++) {
+	for (i=0; i < N_NCOLS; i++) {
 		switch (i) {
 		  default:
-		  case COL_STD:		n = "colStd";		d = 1;	break;
-		  case COL_RED:		n = "colRedAlert";	d = 0;	break;
-		  case COL_YELLOW:	n = "colYellowAlert";	d = 0;	break;
-		  case COL_GREEN:	n = "colGreenAlert";	d = 0;	break;
+		  case N_COL_STD:	n = "colStd";		d = 1;	break;
+		  case N_COL_RED:	n = "colRedAlert";	d = 0;	break;
+		  case N_COL_YELLOW:	n = "colYellowAlert";	d = 0;	break;
+		  case N_COL_GREEN:	n = "colGreenAlert";	d = 0;	break;
 		}
 		strcpy(class_name, n);
 		class_name[0] &= ~('a'^'A');
diff --git a/src/notifier.h b/src/notifier.h
index bc0062a..10f2a67 100644
--- a/src/notifier.h
+++ b/src/notifier.h
@@ -3,9 +3,9 @@
  */
 
 				/* colors */
-#define COL_BACK	0		/* standard background */
-#define COL_STD		1		/* standard foreground */
-#define COL_RED		2		/* background color for red alert */
-#define COL_YELLOW	3		/* background color for yellow alert */
-#define COL_GREEN	4		/* background color for green alert */
-#define NCOLS		5
+#define N_COL_BACK	0		/* standard background */
+#define N_COL_STD	1		/* standard foreground */
+#define N_COL_RED	2		/* background color for red alert */
+#define N_COL_YELLOW	3		/* background color for yellow alert */
+#define N_COL_GREEN	4		/* background color for green alert */
+#define N_NCOLS		5
diff --git a/src/notmenu.c b/src/notmenu.c
index 5fdc6ae..b8d6306 100644
--- a/src/notmenu.c
+++ b/src/notmenu.c
@@ -6,6 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 #include <Xm/Xm.h>
 #include <Xm/MainW.h>
 #include <Xm/Form.h>
@@ -14,6 +15,8 @@
 #include <Xm/PushBG.h>
 #include <Xm/Text.h>
 #include "notifier.h"
+#include "config.h"
+#include "cal.h"
 
 #define SNOOZE_PERIOD	5*60*1000	/* snooze time in milliseconds */
 
@@ -29,8 +32,8 @@ static void snooze_callback	(Widget, int, XmToggleButtonCallbackStruct *);
 extern Display		*display;	/* everybody uses the same server */
 extern XtAppContext	app;		/* application handle for timer */
 extern GC		gc;		/* everybody uses this context */
-extern Pixel		color[NCOLS];	/* colors: COL_* */
-extern Pixel		bkcolor;	/* background color (COL_*) */
+extern Pixel		color[N_NCOLS];	/* colors: N_COL_* */
+extern Pixel		bkcolor;	/* background color (N_COL_*) */
 static Widget		mainwindow;	/* for popdown/popup by snooze */
 
 
diff --git a/src/parser.lex b/src/parser.lex
index 794e9bb..38351f0 100644
--- a/src/parser.lex
+++ b/src/parser.lex
@@ -2,8 +2,13 @@
 #include "y.tab.h"
 #include "string.h"
 #undef yywrap
-int yywrap(void) { return(1); }
+int yywrap(void);
+int yywrap(void) {return(1);}
 extern char *mystrdup(char *);
+static void yyunput(int c, char *p);
+static int input(void);
+void fix_warnings2(void);
+void fix_warnings2(void) {yyunput(0, 0); input();}
 %}
 
 %%
diff --git a/src/parser.y b/src/parser.y
index e330da6..dca4a96 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -7,6 +7,12 @@
 
 #ifdef linux
 #define gettxt(a,b) b	/* for linux */
+extern int yylex(void);
+extern int yyerror(char *msg);
+static void yyunput(int c, char *p) {(void)c; (void)p;}
+static int input(void) {return 0;}
+void fix_warnings1(void);
+void fix_warnings1(void) {yyunput(0, 0); input();}
 #endif
 
 extern int	 parse_year;
diff --git a/src/proto.h b/src/proto.h
index bea9bc1..cdd9d5d 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -174,6 +174,7 @@ extern void write_vcal_mainlist(
 extern void help_callback(		/* print help for a topic */
 	Widget		parent,
 	char		*topic);
+extern void destroy_help_popup(void);
 
 /*---------------------------------------- holiday.c ------------*/
 
@@ -222,6 +223,8 @@ extern int day_from_wday(
 	int		num);
 extern void dump_holiday(
 	int		year);
+extern void reset_holidays(
+	struct holiday	*hp);
 
 /*---------------------------------------- util.c ------------*/
 
@@ -249,6 +252,8 @@ void print_info_line(void);
 char to_ascii(
 	char		*str,		/* string to convert to ascii */
 	int		def);		/* default if string is empty */
+char *to_octal(
+	int		n);		/* ascii to convert to string */
 
 /*---------------------------------------- xutil.c ------------*/
 
@@ -268,11 +273,19 @@ extern void drag_init(
 	int		view,		/* 'm', 'd', 'w', or 'o' */
 	Widget		canvas,		/* drawing area to initialize */
 	Widget		info,		/* label widget for info messages */
-	void		(*rcb)(),	/* redraw callback */
-	MOUSE		(*lcb)());	/* locate position in canvas */
+	void		(*rcb)(Region),	/* redraw callback */
+	MOUSE		(*lcb)(struct entry **,
+			       BOOL *, time_t *,
+			       time_t *, int *,
+			       int *, int *, int *,
+			       int, int));	/* locate position in canvas */
 extern void drag_destroy(
 	int		view);		/* 'm', 'd', 'w', or 'o' */
 
+extern void set_cursor(
+	Widget		w,		/* in which widget */
+	int		n);		/* which cursor, one of M_* */
+
 /*---------------------------------------- popup.c ------------*/
 
 extern void create_about_popup(void);	/* create About info popup */
@@ -291,6 +304,7 @@ extern void create_error_popup(
 /*---------------------------------------- print.c ------------*/
 
 extern void create_print_popup(void);	/* create a print popup */
+extern void destroy_print_popup(void);
 
 /*---------------------------------------- sublist.c ------------*/
 
@@ -340,6 +354,7 @@ extern void destroy_day(void);		/* release the day node trees. */
 /*---------------------------------------- adjmenu.c ------------*/
 
 extern void create_adjust_popup(void);	/* create an adjust popup */
+extern void destroy_adjust_popup(void);
 
 /*---------------------------------------- calmenu.c ------------*/
 
@@ -367,6 +382,7 @@ extern void set_widget_size(		/* set the size of a widget */
 /*---------------------------------------- cnfmenu.c ------------*/
 
 extern void create_config_popup(void);	/* create a config popup */
+extern void destroy_config_popup(void);
 
 /*---------------------------------------- cycmenu.c ------------*/
 
@@ -404,10 +420,12 @@ extern void create_except_popup(void);	/* create an exception */
 /*---------------------------------------- gotomenu.c ------------*/
 
 extern void create_goto_popup(void);	/* create a goto popup */
+extern void destroy_goto_popup(void);
 
 /*---------------------------------------- holmenu.c ------------*/
 
 extern void create_holiday_popup(void);	/* create a holiday popup */
+extern void destroy_holiday_popup(void);
 
 /*---------------------------------------- keymenu.c ------------*/
 
@@ -446,6 +464,7 @@ extern BOOL all_files_served(void);	/* all files read from IP servers? */
 extern void create_user_popup(void);	/* create user popup */
 extern void create_user_rows(void);	/* make enough rows in user menu list*/
 extern void draw_user_row(int);		/* redraw a row in the user menu list*/
+extern void destroy_user_popup(BOOL);
 
 /*---------------------------------------- servmenu.c ------------*/
 
@@ -476,6 +495,10 @@ extern void destroy_day_menu(void);
 extern void create_day_menu(		/* create the day menu for curr_day */
 	Widget		parent);
 
+/*---------------------------------------- confmenu.c -----------*/
+
+extern void destroy_calconfig_popup(void);
+
 /*---------------------------------------- editdraw.c ------------*/
 
 extern void draw_list(			/* draw or redraw a list of entries */
diff --git a/src/sublist.c b/src/sublist.c
index e755146..eab5946 100644
--- a/src/sublist.c
+++ b/src/sublist.c
@@ -19,21 +19,27 @@
 
 #define CHUNK		100			/* sublist allocation unit */
 
+#ifndef NOREGEX
+#if defined(linux)
+#include <regex.h>
+#else
+#define regex_t char
+#endif
 #if defined(SUN) && !defined(SOLARIS2)
 #define regcmp re_comp
 #define regex re_exec
+extern char		*regcmp(), *regex(), *__loc1;
 #endif
-#if defined(linux) || defined(__EMX__)
+#if defined(__EMX__) || defined(__FreeBSD_kernel__)
 #define regcmp regcomp
 #define regex regexec
-#endif
-#ifndef NOREGEX
 extern char		*regcmp(), *regex(), *__loc1;
 #endif
+#endif
 extern int		search_mode;		/* 0=case, 1=lit, 2=regex */
 extern struct user	*user;			/* user list (from file_r.c) */
 static void		append_entry(struct sublist **, struct entry *);
-static BOOL		keymatch(char *, char *);
+static BOOL		keymatch(char *, regex_t *, char *);
 
 
 /*
@@ -85,22 +91,36 @@ void create_sublist(
 				if (isupper(*k)) *k = tolower(*k);
 		}
 #ifndef NOREGEX
-		if (search_mode == 2)
+		regex_t *preg = 0;
+		if (search_mode == 2) {
+#if defined(linux)
+			preg = (regex_t *)malloc(sizeof(regex_t));
+			if (regcomp(preg, key, 0)) {
+#else
 			if (!(key = regcmp(key, 0))) {
+#endif
+				free(preg);
 				list->locked--;
 				return;
 			}
+		}
 #endif
 		for (ep=list->entry, i=0; i < list->nentries; i++, ep++)
-			if (((ep->message && keymatch(key, ep->message)) ||
-			     (ep->script  && keymatch(key, ep->script )) ||
-			     (ep->note    && keymatch(key, ep->note   ))) &&
-					      (!w->own_only || !ep->user ||
-					      !strcmp(user[0].name, ep->user)))
-				append_entry(&w->sublist, ep);
+		    if (((ep->message && keymatch(key, preg, ep->message)) ||
+			 (ep->script  && keymatch(key, preg, ep->script )) ||
+			 (ep->note    && keymatch(key, preg, ep->note   ))) &&
+					  (!w->own_only || !ep->user ||
+					  !strcmp(user[0].name, ep->user)))
+			    append_entry(&w->sublist, ep);
 #ifndef NOREGEX
-		if (search_mode == 2)
+		if (search_mode == 2) {
+#if defined(linux)
+			regfree(preg);
+			free(preg);
+#else
 			free(key);
+#endif
+		}
 #endif
 		if (search_mode == 1)
 			free(key);
@@ -158,6 +178,7 @@ void destroy_sublist(
 
 static BOOL keymatch(
 	char		*key,		/* keyword to look for */
+	regex_t		*preg,		/* linux: compiled regex */
 	char		*string)	/* text to look in */
 {
 	char		*p;		/* fast string scan ptr */
@@ -194,10 +215,14 @@ static BOOL keymatch(
 
 #ifndef NOREGEX
 	  case 2: {
+#if defined(linux)
+		return(regexec(preg, string, 0, 0, 0) == 0);
+#else
 		char dummy[1024];
 		return(regex(key, string,
 				dummy, dummy, dummy, dummy, dummy,
 				dummy, dummy, dummy, dummy, dummy) != 0);
+#endif
 		}
 #endif
 	}
diff --git a/src/time.c b/src/time.c
index 7983361..3200fbd 100644
--- a/src/time.c
+++ b/src/time.c
@@ -172,8 +172,8 @@ void set_tzone(void)
 #ifdef DEBUG
 static char *zone_time_string();
 #endif
-static int get_zone_time();
-static int julian_year_date();
+static int get_zone_time(char **tzp, int zdefault);
+static int julian_year_date(char **tzp);
 
 void guess_tzone(void)
 {
@@ -350,7 +350,7 @@ static int get_zone_time(
  */
 
 extern int	curr_year;		/* year being displayed, since 1900 */
-time_t		date_to_time();
+time_t		date_to_time(int, int, int, int *, int *, int *);
 
 static int julian_year_date(
 	char		**tzp)
diff --git a/src/usermenu.c b/src/usermenu.c
index dfe9759..6f52a79 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -894,9 +894,10 @@ static void delete_callback(
 #endif
 
 static int compare(CONST void *u, CONST void *v) {
-	return(  ((struct user *)u)->color == ((struct user *)v)->color
-	? strcmp(((struct user *)u)->name,    ((struct user *)v)->name)
-	:        ((struct user *)u)->color -  ((struct user *)v)->color); }
+	CONST struct user *up = (CONST struct user *)u;
+	CONST struct user *vp = (CONST struct user *)v;
+	return(up->color == vp->color ? strcmp(up->name,   vp->name)
+				      :        up->color - vp->color); }
 
 /*ARGSUSED*/
 static void sort_callback(
diff --git a/src/usersel.c b/src/usersel.c
index 1f57bf7..122629a 100644
--- a/src/usersel.c
+++ b/src/usersel.c
@@ -61,7 +61,7 @@ void destroy_user_sel_popup(void)
 void create_user_sel_popup(
 	UNUSED Widget	widget,		/* install popup near this button */
 	int		curr,		/* current user ID (default) */
-	BOOL		(*callb)())	/* function to call with new user ID */
+	BOOL		(*callb)(int))	/* function to call with new user ID */
 {
 	Widget		form, radio, w, done;
 	Arg		args[20];
diff --git a/src/version.h b/src/version.h
index e88d108..e184ea8 100644
--- a/src/version.h
+++ b/src/version.h
@@ -2,7 +2,7 @@
  * version string for schedule, daemon, and notifier
  */
 
-#define VERSION "V1.10.1"
+#define VERSION "V1.12"
 
 #ifdef JAPAN
 #define JAPANVERSION " Japanese"
diff --git a/src/xutil.c b/src/xutil.c
index ee5a66e..c3294d4 100644
--- a/src/xutil.c
+++ b/src/xutil.c
@@ -352,11 +352,19 @@ static struct dragc_s {
 	int	view;			/* [0]='m', [1]='d', [2]='w', [3]='o'*/
 	Widget	canvas;			/* drawing area */
 	Widget	info;			/* text widget for info msgs, or 0 */
-	void	(*expose_cb)();		/* expose callback */
-	MOUSE	(*locate_cb)();		/* locate callback */
+	void	(*expose_cb)(Region);	/* expose callback */
+	MOUSE	(*locate_cb)(		/* locate callback */
+		    struct entry **,
+		    BOOL *, time_t *,
+		    time_t *, int *,
+		    int *, int *, int *,
+		    int, int);
 }		drag_context[NVIEWS];
 
-static void expose_callback();
+static void expose_callback(
+	UNUSED Widget			canvas,		/* drawing area */
+	XtPointer			data,		/* view: 0..NVIEWS-1 */
+	XmDrawingAreaCallbackStruct	*info);		/* what & where */
 
 static String translations =
 		"<Btn1Down>:	canvas(down)	ManagerGadgetArm()\n\
@@ -368,8 +376,13 @@ void drag_init(
 	int		view,		/* 'm', 'd', 'w', or 'o' */
 	Widget		canvas,		/* drawing area to initialize */
 	Widget		info,		/* label widget for info messages */
-	void		(*rcb)(),	/* redraw callback */
-	MOUSE		(*lcb)())	/* locate position in canvas */
+	void		(*rcb)(Region),	/* redraw callback */
+	MOUSE		(*lcb)(		/* locate position in canvas */
+				struct entry **,
+				BOOL *, time_t *,
+				time_t *, int *,
+				int *, int *, int *,
+				int, int))
 {
 	static BOOL	did_init = FALSE;
 	XtActionsRec	action;
diff --git a/src/yovmenu.c b/src/yovmenu.c
index d651e9c..563a52b 100644
--- a/src/yovmenu.c
+++ b/src/yovmenu.c
@@ -498,5 +498,5 @@ static void other_callback(
 	UNUSED int			item,
 	UNUSED XmToggleButtonCallbackStruct*data)
 {
-	create_user_sel_popup(widget, config.yov_user, (BOOL (*)())callback);
+	create_user_sel_popup(widget, config.yov_user,(BOOL (*)(int))callback);
 }
diff --git a/web/welcome.html b/web/welcome.html
new file mode 100644
index 0000000..26df9ce
--- /dev/null
+++ b/web/welcome.html
@@ -0,0 +1,11 @@
+<HTML VERSION="2.0">
+<HEAD>
+</HEAD>
+<BODY BGCOLOR="#ffffff">
+<CENTER>
+<FONT size=4>
+Welcome to WebPlan 1.8
+</FONT>
+</CENTER>
+</BODY>
+</HTML>
-- 
2.31.1