emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/notes-mode e7d1fbc 2/7: First cut at cleaning up notes-


From: Stefan Monnier
Subject: [elpa] externals/notes-mode e7d1fbc 2/7: First cut at cleaning up notes-mode.
Date: Tue, 1 Dec 2020 10:05:02 -0500 (EST)

branch: externals/notes-mode
commit e7d1fbc51cf0d04539b50085d404e1f095ce73ff
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    First cut at cleaning up notes-mode.
    - Followed the usual header/footer conventions in Elisp.
    - Updated copyright.
    - Remove configury scripts.
    - Bind $NOTES_BIN_DIR in notes-first while running notesinit.
    - Use $NOTES_BIN_DIR rather than /home/johnh in scripts.
    - Add `dir' file.
    - Remove non-"notes-"-prefixed functions from notes-aux.el.
    - Remove notes-bootstrap.
    - Remove notes-platform-font-lock (was broken on XEmacs anyway).
    - Use define-derived-mode for notes-index-mode.
    - Setup notes-mode-map once at top-level.
    - Prefer expand-file-name to `concat'.
    - Put the Info file in the `Emacs' category.
    - Use \` and \' regexp at a few places.
    - Use load-file-name to initialize notes-utility-dir.
    - Avoid find-file-noselect when loading the cache to avoid autoinsert 
prompting
       the user.
    - Use (featurep 'xemacs)
    - Remove autoloads from notes-variables.
    - Don't mess with the user's .emacs in notesinit.
    - Bump release number to 1.30.
    - Remove strftime.c.
---
 COPYING             |  915 +++++++++++-----
 Makefile.in         |   13 -
 Notes.pm            |    2 +-
 NotesIndex.pm       |    2 +-
 NotesVars.pm        |    4 +-
 README              |   68 +-
 catsubject          |    4 +-
 configure           | 3025 ---------------------------------------------------
 configure.in        |  157 ---
 dir                 |   20 +
 install-sh          |  238 ----
 mkall               |    4 +-
 mkconfig            |    5 +-
 mkindex             |    2 +-
 mkindexcache        |    2 +-
 mknew               |    4 +-
 mkprevnext          |    2 +-
 mkrawindex          |    4 +-
 notes-aux.el        |  111 +-
 notes-bootstrap.el  |   23 -
 notes-emacs.el      |   65 +-
 notes-first.el      |   53 +-
 notes-index-mode.el |  104 +-
 notes-mode.el       |  209 ++--
 notes-mode.info     |  109 +-
 notes-mode.ps.gz    |  Bin 122845 -> 0 bytes
 notes-mode.texi     |   74 +-
 notes-url.el        |   87 +-
 notes-variables.el  |  179 +--
 notes-xemacs.el     |   45 +-
 notesinit           |   13 +-
 release             |    2 +-
 setcrontab          |    2 +-
 strftime.c          |   41 -
 34 files changed, 1151 insertions(+), 4437 deletions(-)

diff --git a/COPYING b/COPYING
index 86cf81a..94a9ed0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,286 +1,626 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-                   GNU GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                           Preamble
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-                   GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                           NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                    END OF TERMS AND CONDITIONS
-
-       Appendix: How to Apply These Terms to Your New Programs
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -288,15 +628,15 @@ free software which everyone can redistribute and change 
under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -305,37 +645,30 @@ the "copyright" line and a pointer to where the full 
notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile.in b/Makefile.in
index cc2c060..286bf63 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,17 +44,10 @@ OTHERS = \
        configure \
        configure.in \
        install-sh \
-       strftime.c \
        notes-mode.texi \
        notes-mode.info \
        notes-mode.ps.gz
 
-#SRCS = \
-#      strftime.c
-
-#BINS = \
-#      strftime
-
 SCRIPTS = \
        mkall mkindex mkprevnext mkrawindex mkindexcache \
        mkconfig mknew catsubject notesinit setcrontab \
@@ -64,7 +57,6 @@ ELS = \
        notes-variables.el \
        notes-mode.el notes-index-mode.el \
        notes-url.el notes-aux.el \
-       notes-bootstrap.el \
        notes-emacs.el notes-xemacs.el \
        notes-first.el
 
@@ -79,11 +71,6 @@ MY_EL_DIR=/home/johnh/LIB/EMACS
 # Compliation stuff.
 #
 
-# all: strftime
-# all: strftime
-
-# strftime: strftime.c
-
 all:
        @echo "nothing required for make; just run \"make install\""
 
diff --git a/Notes.pm b/Notes.pm
old mode 100644
new mode 100755
index f2e3d07..129299b
--- a/Notes.pm
+++ b/Notes.pm
@@ -4,7 +4,7 @@
 # Notes.pm
 # $Id: Notes.pm,v 1.9 2010/06/20 18:31:22 johnh Exp $
 #
-# Copyright (C) 1996-2006 by John Heidemann.
+# Copyright (C) 1996-2006,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License, version 2.
diff --git a/NotesIndex.pm b/NotesIndex.pm
old mode 100644
new mode 100755
index aead72c..f547435
--- a/NotesIndex.pm
+++ b/NotesIndex.pm
@@ -4,7 +4,7 @@
 # NotesIndex.pm
 # $Id: NotesIndex.pm,v 1.3 2003/05/23 16:26:19 johnh Exp $
 #
-# Copyright (C) 1996 by John Heidemann.
+# Copyright (C) 1996,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License, version 2.
diff --git a/NotesVars.pm b/NotesVars.pm
old mode 100644
new mode 100755
index 12d491c..da35dab
--- a/NotesVars.pm
+++ b/NotesVars.pm
@@ -4,7 +4,7 @@
 # NotesVars.pm
 # $Id: NotesVars.pm,v 1.8 2003/05/23 16:26:22 johnh Exp $
 #
-# Copyright (C) 1996 by John Heidemann.
+# Copyright (C) 1996,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License, version 2.
@@ -19,7 +19,7 @@ require 5.000;
 BEGIN {
     no strict 'vars';   # avoid %::notes
     $notes{'home'} = ((getpwuid($<))[7]);
-    my(@config) = `/home/johnh/NOTES/BIN/mkconfig perl`;
+    my(@config) = `"$ENV{'NOTES_BIN_DIR'}/mkconfig" perl`;
     die "$0: mkconfig failed\n" if ($#config == -1);
     eval join("", @config);
     unshift(@INC, $notes{'bin_dir'});
diff --git a/README b/README
index f4b4dd3..d26c446 100644
--- a/README
+++ b/README
@@ -1,25 +1,13 @@
-
 Notes-mode
 ----------
 by John Heidemann, <johnh@isi.edu>
 
 For documentation, see
        notes-mode.info
-       notes-mode.ps.gz
        HTML/notes-mode.html
 or     <http://www.isi.edu/~johnh/SOFTWARE/NOTES_MODE/>
 
 
-WHAT'S NEW IN NOTES-MODE?
--------------------------
-
-Changed ( 8-Aug-08): version 1.27:
-
-Change I/O in @file{mkindexcache} to use locale (the sadly correct thing)
-rather than forcing utf-8 (the Righteous Path).
-Bug report from Geoff Kuenning, a man with an older Unix environment than I.
-
-
 WHAT IS NOTES-MODE?
 -------------------
 
@@ -40,38 +28,17 @@ see 
<http://www.isi.edu/~johnh/SOFTWARE/NOTES_MODE/notes-mode_1.html>
 REQUIREMENTS
 ------------
 
-Notes-mode requires emacs or xemacs version 19 or 20 (or possibly
-later) and Perl-5.  For information:
-
-       emacs   http://www.gnu.org/software/emacs/emacs.html
-       xemacs  http://www.xemacs.org
-       perl    http://www.perl.com
+Notes-mode requires Perl-5.  For information: http://www.perl.com
 
 
 INSTALLATION
 ------------
 
-First, get notes mode from <http://www.isi.edu/~johnh/SOFTWARE/NOTES_MODE/>.
-
-To install the basic package:
-       1. ./configure
-       2. make install
-
-(To control what's installed where, use --prefix=/where, or
---with-lisp-dir=/where, --datadir=/where (for scripts),
-and --infodir=/where.)
-
 For each user:
        1. Run notesinit
                (from where it's installed, /usr/local/bin/notesinit
                by default)
 
-If you have problems with paths being incorrect, please be aware that
-you CANNOT run notes directly out of where you untar it.  The
-installation process customizes the programs for where things are on
-your system.  Make sure you move out of the directory where you
-untarred it before running it.
-
 After you've installed notes mode you're encouraged to subscribe
 to the mailing lists:
 Send the message "subscribe" to
@@ -83,18 +50,23 @@ Send the message "subscribe" to
 COPYRIGHT
 ---------
 
-Notes-mode is Copyright (C) 1994-2002 by John Heidemann,
-<johnh@isi.edu>.  Notes-mode comes with ABSOLUTELY NO WARRANTY.  This
-is free software, and you are welcome to redistribute it under certain
-conditions.  See the file ``COPYING'' for details about both of these
-conditions.
-
-
-CHANGE HISTORY
---------------
-
-README:
-$Id: README,v 1.21 2008/08/08 20:33:36 johnh Exp $
-
-See the changes entry in the texinfo documentation.
+Notes-mode is Copyright (C) 1994-2002,2012  Free Software Foundation, Inc.
+Notes-mode comes with ABSOLUTELY NO WARRANTY.
+This is Free Software, and you are welcome to redistribute it under certain
+conditions.  See the file ``COPYING'' for details about both of
+these conditions.
+
+
+TODO
+----
+
+- figure out how to pass the configured file names to the Perl scripts.
+- Use `completion-at-point-functions'.
+- Use epa/epg for encryption.
+- Figure out what to do about mkall.
+- Use defcustom and get rid of "* in docstrings.
+- Remove notes-use-font-lock.
+- Don't run notes-first just because we load the .el files.
+- Unify notes-utility-dir and notes-bin-dir.
+- Add support for mouse-1-click-follows-link.
 
diff --git a/catsubject b/catsubject
index 30e4213..38ba8f5 100755
--- a/catsubject
+++ b/catsubject
@@ -4,7 +4,7 @@
 # catsubject
 # $Id: catsubject,v 1.7 2003/05/23 16:26:24 johnh Exp $
 #
-# Copyright (C) 1996 by John Heidemann.
+# Copyright (C) 1996,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License, version 2.
@@ -45,7 +45,7 @@ my(%opts);
 #}
 
 use POSIX;
-BEGIN { unshift(@INC, "/home/johnh/NOTES/BIN"); };
+BEGIN { unshift(@INC, $ENV{'NOTES_BIN_DIR'}); };
 use NotesVars;
 use Notes;
 use NotesIndex;
diff --git a/configure b/configure
deleted file mode 100755
index 7c707ad..0000000
--- a/configure
+++ /dev/null
@@ -1,3025 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""       $as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file 
name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes &&    (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); 
exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-        /*)
-          for as_base in sh bash ksh sh5; do
-            as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-          done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-        # Try only shells that exist, to save several forks.
-        if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-               { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-              as_have_required=yes
-              if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX 
shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-       case $1 in
-        -*)set "./$1";;
-       esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-       ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 
'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="mkindexcache"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-package
-emacsbin
-perlbin
-mkdir_p
-lisp_dir
-install_info
-install_info_section
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)   ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} 
${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
-               datadir sysconfdir sharedstatedir localstatedir includedir \
-               oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: 
$ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use 
--host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$0" : 'X\(//\)[^/]' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-       cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: 
$ac_msg" >&2
-   { (exit 1); exit 1; }; }
-       pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                         [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                         [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
---with-lisp-dir=path  specify a path for where to install .el files
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-       ac_must_keep_next=false # Got value, back to normal.
-      else
-       case $ac_arg in
-         *=* | --config-cache | -C | -disable-* | --disable-* \
-         | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-         | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-         | -with-* | --with-* | -without-* | --without-* | --x)
-           case "$ac_configure_args0 " in
-             "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-           esac
-           ;;
-         -* ) ac_must_keep_next=true ;;
-       esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { 
ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { 
ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n 
'\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains 
a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-       "s/'\''/'\''\\\\'\'''\''/g;
-         
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-       eval ac_val=\$$ac_var
-       case $ac_val in
-       *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-       esac
-       echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-       "$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in 
the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" 
>&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous 
run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-       { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the 
previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-       { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-       { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-       ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the 
build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm 
$cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start 
over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext 
$LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-package=notes-mode
-
-for ac_prog in emacs gemacs xemacs
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with 
args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_emacsbin+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$emacsbin"; then
-  ac_cv_prog_emacsbin="$emacsbin" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_emacsbin="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-emacsbin=$ac_cv_prog_emacsbin
-if test -n "$emacsbin"; then
-  { echo "$as_me:$LINENO: result: $emacsbin" >&5
-echo "${ECHO_T}$emacsbin" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$emacsbin" && break
-done
-
-
-for ac_prog in perl perl5
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with 
args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_perlbin+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $perlbin in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_perlbin="$perlbin" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_perlbin="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-perlbin=$ac_cv_path_perlbin
-if test -n "$perlbin"; then
-  { echo "$as_me:$LINENO: result: $perlbin" >&5
-echo "${ECHO_T}$perlbin" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$perlbin" && break
-done
-test -n "$perlbin" || perlbin="no"
-
-perl_vers=`$perlbin -e 'print $]'`
-case $perl_vers in
-1234.*) perlbin=no;;
-esac
-if test "$perlbin" = no; then
-  { { echo "$as_me:$LINENO: error: $package requires perl 5.0 or later." >&5
-echo "$as_me: error: $package requires perl 5.0 or later." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-{ echo "$as_me:$LINENO: checking mkdir -p" >&5
-echo $ECHO_N "checking mkdir -p... $ECHO_C" >&6; }
-if mkdir -p /tmp/mkdir.$$
-then
-  mkdir_p="mkdir -p "
-  rmdir /tmp/mkdir.$$
-  { echo "$as_me:$LINENO: result: $mkdir_p" >&5
-echo "${ECHO_T}$mkdir_p" >&6; }
-elif test -x ./install-sh
-then
-  mkdir_p="./install-sh -d "
-  { echo "$as_me:$LINENO: result: $mkdir_p" >&5
-echo "${ECHO_T}$mkdir_p" >&6; }
-else
-  { echo "$as_me:$LINENO: result: none found" >&5
-echo "${ECHO_T}none found" >&6; }
-  { echo "$as_me:$LINENO: WARNING:   Couldn't find mkdir -p.  You may have to 
manually mkdir some directories." >&5
-echo "$as_me: WARNING:   Couldn't find mkdir -p.  You may have to manually 
mkdir some directories." >&2;}
-  mkdir_p="mkdir "
-fi
-
-
-
-prefix_specified=true
-if test "x$prefix" = xNONE -o "x$prefix" = xnone
-then
-       # hack for install purposes
-       prefix=/usr/local
-       prefix_specified=false
-fi
-
-{ echo "$as_me:$LINENO: checking lisp installation directory" >&5
-echo $ECHO_N "checking lisp installation directory... $ECHO_C" >&6; }
-
-# Check whether --with-lisp-dir was given.
-if test "${with_lisp_dir+set}" = set; then
-  withval=$with_lisp_dir; lisp_dir=$withval
-else
-  lisp_dir=""
-fi
-
-if test x$lisp_dir = x
-then
-       lisp_dir=`$emacsbin -batch -q -l notes-bootstrap.el -f notes-load-path 
| grep site-lisp | sed '2,$d'`
-fi
-if test "x$lisp_dir" = x
-then
-       { echo "$as_me:$LINENO: result: no site-lisp" >&5
-echo "${ECHO_T}no site-lisp" >&6; }
-       echo "  ERROR: could not find site-lisp directory in load-path."
-       echo "  Specify destination for lisp file with 
--with-lisp-dir=/your/path"
-       exit 1
-fi
-{ echo "$as_me:$LINENO: result: $lisp_dir" >&5
-echo "${ECHO_T}$lisp_dir" >&6; }
-if $prefix_specified
-then
-       if test "x$withval" = x
-       then
-               echo "  WARNING: you gave a prefix of $prefix, but emacs wants 
lisp"
-               echo "  code in $lisp_dir and so that's where it will be 
installed."
-               echo "  (Currently --prefix doesn't change where lisp code 
goes.)"
-               echo "  If you want to force it under your prefix,"
-               echo "  then specify the configure option 
--with-lisp-dir=$prefix/whatever"
-       fi
-fi
-if test -w "$lisp_dir" -o ! -d "$lisp_dir"
-then
-       :
-else
-       echo "  WARNING: You do not have write permissions to $lisp_dir."
-       echo "  (Where the lisp code will be installed.)"
-       echo "  Please do make install with more privileges (as root?),"
-       echo "  fix permissions on the directory,"
-       echo "  or specify a writable destination with 
--with-lisp-dir=/your/path."
-fi
-
-
-{ echo "$as_me:$LINENO: checking script install directory" >&5
-echo $ECHO_N "checking script install directory... $ECHO_C" >&6; }
-
-{ echo "$as_me:$LINENO: result: $datadir/$package" >&5
-echo "${ECHO_T}$datadir/$package" >&6; }
-tdatadir=`eval "echo $datadir"`
-if test -w "$tdatadir" -o ! -d "$tdatadir"
-then
-       :
-else
-       echo "  WARNING:  You do not have write permissions to $datadir 
($tdatadir)."
-       echo "  (The program scripts will be installed in $datadir/$package.)"
-       echo "  Please do make install with more priviledges (as root?),"
-       echo "  fix permissions on the directory,"
-       echo "  or specify a writable destination with --datadir=/your/path."
-fi
-{ echo "$as_me:$LINENO: checking info install directory" >&5
-echo $ECHO_N "checking info install directory... $ECHO_C" >&6; }
-
-{ echo "$as_me:$LINENO: result: $infodir" >&5
-echo "${ECHO_T}$infodir" >&6; }
-tinfodir=`eval "echo $infodir"`
-if test -w "$tinfodir" -o ! -d "$tinfodir"
-then
-       :
-else
-       echo "  WARNING: You do not have write permissions to $infodir 
($tinfodir)."
-       echo "  (Where the info documentation will be put.)"
-       echo "  Please do make install with more priviledges (as root?),"
-       echo "  fix permissions on the directory,"
-       echo "  or specify a writable destination with --infodir=/your/path."
-fi
-# Extract the first word of "install-info", so it can be a program name with 
args.
-set dummy install-info; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_install_info+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $install_info in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_install_info="$install_info" # Let the user override the test 
with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="$PATH:/sbin:/usr/sbin"
-for as_dir in $as_dummy
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_install_info="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_install_info" && ac_cv_path_install_info="no"
-  ;;
-esac
-fi
-install_info=$ac_cv_path_install_info
-if test -n "$install_info"; then
-  { echo "$as_me:$LINENO: result: $install_info" >&5
-echo "${ECHO_T}$install_info" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-install_info_section='--section=Emacs'
-if test x"$install_info" = xno
-then
-       echo "  WARNING: Could not find install-info."
-       echo "  you will need to add notes-info.info to"
-       echo "  master file ($infodir/dir) manually."
-else
-               { echo "$as_me:$LINENO: checking debian install-info" >&5
-echo $ECHO_N "checking debian install-info... $ECHO_C" >&6; }
-       if $install_info --version 2>&1 |grep 'Ian Jackson' >/dev/null
-       then
-               install_info=no
-               echo "  WARNING: You appear to have the Debian install info."
-               echo "  Their install-info 1.10.21 has an incompatible usage of 
--section."
-               echo "  Please get them to fix this problem."
-               echo "  For now, I will install without specifying a section"
-               install_info_section=''
-       else
-               :
-       fi
-fi
-
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in 
\"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" 
\"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x 
"$as_dir/$ac_prog$ac_exec_ext"; }; then
-         if test $ac_prog = install &&
-           grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # AIX install.  It has an incompatible calling convention.
-           :
-         elif test $ac_prog = install &&
-           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # program-specific install script used by HP pwplus--don't use.
-           :
-         else
-           ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-           break 3
-         fi
-       fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; 
do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains 
a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-       "s/'/'\\\\''/g;
-         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-t clear
-:clear
-s/^[    ]*#[    ]*define[       ][      ]*\([^  (][^    (]*([^)]*)\)[   
]*\(.*\)/-D\1=\2/g
-t quote
-s/^[    ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   
]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[     `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
-       g
-       s/^\n//
-       s/\n/ /g
-       p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""       $as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file 
name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX 
shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-       case $1 in
-        -*)set "./$1";;
-       esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-       ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 
'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-                  instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args 
\$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create 
--no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-package!$package$ac_delim
-emacsbin!$emacsbin$ac_delim
-perlbin!$perlbin$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-lisp_dir!$lisp_dir$ac_delim
-install_info!$install_info$ac_delim
-install_info_section!$install_info_section$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[         ]*VPATH[        ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[    ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[      ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-        # (if the path is not absolute).  The absolute path cannot be 
DOS-style,
-        # because $ac_f cannot contain `:'.
-        test -f "$ac_f" ||
-          case $ac_f in
-          [\\/$]*) false;;
-          *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-          esac ||
-          { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-         echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$ac_file" : 'X\(//\)[^/]' \| \
-        X"$ac_file" : 'X\(//\)$' \| \
-        X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$as_dir" : 'X\(//\)[^/]' \| \
-        X"$as_dir" : 'X\(//\)$' \| \
-        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create 
directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the 
--datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir 
setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[         ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z 
"$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the 
variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable 
\`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-
-
-
-  esac
-
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/configure.in b/configure.in
deleted file mode 100644
index a86b938..0000000
--- a/configure.in
+++ /dev/null
@@ -1,157 +0,0 @@
-
-dnl
-dnl notes-mode configure.in
-dnl Copyright (C) 1997-1998 by John Heidemann <johnh@isi.edu>
-dnl
-
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(mkindexcache)
-
-AC_SUBST(package)
-package=notes-mode
-
-dnl
-dnl Find emacs
-dnl
-AC_CHECK_PROGS(emacsbin, emacs gemacs xemacs)
-
-dnl
-dnl Find perl*.
-dnl
-AC_PATH_PROGS(perlbin, perl perl5, no)
-perl_vers=`$perlbin -e 'print $]'`
-case $perl_vers in
-[1234].*) perlbin=no;;
-esac
-if test "$perlbin" = no; then
-  AC_MSG_ERROR($package requires perl 5.0 or later.)
-fi
-
-dnl
-dnl mkdir -p
-dnl
-AC_MSG_CHECKING([mkdir -p])
-if mkdir -p /tmp/mkdir.$$
-then
-  mkdir_p="mkdir -p "
-  rmdir /tmp/mkdir.$$
-  AC_MSG_RESULT($mkdir_p)
-elif test -x ./install-sh
-then
-  mkdir_p="./install-sh -d "
-  AC_MSG_RESULT($mkdir_p)
-else
-  AC_MSG_RESULT([none found])
-  AC_MSG_WARN([  Couldn't find mkdir -p.  You may have to manually mkdir some 
directories.])
-  mkdir_p="mkdir "
-fi
-AC_SUBST(mkdir_p)
-
-dnl
-dnl Generic things
-dnl
-AC_SUBST(prefix)
-prefix_specified=true
-if test "x$prefix" = xNONE -o "x$prefix" = xnone
-then
-       # hack for install purposes
-       prefix=/usr/local
-       prefix_specified=false
-fi
-
-dnl
-dnl Find lisp install
-dnl
-AC_MSG_CHECKING(lisp installation directory)
-AC_ARG_WITH(lisp-dir,  --with-lisp-dir=path  specify a path for where to 
install .el files,lisp_dir=$withval,lisp_dir="")
-if test x$lisp_dir = x
-then
-       lisp_dir=`$emacsbin -batch -q -l notes-bootstrap.el -f notes-load-path 
| grep site-lisp | sed '2,$d'`
-fi
-if test "x$lisp_dir" = x
-then
-       AC_MSG_RESULT(no site-lisp)
-       echo "  ERROR: could not find site-lisp directory in load-path."
-       echo "  Specify destination for lisp file with 
--with-lisp-dir=/your/path"
-       exit 1
-fi
-AC_MSG_RESULT($lisp_dir)
-if $prefix_specified
-then
-       if test "x$withval" = x
-       then
-               echo "  WARNING: you gave a prefix of $prefix, but emacs wants 
lisp"
-               echo "  code in $lisp_dir and so that's where it will be 
installed."
-               echo "  (Currently --prefix doesn't change where lisp code 
goes.)"
-               echo "  If you want to force it under your prefix,"
-               echo "  then specify the configure option 
--with-lisp-dir=$prefix/whatever"
-       fi
-fi
-if test -w "$lisp_dir" -o ! -d "$lisp_dir"
-then
-       :
-else
-       echo "  WARNING: You do not have write permissions to $lisp_dir."
-       echo "  (Where the lisp code will be installed.)"
-       echo "  Please do make install with more privileges (as root?),"
-       echo "  fix permissions on the directory,"
-       echo "  or specify a writable destination with 
--with-lisp-dir=/your/path."
-fi
-AC_SUBST(lisp_dir)
-
-AC_MSG_CHECKING(script install directory)
-AC_SUBST(datadir)
-AC_MSG_RESULT($datadir/$package)
-tdatadir=`eval "echo $datadir"`
-if test -w "$tdatadir" -o ! -d "$tdatadir"
-then
-       :
-else
-       echo "  WARNING:  You do not have write permissions to $datadir 
($tdatadir)."
-       echo "  (The program scripts will be installed in $datadir/$package.)"
-       echo "  Please do make install with more priviledges (as root?),"
-       echo "  fix permissions on the directory,"
-       echo "  or specify a writable destination with --datadir=/your/path."
-fi
-AC_MSG_CHECKING(info install directory)
-AC_SUBST(infodir)
-AC_MSG_RESULT($infodir)
-tinfodir=`eval "echo $infodir"`
-if test -w "$tinfodir" -o ! -d "$tinfodir"
-then
-       :
-else
-       echo "  WARNING: You do not have write permissions to $infodir 
($tinfodir)."
-       echo "  (Where the info documentation will be put.)"
-       echo "  Please do make install with more priviledges (as root?),"
-       echo "  fix permissions on the directory,"
-       echo "  or specify a writable destination with --infodir=/your/path."
-fi
-dnl install-info
-AC_PATH_PROG(install_info, install-info, no, $PATH:/sbin:/usr/sbin)
-install_info_section='--section=Emacs'
-if test x"$install_info" = xno
-then
-       echo "  WARNING: Could not find install-info."
-       echo "  you will need to add notes-info.info to"
-       echo "  master file ($infodir/dir) manually."
-else
-       dnl detect debian install-info
-       AC_MSG_CHECKING(debian install-info)
-       if $install_info --version 2>&1 |grep 'Ian Jackson' >/dev/null
-       then
-               install_info=no
-               echo "  WARNING: You appear to have the Debian install info."
-               echo "  Their install-info 1.10.21 has an incompatible usage of 
--section."
-               echo "  Please get them to fix this problem."
-               echo "  For now, I will install without specifying a section"
-               install_info_section=''
-       else
-               :
-       fi
-fi
-AC_SUBST(install_info_section)
-
-AC_PROG_INSTALL
-
-AC_OUTPUT(Makefile)
diff --git a/dir b/dir
new file mode 100644
index 0000000..8f1258f
--- /dev/null
+++ b/dir
@@ -0,0 +1,20 @@
+Ceci est le fichier .../info/dir, lequel contient le noeud 
+le plus haut dans la hiérarchie Info, noeud appelé (dir)Top.
+La première fois que Info est invoqué, vous démarrez la recherche 
+à partir de ce noeud.
+
+File: dir,     Node: Top       Ceci est le haut de l'arborescence INFO
+
+  Ceci (le noeud Répertoire) fournit un menu des sujets majeurs.
+  Taper « q » pour quitter, « ? » pour lister toutes les commandes Info,
+  « d » pour revenir à cet endroit,
+  « h » fournit un guide d'initiation pour les nouveaux venus,
+  « mEmacs<Return> » démarre une consultation du manuel Emacs, etc.
+
+  En Emacs, vous pouvez cliquer avec le bouton-2 de la souris sur un item menu 
+  ou sur une référence croisée pour le sélectionner.
+
+* Menu:
+
+Emacs
+* Notes-mode: (notes-mode).     Organizing on-line note-taking.
diff --git a/install-sh b/install-sh
deleted file mode 100755
index 89fc9b0..0000000
--- a/install-sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-tranformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-       -c) instcmd="$cpprog"
-           shift
-           continue;;
-
-       -d) dir_arg=true
-           shift
-           continue;;
-
-       -m) chmodcmd="$chmodprog $2"
-           shift
-           shift
-           continue;;
-
-       -o) chowncmd="$chownprog $2"
-           shift
-           shift
-           continue;;
-
-       -g) chgrpcmd="$chgrpprog $2"
-           shift
-           shift
-           continue;;
-
-       -s) stripcmd="$stripprog"
-           shift
-           continue;;
-
-       -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-           shift
-           continue;;
-
-       -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-           shift
-           continue;;
-
-       *)  if [ x"$src" = x ]
-           then
-               src=$1
-           else
-               # this colon is to work around a 386BSD /bin/sh bug
-               :
-               dst=$1
-           fi
-           shift
-           continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-       echo "install:  no input file specified"
-       exit 1
-else
-       true
-fi
-
-if [ x"$dir_arg" != x ]; then
-       dst=$src
-       src=""
-       
-       if [ -d $dst ]; then
-               instcmd=:
-       else
-               instcmd=mkdir
-       fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-       if [ -f $src -o -d $src ]
-       then
-               true
-       else
-               echo "install:  $src does not exist"
-               exit 1
-       fi
-       
-       if [ x"$dst" = x ]
-       then
-               echo "install:  no destination specified"
-               exit 1
-       else
-               true
-       fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-       if [ -d $dst ]
-       then
-               dst="$dst"/`basename $src`
-       else
-               true
-       fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='   
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-       pathcomp="${pathcomp}${1}"
-       shift
-
-       if [ ! -d "${pathcomp}" ] ;
-        then
-               $mkdirprog "${pathcomp}"
-       else
-               true
-       fi
-
-       pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-       $doit $instcmd $dst &&
-
-       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-       if [ x"$transformarg" = x ] 
-       then
-               dstfile=`basename $dst`
-       else
-               dstfile=`basename $dst $transformbasename | 
-                       sed $transformarg`$transformbasename
-       fi
-
-# don't allow the sed command to completely eliminate the filename
-
-       if [ x"$dstfile" = x ] 
-       then
-               dstfile=`basename $dst`
-       else
-               true
-       fi
-
-# Make a temp file name in the proper directory.
-
-       dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-       $doit $instcmd $src $dsttmp &&
-
-       trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-       $doit $rmcmd -f $dstdir/$dstfile &&
-       $doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/mkall b/mkall
index d22a56c..f2ec8b6 100755
--- a/mkall
+++ b/mkall
@@ -6,7 +6,7 @@
 # mkall
 # $Id: mkall,v 1.18 2007/02/23 05:14:59 johnh Exp $
 #
-# Copyright (C) 1996 by John Heidemann.
+# Copyright (C) 1996,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License, version 2.
@@ -24,7 +24,7 @@ END
 
 
 require 5.000;
-BEGIN { unshift(@INC, "/home/johnh/NOTES/BIN"); };
+BEGIN { unshift(@INC, $ENV{'NOTES_BIN_DIR'}); };
 use NotesVars;
 use strict;
 use Config;
diff --git a/mkconfig b/mkconfig
index 84e66cc..637ca56 100755
--- a/mkconfig
+++ b/mkconfig
@@ -4,7 +4,7 @@
 # mkconfig
 # $Id: mkconfig,v 1.10 2003/05/23 16:26:30 johnh Exp $
 #
-# Copyright (C) 1996 by John Heidemann.
+# Copyright (C) 1996,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License, version 2.
@@ -32,8 +32,7 @@ my($home_dir) = ((getpwuid($<))[7]);
 
 my(%defaults) = (
     'dir'      => ['path', '~/NOTES'],
-    'bin_dir'  => ['path', '/home/johnh/NOTES/BIN'],
-    'lisp_dir' => ['path', '/home/johnh/LIB/EMACS'],
+    'bin_dir'  => ['path', "$ENV{'NOTES_BIN_DIR'}"],
     'int_form' => ['form', '%Y%m'],
     'file_form'        => ['form', '%y%m%d'],
     );
diff --git a/mkindex b/mkindex
index 2ec8ae5..e184875 100755
--- a/mkindex
+++ b/mkindex
@@ -4,7 +4,7 @@
 # mkindex
 # $Id: mkindex,v 1.9 2003/05/23 16:26:33 johnh Exp $
 #
-# Copyright (C) 1994-1996 by John Heidemann.
+# Copyright (C) 1994-1996,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License.
diff --git a/mkindexcache b/mkindexcache
index 7f58689..6d8f391 100755
--- a/mkindexcache
+++ b/mkindexcache
@@ -4,7 +4,7 @@
 # mkindexcache
 # $Id: mkindexcache,v 1.12 2008/08/08 17:41:14 johnh Exp $
 #
-# Copyright (C) 1994-2006 by John Heidemann.
+# Copyright (C) 1994-2006,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License.
diff --git a/mknew b/mknew
index 6a32996..3df1ae8 100755
--- a/mknew
+++ b/mknew
@@ -4,7 +4,7 @@
 # mknew
 # $Id: mknew,v 1.19 2006/01/14 18:28:41 johnh Exp $
 #
-# Copyright (C) 1996 by John Heidemann.
+# Copyright (C) 1996,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License, version 2.
@@ -46,7 +46,7 @@ END
 
 require 5.000;
 use File::Basename;
-BEGIN { unshift (@INC, "/home/johnh/NOTES/BIN"); };
+BEGIN { unshift(@INC, $ENV{'NOTES_BIN_DIR'}); };
 use NotesVars;
 use Notes;
 use POSIX qw(strftime);
diff --git a/mkprevnext b/mkprevnext
index 0297570..5e65149 100755
--- a/mkprevnext
+++ b/mkprevnext
@@ -4,7 +4,7 @@
 # mkprevnext
 # $Id: mkprevnext,v 1.22 2007/02/23 05:15:17 johnh Exp $
 #
-# Copyright (C) 1994-1996 by John Heidemann.
+# Copyright (C) 1994-1996,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License.
diff --git a/mkrawindex b/mkrawindex
index b1777fb..09c2eb6 100755
--- a/mkrawindex
+++ b/mkrawindex
@@ -4,7 +4,7 @@
 # mkrawindex -- index notes files
 # $Id: mkrawindex,v 1.17 2007/02/24 01:25:08 johnh Exp $
 #
-# Copyright (C) 1994-2006 by John Heidemann.
+# Copyright (C) 1994-2006,2012  Free Software Foundation, Inc.
 # Comments to <johnh@isi.edu>.
 #
 # This file is under the Gnu Public License, version 2.
@@ -32,7 +32,7 @@ END
 #      sed 's:/h/local/users/johnh:~:' >index
 
 require 5.000;
-BEGIN { unshift(@INC, "/home/johnh/NOTES/BIN"); };
+BEGIN { unshift(@INC, $ENV{'NOTES_BIN_DIR'}); };
 use Notes;
 use NotesVars;
 
diff --git a/notes-aux.el b/notes-aux.el
index 8b5e62e..a7575e2 100644
--- a/notes-aux.el
+++ b/notes-aux.el
@@ -1,86 +1,40 @@
+;;; notes-aux.el --- Auxiliary functions for notes-mode and friends
 
-;;;
-;;; notes-aux.el
-;;; auxiliary functions for notes-mode and friends
-;;; $Id: notes-aux.el,v 1.10 2000/03/24 21:36:33 johnh Exp $
-;;;
-;;; Copyright (C) 1994,1995,1998 by John Heidemann
-;;; Comments to <johnh@isi.edu>.
-;;;
-;;; This file is under the Gnu Public License, version 2.
-;;;
+;; Copyright (C) 1994,1995,1998,2012  Free Software Foundation, Inc.
 
-
-;;;
-;;; generic-{beginning,end}-of-defun
-;;; I use in tex-mode and notes-mode
-;;;
+;; Author: <johnh@isi.edu>.
 
-;;;###autoload
-(defun generic-beginning-of-defun (regexp)
-  "* Go to the beginning of defun identified by REGEXP."
-  (re-search-backward regexp 0 'to-limit)
-)
-
-;;;###autoload
-(defun generic-end-of-defun (regexp)
-  "* Go to the end of defun identified by REGEXP."
-  (let
-      ((restore-point (point)))
-    (if (looking-at regexp)
-       (goto-char (match-end 0)))
-    ;; find next section and leave cursor at section beginning
-    (if (re-search-forward regexp (point-max) 'to-limit)
-       (re-search-backward regexp 0 t)
-      ;(goto-char restore-point)
-      ))
-)
+;; This file is part of GNU Emacs.
 
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;;;###autoload
-(defun match-substring (string count &optional default empty-default)
-  "Given STRING, return the COUNT-th element from the last match.
-Returns DEFAULT if there is no such match,
-or if the match is empty and EMPTY-DEFAULT is non-nil."
-  (if (and (match-beginning count)
-          (or (not empty-default)
-              (> (match-end count) (match-beginning count))))
-      (substring string (match-beginning count) (match-end count))
-    default))
-
-
-;;;
-;;; get-{beginning,end}-of-line
-;;; Simple functions for a simple world.
-;;;
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
 
-;;;###autoload
-(defun get-beginning-of-line ()
-  "Return the boln as a position."
-  (save-excursion
-    (beginning-of-line)
-    (point)))
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;;###autoload
-(defun get-end-of-line ()
-  "Return the boln as a position."
-  (save-excursion
-    (end-of-line)
-    (point)))
+;;; Commentary:
 
+;;; Code:
 
 ;;;###autoload
-;(defun notes-format-date (&optional calendar-date)
-;  "Format the calendar-date-style DATE up to be a notes-format date.
-;If no DATE is specified, use today's date."
-;  (require 'calendar)
-;  (let* ((date (if calendar-date
-;                 calendar-date
-;               (calendar-current-date)))
-;       (month (car date))
-;       (day (nth 1 date))
-;       (year (nth 2 date)))
-;    (format "%02d%02d%02d" (- year 1900) month day)))
+;;(defun notes-format-date (&optional calendar-date)
+;;  "Format the calendar-date-style DATE up to be a notes-format date.
+;;If no DATE is specified, use today's date."
+;;  (require 'calendar)
+;;  (let* ((date (if calendar-date
+;;                calendar-date
+;;              (calendar-current-date)))
+;;      (month (car date))
+;;      (day (nth 1 date))
+;;      (year (nth 2 date)))
+;;    (format "%02d%02d%02d" (- year 1900) month day)))
 (defun notes-format-date (&optional time)
   "Format the TIME up to be a notes-format date.
 If no TIME is specified, use today's date."
@@ -90,12 +44,12 @@ If no TIME is specified, use today's date."
   (format-time-string notes-file-form time))
 
 (defun notes-file-to-epoch (file)
-  "* Convert a notes FILE to an epoch time."
+  "Convert a notes FILE to an epoch time."
   (string-match notes-file-regexp file)
   (let
-      ((y (string-to-int (substring file (match-beginning 1) (match-end 1))))
-       (m (string-to-int (substring file (match-beginning 2) (match-end 2))))
-       (d (string-to-int (substring file (match-beginning 3) (match-end 3)))))
+      ((y (string-to-number (match-string 1 file)))
+       (m (string-to-number (match-string 2 file)))
+       (d (string-to-number (match-string 3 file))))
     (if (< y 1900)
        (setq y (+ y 1900)))
     (if (< y 1970)
@@ -103,7 +57,7 @@ If no TIME is specified, use today's date."
     (encode-time 0 0 12 d m y)))
 
 (defun notes-file-to-url (file &optional tag)
-  "* Convert a notes FILE to a URL with an optional TAG."
+  "Convert a notes FILE to a URL with an optional TAG."
   (let
       ((epoch (notes-file-to-epoch file)))
     (concat
@@ -115,3 +69,4 @@ If no TIME is specified, use today's date."
      tag)))
 
 (provide 'notes-aux)
+;;; notes-aux.el ends here
diff --git a/notes-bootstrap.el b/notes-bootstrap.el
deleted file mode 100644
index 7b009b3..0000000
--- a/notes-bootstrap.el
+++ /dev/null
@@ -1,23 +0,0 @@
-
-;;;
-;;; notes-bootstrap.el
-;;; $Id: notes-bootstrap.el,v 1.2 2000/06/03 17:23:29 johnh Exp $
-;;;
-;;; Copyright (C) 1997 by John Heidemann
-;;; Comments to <johnh@isi.edu>.
-;;;
-;;; This file is under the Gnu Public License.
-;;;
-
-(defun notes-load-path ()
-  "I couldn't get emacs -e '(princ load-path)' to work."
-  (interactive)
-  (mapcar
-   (function
-    (lambda (a)
-      (princ a)
-      (princ "\n")
-      ))
-   load-path)
-)
-
diff --git a/notes-emacs.el b/notes-emacs.el
index 5c1214b..6fd4874 100644
--- a/notes-emacs.el
+++ b/notes-emacs.el
@@ -1,44 +1,31 @@
+;;; notes-emacs.el --- Emacs compatibility functions
 
-;;;
-;;; notes-emacs.el
-;;; $Id: notes-emacs.el,v 1.3 2007/11/06 02:41:21 johnh Exp $
-;;;
-;;; Copyright (C) 1998 by John Heidemann
-;;; Comments to <johnh@isi.edu>.
-;;;
-;;; This file is under the Gnu Public License.
-;;;
+;; Copyright (C) 1998,2012  Free Software Foundation, Inc.
 
-;;
-;; (FSF) emacs-specific parts of notes-mode.
-;;
+;; Author: <johnh@isi.edu>
 
-(defun notes-platform-bind-mouse (map generic-key fn)
-  "Map emacs symbols (a no-op)."
-  (define-key map (vconcat (list generic-key)) fn))
-
-
-(defun notes-platform-font-lock (new-font-lock-keywords)
-  "Notes platform-specific font-lock mode."
-  (require 'font-lock)
-  (if (>= emacs-major-version 20)
-      (progn
-       ;; emacs-20
-       (make-local-variable 'font-lock-defaults)
-       (setq font-lock-defaults
-             (list
-              new-font-lock-keywords
-              t
-              nil
-              nil
-              'beginning-of-line)))
-    ;; emacs-19
-    (make-local-variable 'font-lock-no-comments)
-    (setq font-lock-no-comments t)
-    (make-local-variable 'font-lock-keywords)
-    (setq font-lock-keywords new-font-lock-keywords)
-    (font-lock-mode 1)))
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
 
+;;; Code:
+
+(defun notes-platform-bind-mouse (map generic-key fn)
+  "Map Emacs symbols (a no-op)."
+  (define-key map (vector generic-key) fn))
 
 (defun notes-platform-init ()
   "Init platform-specific stuff for notes-mode."
@@ -49,6 +36,4 @@
        (copy-face 'bold notes-bold-face))))
 
 (provide 'notes-emacs)
-
-
-
+;;; notes-emacs.el ends here
diff --git a/notes-first.el b/notes-first.el
index 975c1e9..92c9c59 100644
--- a/notes-first.el
+++ b/notes-first.el
@@ -1,34 +1,49 @@
+;;; notes-first.el --- Setup notes-mode before first use
+
+;; Copyright (C) 2000-2006,2012  Free Software Foundation, Inc.
+
+;; Author: <johnh@isi.edu>.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; 
+
+;;; Code:
 
-;;;
-;;; notes-first.el
-;;; $Id: notes-first.el,v 1.5 2006/01/14 23:11:08 johnh Exp $
-;;;
-;;; Copyright (C) 2000-2006 by John Heidemann
-;;; Comments to <johnh@isi.edu>.
-;;;
-;;; This file is under the Gnu Public License, version 2.
-;;;
-
-;; This whole perl5 thing is because rms insists
-;; that the USER specify where perl is, not that configure
-;; do that at emacs build time.  Grumble.
 (defvar notes-first-perl5-binary "perl"
-  "Location of the perl binary to invoke notesinit.  (Must be perl v5.)")
+  "Location of the perl binary to invoke notesinit (must be perl v5).")
 
-;;;
 (defun notes-first-use-init ()
   "Set up notes mode for the first time for a new user."
   ;; note that we CAN'T assume the contents of notes-variables is loaded.
-  (if (y-or-n-p "Setup notes-mode with defaults ")
+  (if (y-or-n-p "Setup notes-mode with defaults? ")
       (notes-first-run-notes-init)
     (error (concat "Please run " notes-utility-dir "/notesinit by hand in a 
shell to customize defaults."))))
 
 ;; xxx: eventually we might do something more sophisticated here
 ;; (like asking the user questions directly).
 (defun notes-first-run-notes-init ()
-  "Run notesinit with defaults"
+  "Run notesinit with defaults."
   (let*
-      ((notes-init-cmd (concat notes-utility-dir "/notesinit")))
+      ((notes-init-cmd (expand-file-name "notesinit" notes-utility-dir))
+       (process-environment
+        (cons (concat "NOTES_BIN_DIR=" (directory-file-name notes-utility-dir))
+              process-environment)))
     (message (concat "Running \"" notes-first-perl5-binary notes-init-cmd "\" 
to set up notes-mode."))
     (call-process notes-first-perl5-binary nil nil nil notes-init-cmd "-D"))
   ;; ok, things are setup, but we want to lead the user to what to do next
@@ -36,4 +51,4 @@
   (message "Notes are now set up.  Run M-x notes-index-todays-link to start."))
 
 (provide 'notes-first)
-
+;;; notes-first.el ends here
diff --git a/notes-index-mode.el b/notes-index-mode.el
index 915d873..5d959ec 100644
--- a/notes-index-mode.el
+++ b/notes-index-mode.el
@@ -1,30 +1,43 @@
+;;; notes-index-mode.el --- Index manipulation for notes-mode
 
-;;;
-;;; notes-index-mode.el
-;;; $Id: notes-index-mode.el,v 1.32 2009/02/04 18:18:45 johnh Exp $
-;;;
-;;; Copyright (C) 1994-1998 by John Heidemann
-;;; Comments to <johnh@isi.edu>.
-;;;
-;;; This file is under the Gnu Public License.
-;;;
+;; Copyright (C) 1994-1998,2012  Free Software Foundation, Inc.
+
+;; Author: <johnh@isi.edu>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
 
 (require 'notes-variables)
 (require 'notes-aux)
 
 
-(defvar notes-index-mode-map nil)
-(if notes-index-mode-map
-    nil
-  (setq notes-index-mode-map (make-sparse-keymap))
-  ;; There were bindings to make mouse-1 do pointer following,
-  ;; but I removed it because all the rest of emacs uses mouse-2.
-  ;; If you want them, add them with notes-index-mode-hook.
-  (notes-platform-bind-mouse notes-index-mode-map 'mouse-2 
'notes-index-mouse-follow-link)
-  (notes-platform-bind-mouse notes-index-mode-map 'S-mouse-2 
'notes-index-mouse-follow-link-other-window)
-  (define-key notes-index-mode-map "\r" 'notes-index-follow-link)
-  (define-key notes-index-mode-map "o" 'notes-index-link)
-  )
+(defvar notes-index-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; There were bindings to make mouse-1 do pointer following,
+    ;; but I removed it because all the rest of emacs uses mouse-2.
+    ;; If you want them, add them with notes-index-mode-hook.
+    (notes-platform-bind-mouse map 'mouse-2 'notes-index-mouse-follow-link)
+    (notes-platform-bind-mouse map 'S-mouse-2 
'notes-index-mouse-follow-link-other-window)
+    (define-key map "\r" 'notes-index-follow-link)
+    (define-key map "\C-c\C-s" 'notes-summarize-subject)
+    (define-key map "o" 'notes-index-link)
+    map))
 
 
 (defvar notes-index-lazy-message-old-time 0)
@@ -51,20 +64,19 @@ This routine works by calling either 
\[notes-index-parse-buffer-uncached]
 or \[notes-index-parse-buffer-cached] (if possible)."
   (interactive)
   (let
-      ((old-buffer-read-only buffer-read-only))
-    (setq buffer-read-only nil)
-    (if (and (file-exists-p (concat notes-dir "/index_cache.el"))
-            (file-newer-than-file-p (concat notes-dir "/index_cache.el")
-                                    (concat notes-dir "/index")))
+      ((inhibit-read-only t))
+    (if (and (file-exists-p (expand-file-name "index_cache.el" notes-dir))
+            (file-newer-than-file-p
+              (expand-file-name "index_cache.el" notes-dir)
+              (expand-file-name "index" notes-dir)))
        (progn
-         (load (concat notes-dir "/index_cache"))
+         (load (expand-file-name "index_cache" notes-dir))
          (notes-index-parse-buffer-cached))
       ;; cache miss
       (message "notes-index-parse-buffer: cache is not present or is not 
up-to-date")
       (notes-index-parse-buffer-uncached))
     ;; clean some things up
     (message "")
-    (setq buffer-read-only old-buffer-read-only)
     (set-buffer-modified-p nil)))
 
 (defun notes-index-parse-buffer-uncached ()
@@ -82,6 +94,7 @@ Tenses passive will be."
          end subject)
       ;; prepare the way
       (if notes-use-font-lock
+          ;; FIXME: That's quite drastic!  What is this trying to do?
          (set-text-properties (point-min) (point-max) nil))
       ;; There used to be problem that we used a fixed obarray length,
       ;; creating a lot of hash collisions.  Now we dynamically compute it
@@ -143,9 +156,7 @@ Returns the buffer position of a successful hit, or nil."
   (let (stop)
     (while (and (not stop)
                (funcall iter-proc end))
-      (if (funcall done-proc
-                  (buffer-substring (match-beginning 0) (match-end 0))
-                  done-arg)
+      (if (funcall done-proc (match-string 0) done-arg)
          (setq stop (goto-char (match-beginning 0)))))
     stop))
 
@@ -159,19 +170,19 @@ to DIRECTION (and the next one if DIRECTION is 'this)."
   (cond
    ((eq direction 'prev)
     (notes-index-date-search
-     (get-end-of-line) (get-beginning-of-line)
+     (line-end-position) (line-beginning-position)
      (function (lambda (end) (re-search-backward notes-file-regexp end t)))
      (function (lambda (trial target) (string-lessp trial target)))
      date))
    ((eq direction 'next)
     (notes-index-date-search
-     (get-beginning-of-line) (get-end-of-line)
+     (line-beginning-position) (line-end-position)
      (function (lambda (end) (re-search-forward notes-file-regexp end t)))
      (function (lambda (trial target) (string-lessp target trial)))
      date))
    (t
     (notes-index-date-search
-     (get-beginning-of-line) (get-end-of-line)
+     (line-beginning-position) (line-end-position)
      (function (lambda (end) (re-search-forward notes-file-regexp end t)))
      (function (lambda (trial target) (string-equal trial target)))
      date))))
@@ -201,12 +212,12 @@ and the new information is shown WHERE (either 
'otherwindow or not)."
       (setq start (point))
       (if (not (re-search-forward notes-file-regexp (+ (point) 6) t))
          (error "Not on notes-index-mode link."))
-      (setq date (buffer-substring (match-beginning 0) (match-end 0)))
+      (setq date (match-string 0))
       ;; pick out the tag
       (beginning-of-line)
       (if (not (re-search-forward "^\\([^:]*\\):" start t))
          (error "Not on notes-index-mode link line."))
-      (setq tag (buffer-substring (match-beginning 1) (match-end 1)))
+      (setq tag (match-string 1))
       ;; make and process the url
       (notes-index-link date tag where))))
 
@@ -226,12 +237,12 @@ and the new information is shown WHERE (either 
'otherwindow or not)."
   "Extract the notes-index subject for the current line."
   (save-excursion
     (beginning-of-line)
-    (if (re-search-forward "^\\(.*\\): " (get-end-of-line) t)
-       (buffer-substring (match-beginning 1) (match-end 1))
+    (if (re-search-forward "^\\(.*\\): " (line-end-position) t)
+       (match-string 1)
       nil)))
 
 ;;;###autoload
-(defun notes-index-mode ()
+(define-derived-mode notes-index-mode special-mode "Notes-index"
   "Notes-index-mode with mouse support.
 
 You may wish to change notes-bold-face and notes-use-font-lock.
@@ -242,24 +253,17 @@ which invokes notes-index-mode.
 
 Key bindings are:
 \\{notes-index-mode-map}"
-  (interactive)
-
   (notes-platform-init)
 
-  (setq buffer-read-only nil)
   (notes-index-parse-buffer)
-  (setq major-mode 'notes-index-mode
-       mode-name "Notes-index")
-  (use-local-map notes-index-mode-map)
-  (define-key notes-index-mode-map "\C-c\C-s" 'notes-summarize-subject)
 
-  (if notes-use-font-lock
-      (notes-platform-font-lock notes-index-font-lock-keywords))
+  (set (make-local-variable 'font-lock-defaults)
+       '(notes-index-font-lock-keywords
+         t nil nil beginning-of-line))
 
-  (run-mode-hooks 'notes-index-mode-hooks)
   ;; No editing is allowed.
   (setq buffer-read-only t)
 )
 
-(put 'notes-index-mode 'mode-class 'special)
 (provide 'notes-index-mode)
+;;; notes-index-mode.el ends here
diff --git a/notes-mode.el b/notes-mode.el
index e8ad735..0b37a49 100644
--- a/notes-mode.el
+++ b/notes-mode.el
@@ -1,13 +1,29 @@
+;;; notes-mode.el --- Indexing system for on-line note-taking
 
-;;;
-;;; notes-mode.el
-;;; $Id: notes-mode.el,v 1.71 2009/08/20 20:00:02 johnh Exp $
-;;;
-;;; Copyright (C) 1994-2007 by John Heidemann
-;;; Comments to <johnh@isi.edu>.
-;;;
-;;; This file is under the Gnu Public License.
-;;;
+;;; Copyright (C) 1994-2007,2012  Free Software Foundation, Inc.
+
+;; Author: <johnh@isi.edu>.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;; 
+
+;;; Code:
 
 (require 'notes-variables)
 (require 'notes-aux)
@@ -20,9 +36,9 @@
 (defconst notes-beginning-of-defun-regexp "^\\* .*\n\\-"
   "Regexp matching the beginning of notes section.")
 
-(defvar notes-default-tab-binding nil
+(defvar notes-default-tab-binding (global-key-binding "\t")
   "Saved tab binding for notes-complete-subject.")
-(defvar notes-default-return-binding nil
+(defvar notes-default-return-binding (global-key-binding "\r")
   "Saved return binding for notes-electric-return.")
 
 
@@ -39,12 +55,19 @@
       (goto-char old-point)
       (if (looking-at "^-")  ;; handle starting on the underline under a title
          (forward-char 1))
-      (generic-beginning-of-defun notes-beginning-of-defun-regexp))))
+      (re-search-backward notes-beginning-of-defun-regexp nil 'to-limit))))
 
 (defun notes-end-of-defun ()
   "Go to the end of a notes ``section''."
   (interactive)
-  (generic-end-of-defun notes-beginning-of-defun-regexp))
+  (let ((regexp notes-beginning-of-defun-regexp))
+    (if (looking-at regexp)
+        (goto-char (match-end 0)))
+    ;; Find next section and leave cursor at section beginning
+    (if (re-search-forward regexp nil 'to-limit)
+        (re-search-backward regexp 0 t)
+      ;;(goto-char restore-point)
+      )))
 
 (defun notes-follow-link (which)
   "Go to the WHICH link for this topic.
@@ -111,7 +134,7 @@ we go to the last note based upon the index file."
 (defvar notes-complete-subject-abbrevs-alist
   '(("SP2010" "USC/Classes/CS551/SP2010")
     ("FA2011" "USC/Classes/CS551/FA2011"))
-  "notes-complete-subject-abbrevs-alist provides simple substitution of 
subjects.
+  "Alist of simple substitution of subjects.
 If subject completion is requested, then subject that matches
 the left-side of an alist value is replaced by the right-side value.")
 
@@ -137,8 +160,8 @@ Currently this is just a hack."
        (call-interactively notes-default-tab-binding)
       ;; Complete the title.
       (if (null notes-subject-table)
-         (save-excursion
-           (find-file-noselect (concat notes-dir "/index"))))
+         (save-excursion ;; FIXME: Why??
+           (find-file-noselect (expand-file-name "index" notes-dir))))
       ;; Do completion.
       ;; Run completer if it's loaded,
       ;; otherwise do our own thing.
@@ -154,21 +177,21 @@ Currently this is just a hack."
                                       (if (stringp full-subject)
                                           full-subject
                                         subject)))
-       (delete-region (get-beginning-of-line) (get-end-of-line))
+       (delete-region (line-beginning-position) (line-end-position))
        (insert "* " (notes-complete-subject-abbrevs subject))))
        (setq completion-ignore-case old-completion-ignore-case))))
 
 (defun notes-fix-prevnext-this-entry ()
-  "* Fix up the prev link for the current entry,
-if necessary.  Currently this code only handles brand new entries."
+  "Fix up the prev link for the current entry, if necessary.
+Currently this code only handles brand new entries."
   ;; Contributed from Takashi Nishimoto <g96p0935@mse.waseda.ac.jp>.
   ;; Thanks!
   (interactive)
   (let ((subject (notes-extract-subject nil t))
         (this-url (notes-current-url))
         last-url)
-    (save-excursion
-      (set-buffer (find-file-noselect (concat notes-dir "/index")))
+    (with-current-buffer (find-file-noselect
+                          (expand-file-name "index" notes-dir))
       (goto-char (point-min))
       (if (re-search-forward
            (concat "^" (regexp-quote subject) ":.* \\([0-9]+\\)$")
@@ -208,7 +231,7 @@ if necessary.  Currently this code only handles brand new 
entries."
     (call-interactively notes-default-return-binding)))
 
 (defun notes-current-url ()
-  "* Returns the notes-URL of the current entry around the current point."
+  "Return the notes-URL of the current entry around the current point."
   (let ((subject (notes-extract-subject nil t))
        (date (file-name-nondirectory buffer-file-name)))
     (concat "<file:///"
@@ -292,7 +315,7 @@ Returns nil if we're not on as subject."
       (insert "\n\n"))))
 
 (defun notes-new-underline-line ()
-  "Underline a line with a row of dashes.  Moves the point after the dashes.
+  "Underline a line with a row of dashes.  Move point after the dashes.
 \\[notes-new-underline-line] reproduces leading spaces."
   (interactive)
   (let*
@@ -312,15 +335,15 @@ Returns nil if we're not on as subject."
   (save-excursion
     (save-excursion
       (forward-line 1)
-      (delete-region (get-beginning-of-line) (1+ (get-end-of-line))))
+      (delete-region (line-beginning-position) (1+ (line-end-position))))
     (notes-new-underline-line)))
 
 (defun notes-mode-initialize-note-from-cache ()
-  "Build a new note from the cache.  Returns valid cache contents or nil."
+  "Build a new note from the cache.  Return valid cache contents or nil."
   (save-excursion
     (let*
        ((new-buffer (current-buffer))
-        (cache-file (concat notes-dir "/mknew.cache"))
+        (cache-file (expand-file-name "mknew.cache" notes-dir))
         (buf (find-file cache-file))
         magic-line
         prev-file
@@ -380,16 +403,19 @@ Use the mknew cache if possible."
          (shell-command-on-region
           (point-min)
           (point-max)
-          (concat notes-bin-dir "/" notes-mode-initialization-program " '"
+          (concat (expand-file-name notes-mode-initialization-program
+                                     notes-bin-dir)
+                   " '"
+                   ;; FIXME: Use shell-quote-argument.
                   (buffer-file-name) "'") 't)))))
   
 
 ;;;
 ;;; encryption
-;;; requires "PEM - PGP Enhanced Messaging for GNU Emacs"
-;;; from Roy Frederick Busdiecker, III (Rick)
-;;; or mailcrypt 3.4.x or >=3.5.x
-;;;
+;; requires "PEM - PGP Enhanced Messaging for GNU Emacs"
+;; from Roy Frederick Busdiecker, III (Rick)
+;; or mailcrypt 3.4.x or >=3.5.x
+;;
 
 (defvar notes-encryption-library 
   'mailcrypt
@@ -397,11 +423,11 @@ Use the mknew cache if possible."
 ;   ((fboundp 'mc-encrypt-region) 'mailcrypt)
 ;   ((fboundp 'npgp:encrypt-region) 'npgp)
 ;   (t nil))
-  "what pgp library to use")
+  "PGP library to use.")
 
 (defvar notes-encryption-sub-library
   'gpg
-  "what variant of mailcrypt to use ('pgp 'pgp50 'gpg).")
+  "Variant of mailcrypt to use (`pgp', `pgp50', or `gpg').")
 
 (defvar notes-encryption-npgp-userid nil
   "PGP key for the current user.")
@@ -578,7 +604,8 @@ Should have a leading 0x.")
       ((buf (get-buffer-create (concat "*notes on " subject "*"))))
     (pop-to-buffer buf)
     (erase-buffer)
-    (apply 'call-process (concat notes-bin-dir "/catsubject") nil buf t
+    (apply 'call-process (expand-file-name "catsubject" notes-bin-dir)
+           nil buf t
           (if regexp-subject
               (list "-m" subject)
             (list subject)))
@@ -609,27 +636,35 @@ Assumes working next/prev linkage between the entries."
 ;;; notes-mode
 ;;;
 
-;;
-;; This use of define-derived-mode is a crock---maybe
-;; it's better to eval it?
-;; suggestions are welcome.  ---johnh, 26-Oct-98
-;; 
-(if (fboundp 'indented-text-mode)
-    (define-derived-mode notes-mode indented-text-mode "Notes"
-      "See notes-mode-internal for documentation."
-      (notes-mode-internal))
-  (define-derived-mode notes-mode text-mode "Notes"
-      "See notes-mode-internal for documentation."
-    (notes-mode-internal)))
-
+(defvar notes-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; Random key-bindings.
+    (define-key map "\M-\C-a" 'notes-beginning-of-defun)
+    (define-key map "\M-\C-e" 'notes-end-of-defun)
+    (define-key map "\C-c\C-d" 'notes-decrypt-note)
+    (define-key map "\C-c\C-e" 'notes-encrypt-note)
+    (define-key map "\C-c\r" 'notes-w3-follow-link)
+    (define-key map "\C-c\C-p" 'notes-follow-prev-link)
+    (define-key map "\C-c\C-n" 'notes-follow-next-link)
+    (define-key map "\C-c\C-i" 'notes-goto-index-entry)
+    (define-key map "\C-c\C-k" 'notes-current-url-as-kill)
+    (define-key map "\C-c\C-s" 'notes-summarize-subject)
+    (define-key map "\C-c-" 'notes-underline-line)
+    ;; FIXME: Use completion-at-point-functions instead.
+    (define-key map "\t" 'notes-complete-subject)
+    ;; FIXME: Use post-self-insert-hook instead.
+    (define-key map "\r" 'notes-electric-return)
+    (define-key map "\n" 'notes-electric-return) ; a more common synonym
+    (notes-platform-bind-mouse map 'S-mouse-2 'notes-w3-follow-link-mouse)
+    map))
 
-(defun notes-mode-internal ()
+;;;###autoload
+(define-derived-mode notes-mode indented-text-mode "Notes"
   "Enable notes-mode for a buffer.
 
 Inside a notes buffer one can click on URLs and follow them to
 other notes files.
 
-Notes are fontified if notes-use-font-lock is set.
 See the file notes-variables.el for all customization options.
 To change options, (require 'notes-variables) in your .emacs
 and then change things.
@@ -639,10 +674,9 @@ and underlined with dashes.  Subjects can be completed
 with \\[notes-complete-subject] and are automatically underlined.
 
 You may wish to add this code to your .emacs file:
-    (setq auto-mode-alist
-       (cons (cons \"/9[0-9][0-9][0-9][0-9][0-9].?$\" 'notes-mode)
-             auto-mode-alist))
-    (define-key global-map \"\C-cn\" 'notes-index-todays-link)
+    (add-to-list 'auto-mode-alist
+       (cons \"/9[0-9][0-9][0-9][0-9][0-9].?\\\\'\" 'notes-mode))
+    (define-key global-map [?\\C-c ?n] 'notes-index-todays-link)
 to automatically enter notes mode.
 
 I have two suggestions for how to organize your notes files.
@@ -654,69 +688,30 @@ to easily move around the collection of files.
 
 The key-bindings of this mode are:
 \\{notes-mode-map}"
-  (interactive)  ;; just so documentation can come up
-
   (notes-platform-init)
 
-  ;; bug workaround:
-  ;; Emacs-19.30's define-derived-mode sets up a bogus syntax-table.
-  ;; (Evidence for the error is ``Wrong type argument: consp, nil''
-  ;; when typing in the buffer.)
-  ;;
-  ;; bug work-around 2:
-  ;; Klaus Zeitler <kzeitler@lucent.com>
-  ;; reports that the next line dies in emacs-21.1 with the error:
-  ;; "Attempt to make a chartable be its own parent".
-  ;; Work-around: more hackery.
-  (if (and (< emacs-major-version 21)
-          (or (>= emacs-major-version 20) (>= emacs-minor-version 30)))
-      (set-syntax-table (setq notes-mode-syntax-table text-mode-syntax-table)))
-
-  ;; now set up the mode
+  ;; Now set up the mode.
   (auto-fill-mode 1)
 
-  ;; random key-bindings
-  (define-key notes-mode-map "\M-\C-a" 'notes-beginning-of-defun)
-  (define-key notes-mode-map "\M-\C-e" 'notes-end-of-defun)
-  (define-key notes-mode-map "\C-c\C-d" 'notes-decrypt-note)
-  (define-key notes-mode-map "\C-c\C-e" 'notes-encrypt-note)
-  (define-key notes-mode-map "\C-c\r" 'notes-w3-follow-link)
-  (define-key notes-mode-map "\C-c\C-p" 'notes-follow-prev-link)
-  (define-key notes-mode-map "\C-c\C-n" 'notes-follow-next-link)
-  (define-key notes-mode-map "\C-c\C-i" 'notes-goto-index-entry)
-  (define-key notes-mode-map "\C-c\C-k" 'notes-current-url-as-kill)
-  (define-key notes-mode-map "\C-c\C-s" 'notes-summarize-subject)
-  (define-key notes-mode-map "\C-c-" 'notes-underline-line)
-  (if (null notes-default-tab-binding)
-      (setq notes-default-tab-binding (key-binding "\t")))
-  (define-key notes-mode-map "\t" 'notes-complete-subject)
-  (if (null notes-default-return-binding)
-      (setq notes-default-return-binding (key-binding "\r")))
-  (define-key notes-mode-map "\r" 'notes-electric-return)
-  (define-key notes-mode-map "\n" 'notes-electric-return) ; a more common 
synonym
-  (notes-platform-bind-mouse notes-mode-map 'S-mouse-2 
'notes-w3-follow-link-mouse)
-
-  ;; imenu stuff 
-  (make-variable-buffer-local 'imenu-prev-index-position-function)
-  (make-variable-buffer-local 'imenu-extract-index-name-function)
-  (setq imenu-prev-index-position-function 'notes-beginning-of-defun)
-  (setq imenu-extract-index-name-function 'notes-extract-subject)
-
-  (if notes-use-font-lock
-      (notes-platform-font-lock notes-font-lock-keywords))
-
-  ;; finally, try to fill in an empty note
-  (if (eq (point-min) (point-max))
+  ;; Imenu stuff.
+  (set (make-local-variable 'imenu-prev-index-position-function)
+       'notes-beginning-of-defun)
+  (set (make-local-variable 'imenu-extract-index-name-function)
+       'notes-extract-subject)
+
+  (set (make-local-variable 'font-lock-defaults)
+       `(notes-font-lock-keywords
+         t nil nil beginning-of-line))
+
+  ;; Finally, try to fill in an empty note.
+  (if (zerop (buffer-size))
       (notes-mode-initialize-note))
 
   ;; Enable outline-minor-mode (forcebly, in case someone already
   ;; has it in their text-mode hook).  Bug found by
   ;; Nils Ackermann <nils@nieback.de>.
   (if notes-use-outline-mode
-      (outline-minor-mode 1))
-
-  (delay-mode-hooks
-    (run-mode-hooks 'notes-mode-hooks)))
+      (outline-minor-mode 1)))
 
 
 
@@ -725,4 +720,4 @@ The key-bindings of this mode are:
 
 (run-hooks 'notes-mode-load-hooks)
 (provide 'notes-mode)
-
+;;; notes-mode.el ends here
diff --git a/notes-mode.info b/notes-mode.info
index db23880..6e9118e 100644
--- a/notes-mode.info
+++ b/notes-mode.info
@@ -1,5 +1,7 @@
-This is notes-mode.info, produced by makeinfo version 4.13 from 
notes-mode.texi.
+This is notes-mode.info, produced by makeinfo version 4.13 from
+notes-mode.texi.
 
+INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
 * Notes-mode: (notes-mode).         Organizing on-line note-taking.
 END-INFO-DIR-ENTRY
@@ -9,21 +11,19 @@ END-INFO-DIR-ENTRY
    This file documents notes-mode, a package for organizing on-line
 note-taking.
 
-   Copyright (C) 1994-1996 by John Heidemann
+   Copyright (C) 1994-1996,2012  Free Software Foundation, Inc.
 
-   Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.3 or any later version published by the Free Software
+     Foundation; with no Invariant Sections, with the Front-Cover texts
+     being "A GNU Manual", and with the Back-Cover Texts as in (a)
+     below.  A copy of the license is included in the section entitled
+     "GNU Free Documentation License".
 
-   Permission is granted to copy and distribute modified versions of
-this manual under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-   Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for modified
-versions, except that this permission notice may be stated in a
-translation approved by John Heidemann.
+     (a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+     modify this GNU manual.  Buying copies from the FSF supports it in
+     developing GNU and promoting software freedom."
 
 
 File: notes-mode.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: 
(dir)
@@ -538,12 +538,13 @@ four-digit year and the two-digit month  of the entries 
they contain.
 (The format of intermediate directories  is configurable, *Note
 Notes-mode configuration::.)  
 
-   Finally,  each intermediate directory are the notes files themselves,
-named according to the two-digit year, month, and day-of-month.  
+   Finally,  in each intermediate directory are the notes files
+themselves,  named according to the two-digit year, month, and
+day-of-month.  
 
    For the most part,  notes-mode will automatically maintain this
 organization of files,  once you create the top-level directory.
-Notes-mode will also automatically insure  that all files in the notes
+Notes-mode will also automatically ensure  that all files in the notes
 directory are unreadable by  anyone other than their owner.  Notes are
 personal things.  (This behavior is not currently configurable,  but it
 probably should be.)  
@@ -1191,9 +1192,9 @@ This index lists notes-mode concepts.
                                                                (line  6)
 * Notes entries:                         A notes file.         (line 10)
 * Notes file permissions:                The notes directories.
-                                                               (line 45)
+                                                               (line 46)
 * Notes files <1>:                       The notes directories.
-                                                               (line 38)
+                                                               (line 39)
 * Notes files:                           A notes file.         (line  6)
 * Notes files, font matter:              A notes file.         (line 55)
 * Notes index:                           The notes index.      (line  6)
@@ -1217,40 +1218,40 @@ This index lists notes-mode concepts.
 
 
 Tag Table:
-Node: Top1028
-Node: Introduction1953
-Node: What is it?2283
-Ref: What is it?-Footnote-13376
-Node: Why keep notes at all?3432
-Node: Why keep notes on-line?4217
-Ref: Why keep notes on-line?-Footnote-17770
-Ref: Why keep notes on-line?-Footnote-27946
-Ref: Why keep notes on-line?-Footnote-38185
-Node: Why use notes-mode?8284
-Ref: Why use notes-mode?-Footnote-19975
-Node: Y2K Statement10044
-Node: Related work10857
-Node: Staying on top11905
-Node: Basics12555
-Node: Getting started12861
-Node: A notes file14100
-Node: The notes index16843
-Node: The notes directories18095
-Node: Advanced Features19955
-Node: Notes files20215
-Node: Getting around20452
-Node: Subject summary21882
-Node: Encryption22218
-Node: Useful conventions23651
-Node: Notes indices25422
-Node: Notes-mode configuration25898
-Node: History26971
-Node: Notes-mode history27235
-Node: Credits28027
-Node: Changes29908
-Node: Suggested features39761
-Node: Installation40163
-Node: Keystroke index41103
-Node: Concept index42542
+Node: Top1063
+Node: Introduction1988
+Node: What is it?2318
+Ref: What is it?-Footnote-13411
+Node: Why keep notes at all?3467
+Node: Why keep notes on-line?4252
+Ref: Why keep notes on-line?-Footnote-17805
+Ref: Why keep notes on-line?-Footnote-27981
+Ref: Why keep notes on-line?-Footnote-38220
+Node: Why use notes-mode?8319
+Ref: Why use notes-mode?-Footnote-110010
+Node: Y2K Statement10079
+Node: Related work10892
+Node: Staying on top11940
+Node: Basics12590
+Node: Getting started12896
+Node: A notes file14135
+Node: The notes index16878
+Node: The notes directories18130
+Node: Advanced Features19994
+Node: Notes files20254
+Node: Getting around20491
+Node: Subject summary21921
+Node: Encryption22257
+Node: Useful conventions23690
+Node: Notes indices25461
+Node: Notes-mode configuration25937
+Node: History27010
+Node: Notes-mode history27274
+Node: Credits28066
+Node: Changes29947
+Node: Suggested features39800
+Node: Installation40202
+Node: Keystroke index41142
+Node: Concept index42581
 
 End Tag Table
diff --git a/notes-mode.ps.gz b/notes-mode.ps.gz
deleted file mode 100644
index c28e8a8..0000000
Binary files a/notes-mode.ps.gz and /dev/null differ
diff --git a/notes-mode.texi b/notes-mode.texi
index 454ecce..60382c2 100644
--- a/notes-mode.texi
+++ b/notes-mode.texi
@@ -1,11 +1,12 @@
 \input texinfo @c -*-texinfo-*-
 @c %**start of header
 @setfilename notes-mode.info
-@settitle Notes-mode
+@settitle Notes-mode:  Organizing on-line note-taking.
 @c For double-sided printing, uncomment:
 @c @setchapternewpage odd
 @c %**end of header
 
+@c FIXME: Figure out a way to keep these things up-to-date w/o RCS/CVS!
 @set EDITION $Revision: 1.40 $
 @c XXX: the next line should track the release file.
 @set VERSION 1.16
@@ -15,41 +16,37 @@
 @finalout
 @end iftex
 
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
+@dircategory Emacs
+@direntry
 * Notes-mode: (notes-mode).         Organizing on-line note-taking.
-END-INFO-DIR-ENTRY
-@end format
+@end direntry
+
+@c FIXME: The leading spaces lead to double spaces inside the
+@c generated .info file!
 
+@ifinfo
 Notes-mode:  Organizing on-line note-taking.
 
 This file documents notes-mode, a package
 for organizing on-line note-taking.
+@end ifinfo
 
-Copyright (C) 1994-1996 by John Heidemann
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
+@copying
+Copyright (C) 1994-1996,2012  Free Software Foundation, Inc.
 
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
+@quotation
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual'',
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
 
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by John Heidemann.
-@end ifinfo
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom.''
+@end quotation
+@end copying
 
 @titlepage
 @title Notes-mode
@@ -58,23 +55,6 @@ by John Heidemann.
 @subtitle @value{UPDATED}
 @author by John Heidemann
 
-@page
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1994-1996 by John Heidemann
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the entire
-resulting derived work is distributed under the terms of a permission
-notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions,
-except that this permission notice may be stated in a translation approved
-by John Heidemann.
 @end titlepage
 
 @node Top, Introduction, (dir), (dir)
@@ -817,14 +797,14 @@ Intermediate directories are named
 @cindex Intermediate directories
 
 Finally,
- each intermediate directory are the notes files themselves,
+ in each intermediate directory are the notes files themselves,
  named according to the two-digit year, month, and day-of-month.
 @cindex Notes files
 
 For the most part,
  notes-mode will automatically maintain this organization of files,
  once you create the top-level directory.
-Notes-mode will also automatically insure
+Notes-mode will also automatically ensure
  that all files in the notes directory are unreadable by
  anyone other than their owner.
 Notes are personal things.
@@ -1523,6 +1503,8 @@ are indexed but not date-based.
 @comment  node-name,  next,  previous,  up
 @chapter Installation
 
+@c FIXME: Out-of-date now that we install via package.el.
+
 To install notes-mode,
 
 @enumerate
diff --git a/notes-url.el b/notes-url.el
index 104b81a..407f644 100644
--- a/notes-url.el
+++ b/notes-url.el
@@ -1,24 +1,37 @@
+;;; notes-url.el --- Simplified url management routines for notes-mode
 
-;;;
-;;; notes-url.el
-;;; simplified url management routines for notes-mode
-;;; $Id: notes-url.el,v 1.29 2005/02/20 22:53:44 johnh Exp $
-;;;
-;;; Copyright (C) 1994-1998 by John Heidemann
-;;; Comments to <johnh@isi.edu>.
-;;;
-;;; This file is under the Gnu Public License.
-;;;
-;;; This code was originallly cribbed from w3.el
-;;; by William M. Perry <wmperry@indiana.edu>,
-;;; but has since been completely rewritten.
-;;;
-;;; Why don't I just call his code?  Because to use
-;;; w3-follow-link I need to pull in at least 150k of w3.el
-;;; and 150k of url.el, all just to open a file on the local
-;;; computer.  Instead I've hacked his code down to the 3k
-;;; needed for opening local files.
-;;;
+;;; Copyright (C) 1994-1998,2012  Free Software Foundation, Inc.
+
+;; Author: <johnh@isi.edu>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This code was originallly cribbed from w3.el
+;; by William M. Perry <wmperry@indiana.edu>,
+;; but has since been completely rewritten.
+;;
+;; Why don't I just call his code?  Because to use
+;; w3-follow-link I need to pull in at least 150k of w3.el
+;; and 150k of url.el, all just to open a file on the local
+;; computer.  Instead I've hacked his code down to the 3k
+;; needed for opening local files.
+
+;;; Code:
 
 (require 'notes-variables)
 (require 'notes-aux)
@@ -43,30 +56,30 @@ Other URLs it hands off to the routine in 
notes-w3-alternate-url
 for processing.  If you use w3-mode, then
     (setq notes-w3-alternate-url 'w3-follow-link)
 will have w3 handle tough URLs."
-  (if (string-match "^[Uu][Rr][Ll]:" url)
+  (if (string-match "\\`[Uu][Rr][Ll]:" url)
       (setq url (substring url 4)))
-  (if (not (string-match "^file://\\(localhost\\)?/\\(.*\\)$" url))
+  (if (not (string-match "\\`file://\\(localhost\\)?/\\(.*\\)\\'" url))
       (if (string-match "none" url)
          (error "Notes-mode can't follow URL <none>.")
        (funcall notes-w3-alternate-url url where)) ;; now, with where! 
(emacs-20.4)
-    (let ((filetag (match-substring url 2))
+    (let ((filetag (match-string 2 url))
          fname tag count count-string)
       ;; pick out the tag, if any
-      (if (string-match "^\\([^#]*\\)#\\([0-9]*\\)\\(.*\\)$" filetag)
-         (setq fname (match-substring filetag 1)
-               count-string (match-substring filetag 2 nil t)
-               count (if count-string (string-to-int count-string) 1)
-               tag (match-substring filetag 3))
+      (if (string-match "\\`\\([^#]*\\)#\\([0-9]+\\)?\\(.*\\)\\'" filetag)
+         (setq fname (match-string 1 filetag)
+               count-string (match-string 2 filetag)
+               count (if count-string (string-to-number count-string) 1)
+               tag (match-string 3 filetag))
        (setq fname filetag
              count 1
              tag nil))
       ;; Hack---url's refering to notes-index files have different tags.
       ;; Otherwise notes-goto-index-entry fails on subjects like "* 252A".
-      (if (and count-string tag (string-match "/index$" fname))
+      (if (and count-string tag (string-match "/index\\'" fname))
          (setq tag (concat count-string tag)
                count-string "1"
                count 1))
-      (if (not (string-match "^~" fname))   ; non-~ fnames start at fs root
+      (if (not (string-match "\\`~" fname))   ; non-~ fnames start at fs root
          (setq fname (concat "/" fname)))
       ;; open the file
       (cond
@@ -82,8 +95,7 @@ will have w3 handle tough URLs."
   (let ((result)
        (separators " /\t.:")
        (buf (get-buffer-create " *notes-w3-url-tag-backup")))
-    (save-excursion
-      (set-buffer buf)
+    (with-current-buffer buf
       (erase-buffer)
       (insert tag)
       (goto-char (point-max))
@@ -154,7 +166,7 @@ entries."
          (skip-chars-forward "<A-Za-z:"))
       ;; First look backwards to whitespace or beginning of line
       ;; followed by a url header "asdf:".
-      (if (re-search-backward "[ \t\n][^ \t\n]+:" (get-beginning-of-line) 1)
+      (if (re-search-backward "[ \t\n][^ \t\n]+:" (line-beginning-position) 1)
          (forward-char 1)          ; whitespace bound
        (setq quote-regexp "\n"))   ; eoln bound
       ;; Handle the common case of next/prev pointers.
@@ -162,7 +174,7 @@ entries."
       ;; follows.  (This hack is to support a guy who doesn't use
       ;; the mouse and so looks up urls at the beginning of the line.)
       (if (looking-at "\\(prev\\|next\\):")
-         (skip-chars-forward "^<" (get-end-of-line)))
+         (skip-chars-forward "^<" (line-end-position)))
       ;; Check for a quoting character.
       (cond
        ((equal (char-after (point)) ?<)
@@ -176,7 +188,7 @@ entries."
       ;; Remember start of url.
       (setq start (point))
       ;; Search for end of url.
-      (if (re-search-forward quote-regexp (get-end-of-line) 1)
+      (if (re-search-forward quote-regexp (line-end-position) 1)
          (forward-char -1))
       (setq end (point))
       ;; Interpret it (outside the save-excursion so we can go
@@ -194,6 +206,5 @@ entries."
                            'otherwindow
                          nil)))
 
-
-
-
+(provide 'notes-url)
+;;; notes-url.el ends here
diff --git a/notes-variables.el b/notes-variables.el
index 0f83ac2..de141c5 100644
--- a/notes-variables.el
+++ b/notes-variables.el
@@ -1,13 +1,25 @@
+;;; notes-variables.el --- Configuration variables for notes-mode
 
-;;;
-;;; notes-variables.el
-;;; $Id: notes-variables.el,v 1.30 2007/11/06 02:45:55 johnh Exp $
-;;;
-;;; Copyright (C) 1994-2000 by John Heidemann
-;;; Comments to <johnh@isi.edu>.
-;;;
-;;; This file is under the Gnu Public License, version 2.
-;;;
+;; Copyright (C) 1994-2000,2012  Free Software Foundation, Inc.
+
+;; Author: <johnh@isi.edu>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
 
 ;;
 ;; This file lists all parameters you might wish to change in
@@ -17,9 +29,11 @@
 ;;     (setq your-variable-to-change 'your-new value)
 ;;
 
+;;; Code:
+
 ;; xxx: if part of emacs, this should be probably be set to exec-directory (?)
-(defvar notes-utility-dir "/home/johnh/NOTES/BIN"
-  "Location of notes utility programs")
+(defconst notes-utility-dir (file-name-directory load-file-name)
+  "Location of notes utility programs.")
 
 ;;
 ;; Notice:  several notes parameters are defined in your
@@ -29,66 +43,57 @@
 ;;
 ;; To make this fast, we cache the configuration in a .notesrc.el
 ;; file.  We only have to invoke mkconfig when that file is out-of-date.
-;; This optimization is very important because notes-variables is 
+;; This optimization is very important because notes-variables is
 ;; required every time emacs is started.
 ;;
-(save-excursion
-  (if (null (file-exists-p (concat notes-utility-dir "/mkconfig")))
-      (progn
-       ;;
-       ;; A common user error is that people don't
-       ;; follow the installation instructions.
-       ;; Part of installation is chaning my local paths (with
-       ;; johnh in them) to whatever you use on your system.
-       ;; If the following error is triggered, it's probably
-       ;; because the user didn't RTFM (or even TF README)
-       ;; and just tried to run notes-mode in place.
-       ;; DON'T DO THAT!  Follow the installation instructions.
-       ;;
-       (error "notes-mode is incorrectly installed.  Consult the INSTALL 
section of README.")))
+(save-current-buffer
+  (if (null (file-exists-p (expand-file-name "mkconfig" notes-utility-dir)))
+      (error "Notes-mode is incorrectly installed."))
   (let*
       ((source-file (expand-file-name "~/.notesrc"))
-       (cache-file (expand-file-name "~/.notesrc.el"))
-       (cache-buf (set-buffer (find-file-noselect cache-file))))
-    (if (and 
+       (cache-file (expand-file-name "~/.notesrc.el")))
+    (if (and
         (not (file-exists-p source-file))
         (not noninteractive))
        (progn
          (require 'notes-first)
          (notes-first-use-init)))
-    (if (and  ; requirements for a valid cache-file
-        (file-exists-p cache-file)
-        (if (file-exists-p source-file)
-            (file-newer-than-file-p cache-file source-file)
-          t)
-        (file-newer-than-file-p cache-file (concat notes-utility-dir 
"/mkconfig")))
-       t ; cache is up-to-date
-      ;; otherwise, refresh the cache
-      (erase-buffer)
-      (call-process (concat notes-utility-dir "/mkconfig") nil t nil "elisp")
-      (save-buffer cache-buf)
-      (set-file-modes cache-file 420)) ; protect it => mode 0644
-    (eval-current-buffer)
-    (kill-buffer cache-buf)))
-
-
-(setq auto-mode-alist
-      (cons (cons
-            (concat notes-int-glob "/" notes-file-glob ".?$")
-            'notes-mode)
-           auto-mode-alist))
+    (with-temp-buffer
+      (if (and ;; Requirements for a valid cache-file.
+           (file-exists-p cache-file)
+           (if (file-exists-p source-file)
+               (file-newer-than-file-p cache-file source-file)
+             t)
+           (file-newer-than-file-p
+            cache-file (expand-file-name "mkconfig" notes-utility-dir)))
+          (insert-file-contents cache-file) ;; Cache is up-to-date.
+        ;; Otherwise, refresh the cache.
+        (call-process (expand-file-name "mkconfig" notes-utility-dir)
+                      nil t nil "elisp")
+        (write-region (point-min) (point-max) cache-file)
+        (set-file-modes cache-file #o644)) ;; Protect it => mode 0644.
+      (eval-buffer))))
+
+;; notes-int-glob and notes-file-glob should have been set in ~/.notesrc.el.
+(add-to-list 'auto-mode-alist
+             (cons
+              ;; FIXME: auto-mode-alist actually takes a regexp, not a glob.
+              ;; The default globs happen to fall within the intersection of
+              ;; regexps and globs, but we shouldn't rely on it!
+              (concat notes-int-glob "/" notes-file-glob ".?\\'")
+              'notes-mode))
 
 ;;; xxx: most of these should use defcustom or something similar, I presume.
 (defvar notes-w3-alternate-url 'browse-url
   "* A function to call when notes-w3-url cannot handle a complex URL.
-It now goes through the emacs browse-url package,
+It now goes through the Emacs `browse-url' package,
 but you could also set it manually (say, to w3-fetch).")
 
 (defvar notes-use-font-lock t
   "* Enable notes fontification.")
 
 (defvar notes-use-outline-mode t
-  "* Enable outline-minor-mode in all notes buffers?")
+  "* Enable `outline-minor-mode' in all notes buffers?")
 
 (defvar notes-index-fontify-dates nil
   "* Fontify dates in notes-index-mode.
@@ -137,77 +142,13 @@ nil: don't auto-update anything.
 1: update prevnext, but don't autosave the old buffer
 2: update prevnext and autosave the old buffer.")
 
-(defvar notes-running-xemacs (string-match "XEmacs\\|Lucid" emacs-version)
-  "*In XEmacs or Lucid Emacs?.")
-
-;;;
-;;; prep the load path using the notes-lisp-dir
-;;; code stolen from the auctex styles files (specifically tex-site.el)
-;;;            -- Kannan
-;;;               Wed Apr  7 09:40:27 EDT 1999
-;;;
-(if (boundp 'notes-lisp-dir)
-    (or (assoc notes-lisp-dir (mapcar 'list load-path)) ;No `member' yet.
-       (assoc (substring notes-lisp-dir 0 -1) ;Without trailing slash.
-              (mapcar 'list load-path))
-       (setq load-path (cons notes-lisp-dir load-path))))
-
-(if notes-running-xemacs
+(if (featurep 'xemacs)
     (require 'notes-xemacs)
   (require 'notes-emacs))
 
 (defvar notes-platform-inited nil
-  "Have we inited our platform (xemacs/emacs)?")
-
-;;;
-;;; autoloads
-;;;
-
-
-;;;### (autoloads (notes-index-mode) "notes-index-mode" "notes-index-mode.el" 
(12248 45843))
-;;; Generated autoloads from notes-index-mode.el
-
-(autoload (quote notes-index-mode) "notes-index-mode" "\
-Notes-index-mode with mouse support.
-
-You may wish to change notes-bold-face and notes-use-font-lock.
-
-Key bindings are:
-\\{notes-index-mode-map}" t nil)
-
-;;;###autoload
-(autoload (quote notes-index-todays-link) "notes-index-mode" "\
-* Open the notes file for today." t nil)
-
-;;;***
-
-;;;### (autoloads (notes-w3-follow-link-mouse notes-w3-follow-link 
notes-w3-file) "notes-url" "notes-url.el" (12248 46828))
-;;; Generated autoloads from notes-url.el
-
-(autoload (quote notes-w3-url) "notes-url" "\
-Find a link to an ftp site - simple transformation to ange-ftp format.
-Takes the URL as an argument.  Optionally you specify
-WHERE the information should appear (either 'otherwindow or not)." nil nil)
-
-(autoload (quote notes-w3-follow-link) "notes-url" "\
-* Follow the URL at the point.
-NEEDSWORK:  should handle (by ignoring) an optional \"URL:\" tag." t nil)
-
-(autoload (quote notes-w3-follow-link-mouse) "notes-url" "\
-* Follow the URL where the mouse is." t nil)
-
-;;;***
-
-
-;;;### (autoloads (notes-underline-line notes-end-of-defun 
notes-beginning-of-defun) "notes-mode" "notes-mode.el" (12250 9363))
-;;; Generated autoloads from notes-mode.el
-
-(autoload (quote notes-underline-line) "notes-mode" "\
-*Create a row of dashes as long as this line, or adjust the current 
underline." t nil)
-
-;;;***
-
-(autoload 'notes-mode "notes-mode" "autoloaded notes-mode" t nil)
+  "Have we inited our platform (XEmacs/Emacs)?")
 
 (run-hooks 'notes-variables-load-hooks)
 (provide 'notes-variables)
+;;; notes-variables.el ends here
diff --git a/notes-xemacs.el b/notes-xemacs.el
index 2d0cd53..a3cdfa3 100644
--- a/notes-xemacs.el
+++ b/notes-xemacs.el
@@ -1,20 +1,30 @@
+;;; notes-xemacs.el --- XEmacs compatibility functions
 
-;;;
-;;; notes-xemacs.el
-;;; $Id: notes-xemacs.el,v 1.2 1998/11/04 18:40:27 johnh Exp $
-;;;
-;;; Copyright (C) 1998 by John Heidemann
-;;; Comments to <johnh@isi.edu>.
-;;;
-;;; This file is under the Gnu Public License.
-;;;
+;;; Copyright (C) 1998,2012  Free Software Foundation, Inc.
 
-;;
-;; Xemacs-specific parts of notes-mode.
-;;
+;; Author: <johnh@isi.edu>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
 
 (defun notes-platform-bind-mouse (map generic-key fn)
-  "Map from (FSF) emacs symbols to xemacs for notes-mode.  (Sigh.)"
+  "Map from Emacs symbols to XEmacs for notes-mode (sigh)."
   (let
       ((xemacs-key
        (cond
@@ -22,14 +32,6 @@
         ((eq generic-key 'S-mouse-2) [(shift button2)]))))
     (define-key map xemacs-key fn)))
 
-
-(defun notes-platform-font-lock ()
-  "Notes platform-specific font-lock mode."
-  (require 'font-lock)
-  (make-local-variable 'font-lock-defaults)
-  (setq font-lock-defaults '(notes-font-lock-keywords nil)))
-
-
 (defun notes-platform-init ()
   "Init platform-specific stuff for notes-mode."
   (if notes-platform-inited
@@ -42,3 +44,4 @@
     ))
 
 (provide 'notes-xemacs)
+;;; notes-xemacs.el ends here
diff --git a/notesinit b/notesinit
index 521abc8..ab8eb47 100755
--- a/notesinit
+++ b/notesinit
@@ -2,7 +2,7 @@
 
 #
 # notesinit
-# Copyright (C) 1996-2002 by John Heidemann
+# Copyright (C) 1996-2002,2012  Free Software Foundation, Inc.
 # $Id: notesinit,v 1.12 2006/01/14 22:52:56 johnh Exp $
 #
 
@@ -32,7 +32,7 @@ my($PERL) = $^X;  # location of perl executable
 
 
 use POSIX;
-BEGIN { unshift(@INC, "/home/johnh/NOTES/BIN"); };
+BEGIN { unshift(@INC, $ENV{'NOTES_BIN_DIR'}); };
 use NotesVars;
 use strict;
 
@@ -115,7 +115,6 @@ It will take the following steps:
 3. index the default note
 4. set up a crontab entry to re-index notes at 4am every morning
     (by running mkall)
-5. add code to your .emacs file to load notes-mode
 
 END
 ($def_choices, $def) = ('(M/d/s)', 'm');
@@ -147,14 +146,13 @@ dir: $::notes{dir}
 END
 ");
 
-# yuck: the || on the commands is to handle old systems without mkdir -p
 $expl = "\n### 1. creating $::notes{dir}\n";
-commands($expl, "mkdir -p $::notes{dir_notilde} || mkdir 
$::notes{dir_notilde};\nchmod 0700  $::notes{dir_notilde}\n");
+commands($expl, "mkdir -p $::notes{dir_notilde};\nchmod 0700  
$::notes{dir_notilde}\n");
 
 my($heading) = strftime_epoch("%d-%b-%y %A", $now);
 my($underline) = "-" x length($heading);
 $expl = "\n### 2. create a sample note for today ($today_pathname)\n";
-commands($expl, "mkdir `dirname $today_pathname`;\n cat >$today_pathname <<END
+commands($expl, "mkdir -p `dirname $today_pathname`;\n cat >$today_pathname 
<<END
 
 $heading
 $underline
@@ -192,9 +190,6 @@ echo '$crontab_entry' >>$tmpfile;
 " . $::notes{bin_dir} . "/setcrontab $tmpfile
 rm -f $tmpfile");
 
-$expl = "\n### 5. add code to your .emacs file to load notes-mode\n";
-commands($expl, "grep notes-variables $home_dir/.emacs >/dev/null || echo 
\"(require 'notes-variables)\" >>$home_dir/.emacs");
-
 print "\n### changes end here\n" if (!$use_defaults);
 
 print "\nYou have elected to have the changes DESCRIBED but not made.\n" .
diff --git a/release b/release
index 9de53f1..57432cb 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-1.29
+1.30
diff --git a/setcrontab b/setcrontab
index 0ab3366..c811307 100755
--- a/setcrontab
+++ b/setcrontab
@@ -2,7 +2,7 @@
 
 #
 # setcrontab
-# Copyright (C) 1996 by John Heidemann
+# Copyright (C) 1996,2012  Free Software Foundation, Inc.
 # $Id: setcrontab,v 1.2 2002/01/03 04:35:18 johnh Exp $
 #
 
diff --git a/strftime.c b/strftime.c
deleted file mode 100644
index e093dc3..0000000
--- a/strftime.c
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/*
- * strftime.c
- * $Id: strftime.c,v 1.4 1999/01/28 19:26:29 johnh Exp $
- *
- * Copyright (C) 1996 by John Heidemann.
- * Comments to <johnh@isi.edu>.
- *
- * This file is under the Gnu Public License, version 2.
- * For details see the COPYING which accompanies this distribution.
- *
- */
-
-#include <time.h>
-
-void
-usage()
-{
-       printf ("usage: strftime format epoch_time\n");
-       printf ("\tThis program exists because Perl's POSIX loads in 880ms\n");
-       printf ("\twhile this program can run in ~20ms,\n");
-       printf ("\tand because some NT users find Perl's POSIX lacks 
strftime.\n");
-       exit (1);
-}
-
-main(argc, argv)
-       int argc;
-       char **argv;
-{
-#define SLEN 1024
-       char s[SLEN];
-       struct tm *tm;
-       time_t time;
-
-       if (argc != 3)
-               usage();
-       time = atol(argv[2]);   /* sigh.  Hope int==time_t */
-       tm = localtime(&time);
-       strftime(s, SLEN, argv[1], tm);
-       printf ("%s\n", s);
-}



reply via email to

[Prev in Thread] Current Thread [Next in Thread]