Commits

Peter Szilagyi committed 6affbb9 Merge

auto merge

  • Participants
  • Parent commits 4770064, 6c51f87

Comments (0)

Files changed (295)

 elisp/contrib/tex-site.el
 elisp/omake/scratch.el
 ocaml/contrib/ocaml_inotify/inotify_test
+ocaml/contrib/ocp-indent/.git
 ocaml/contrib/ocp-indent/Makefile.config
+ocaml/contrib/ocp-indent/_build
 ocaml/contrib/ocp-indent/config.log
 ocaml/contrib/ocp-indent/config.status
+ocaml/contrib/ocp-indent/main.native
 ocaml/contrib/ocp-indent/src/globals.ml
+ocaml/contrib/ocp-indent/tests/js-*.1.ml
+ocaml/contrib/ocp-indent/tests/js-*.1.mlp
+ocaml/contrib/ocp-indent/tests/js-*.diff
 ocaml/omake/OMakefile
 ocp-indent/ocp.ml
 ocp-indent/tuareg.ml
 c3670b2ca23243d5d11de226400acc37bcf597d8 2012-10-19-roll-test
 28c9d3d9fb05b98c4e9565bb3e9238d86ea683ca 2012-10-22-roll-test
 8a5f29318d039e70170a7cf228f7b263a8ad6b72 2012-11-05-roll-test
+8876e892cc5c48988723357d182bb29efd575a15 2012-11-05-roll-test
+b3c4858857fa594d75a905ece5c676dde00cfbb7 2012-11-13-roll-test
+e7be8efe1c9bf30b8d841b099e52e87412fa1d81 2012-11-13-roll-test
+6f6fd8647473bfa2044bdd7a2441c2a625877e34 2012-11-21-roll-test
+================================================================================
+2012-11-21 Rolled rev 6f6fd8647473 to test
+================================================================================
+
+new stuff
+=========
+- Jane.Cr.dedicated-review-frame and related functions for CR ergonomics.
+- Jane.disable-vc micro-feature to open files faster (experimental).
+- OMakeroot error support in omake-server.
+
+bug fixes
+=========
+- Fixed paths for ESS and other infrequently used third-party libraries.
+- Fixed default tabification setting (broken in changes of last roll).
+
+changes
+=======
+- Don't set frame-inherited-parameters, which causes problems with
+  "emacs --daemon".  This may cause new frames to get the wrong font
+  or colors in some situations, although it appears to work even in
+  Emacs 23, the version we're currently using.
+- Don't save defaults in omake-server configurations, only user
+  settings.  This is mainly for forward-compatibility, to avoid saving
+  old defaults which later need to be changed.  (In progress.)
+- Minor ocp-indent updates to track the OCamlPro GitHub repo.
+
+================================================================================
+2012-11-13 Rolled rev e7be8efe1c9b to test
+================================================================================
+
+bug fixes
+=========
+- Fixed comint-password-prompt-regexp to have fewer false positives.
+- Set defaults for customizable variables such that they won't be
+  added to users' ~/.emacs files with their own customizations.
+- Frequently check and fix permissions on /tmp/omake-server.
+- smclaughlin fixed erroneous non-deletion of OMake Server lock file
+  and consequent "connection refused" error in Emacs, plus a latent
+  race condition in the [uname] library function affecting
+  [Lock_file], in ocaml-core-external.  Also handled some signals.
+- Upgraded Org in an attempt to fix a Tramp incompatibility.
+
+changes
+=======
+- Made installed image under /j/office/app/emacs read-only.
+- Shorter "[omake ... <makeroot>]" buffer names.
+
+================================================================================
+2012-11-05 Rolled rev 8876e892cc5c to test
+================================================================================
+
+new stuff
+=========
+- Included ocp-indent as ocaml/contrib/ocp-indent.
+- Hacked omake-server temporarily to run fewer jobs in TOT during
+  recovery from Hurricane Sandy.
+
 ================================================================================
 2012-10-22 Rolled rev 28c9d3d9fb05 to test
 ================================================================================
 =======
 - Color "nonrec" as a keyword in OCaml.
 - Moved from /mnt/global/base/lib/elisp/{js,jane-test} to
-  /j/<office>/app/emacs/{prod,dev}/jane-elisp.
+  /j/office/app/emacs/{prod,dev}/jane-elisp.
 - Incorporated most of /mnt/global/base/lib/elisp into elisp/contrib.
 
 new stuff
   This is in its infancy, but we added a few regression tests so we
   don't go backwards.
 
-  The code is in omake-mode/ocp-indent.  To run regression tests do
-  cd regressions; ./runtests
+  To run regression tests do:
+    ocp-indent/regressions/runtests
 
 - omake-mode works with the new core release, ocaml-core-108.07.00
 
--*- mode: org -*-
+-*- org -*-
 
-Jane Street Emacs utilities.
+Jane Street Emacs utilities
 
 * Usage
 
 
 Everyone should add one of the following lines to their .emacs file.
 
-*** (load "/j/office/app/emacs/prod/jane-elisp/elisp/jane/jane-defaults")
+    (load "/j/office/app/emacs/prod/jane-elisp/elisp/jane/jane-defaults")
+      loads libraries, sets variables according to our coding
+      standards, and sets standard defaults which many users find
+      useful.
 
-Loads libraries, sets variables according to our coding standards, and
-sets standard defaults which many users find useful.
-
-*** (load "/j/office/app/emacs/prod/jane-elisp/elisp/jane/jane-common")
-
-Only loads libraries and sets variables according to our coding
-standards.  Discretionary settings are left to the user.
+    (load "/j/office/app/emacs/prod/jane-elisp/elisp/jane/jane-common")
+      leaves discretionary settings to the user.
 
 ** Beta testers
 
-Beta-testers (thank you!) should add
+Beta-testers (thank you!) should add:
 
       (load "/j/office/app/emacs/dev/jane-elisp/elisp/jane/jane-defaults")
 
-or
+or:
 
       (load "/j/office/app/emacs/dev/jane-elisp/elisp/jane/jane-common")
 
 
 ** At home
 
-For use at home
+For use at home:
   - Choose a site-lisp directory S.
-  - Clone the BitBucket repo into S/jane
-  - Add one of the following to .emacs
-
+  - Clone the BitBucket repo into S/jane.
+  - Add one of the following to .emacs:
       (load "S/jane/elisp/jane/jane-defaults")
       (load "S/jane/elisp/jane/jane-common")
+
+[You will also need to build omake_server.exe to use Omake.compile.]
+
+* Development
+
+To build omake_server.exe:
+
+    hg clone https://bitbucket.org/seanmcl/ocaml-core-external
+    cd ocaml-core-external
+    hg clone ssh://hg2//hg/jane-elisp/test # this directory
+    cd test
+    PATH=/janelibs/ocaml-4.00.1+jane1+with-fp/bin:$PATH
+    omake
+
+You can clone ocaml-core-external with ssh://hg@bitbucket.org rather
+than https://bitbucket.org after you create an account and Sean gives
+you access to his repo.  See
+https://confluence.atlassian.com/display/BITBUCKET/Using+the+SSH+protocol+with+bitbucket
+about setting up keys.

File bin/install.sh

 offices="hkg ldn nyc tot"
 host_hkg=hkg-qws-r02
 host_ldn=ldn-qws-r01
-host_nyc=nyc-qws-r04
+host_nyc=nyc-qws-147            # nyc-qws-r04 still off after Sandy
 host_tot=tot-qws-r02
 
 modes="prod test"
     #
     #sink deploy dir "$dot/".. "$host:$target/jane-elisp" -message "$message"
     sink deploy dir "$jane_elisp" "$host:$target" -message "$message"
+
+    # Make all the installed files read-only so I don't accidentally
+    # edit them in-place.  I could, alternatively, do a complete
+    # clone-build-chmod and "sink" a read-only source, but this is
+    # simple and avoids the extra copy.
+    ssh "$host" "chmod -R a-w '$target'/jane-elisp/"
+    # The trailing slash follows the sink-managed symlink.
+    #
+    # Will making the managed copy read-only confuse "sink"?
 done

File elisp/contrib/org/COPYING

+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ 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
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  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
+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 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 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.
+
+                       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.
+
+  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 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 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
+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
+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) <year>  <name of author>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 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 does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <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, 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>.

File elisp/contrib/org/Makefile

 # Makefile - for the org-mode distribution
+# GNU make is required
 #
-# Maintainer: Carsten Dominik <dominik@science.uva.nl>
-# Version: VERSIONTAG
-#
-# To install org-mode, edit the Makefile, type `make', then `make install'.
-# To create the PDF and HTML documentation files, type `make doc'.
+# This file is not part of GNU Emacs
 
-##----------------------------------------------------------------------
-##  YOU MUST EDIT THE FOLLOWING LINES
-##----------------------------------------------------------------------
+# set up environment
+ include mk/default.mk	# defaults, customizable via "local.mk"
+-include local.mk	# optional local customization, use default.mk as template
 
-# Name of your emacs binary
-EMACS=emacs
-
-# Where local software is found
-prefix=/usr/local
-
-# Where local lisp files go.
-lispdir   = $(prefix)/share/emacs/site-lisp
-
-# Where info files go.
-infodir = $(prefix)/share/info
-
-##----------------------------------------------------------------------
-## YOU MAY NEED TO EDIT THESE
-##----------------------------------------------------------------------
-
-# Using emacs in batch mode.
-
-BATCH=$(EMACS) -batch -q -no-site-file -eval                             			\
-  "(setq load-path (cons (expand-file-name \"./lisp/\") (cons \"$(lispdir)\" load-path)))"
-
-# Specify the byte-compiler for compiling org-mode files
-ELC= $(BATCH) -f batch-byte-compile
-
-# How to make a pdf file from a texinfo file
-TEXI2PDF = texi2pdf
-
-# How to create directories
-MKDIR = mkdir -p
-
-# How to create the info files from the texinfo file
-MAKEINFO = makeinfo
-
-# How to create the HTML file
-TEXI2HTML = makeinfo --html --number-sections
-TEXI2HTMLNOPSLIT = makeinfo --html --no-split --number-sections
-
-# How to copy the lisp files and elc files to their distination.
-CP = cp -p
-
-# Name of the program to install info files
-INSTALL_INFO=install-info
-
-##----------------------------------------------------------------------
-##  BELOW THIS LINE ON YOUR OWN RISK!
-##----------------------------------------------------------------------
-
-# The following variables need to be defined by the maintainer
-LISPF      = 	org.el			\
-		org-agenda.el		\
-		org-ascii.el		\
-	     	org-attach.el		\
-	     	org-archive.el		\
-		org-bbdb.el		\
-		org-beamer.el		\
-		org-bibtex.el		\
-	     	org-capture.el		\
-	     	org-clock.el		\
-	     	org-colview.el		\
-	     	org-colview-xemacs.el	\
-	     	org-compat.el		\
-	     	org-pcomplete.el	\
-	     	org-crypt.el		\
-	     	org-ctags.el		\
-	     	org-datetree.el		\
-	     	org-docview.el		\
-	     	org-entities.el		\
-		org-exp.el		\
-		org-exp-blocks.el	\
-		org-docbook.el		\
-		org-faces.el		\
-		org-feed.el		\
-		org-footnote.el		\
-		org-freemind.el		\
-		org-gnus.el		\
-		org-habit.el		\
-		org-html.el		\
-		org-icalendar.el	\
-		org-id.el		\
-		org-indent.el		\
-		org-info.el		\
-		org-inlinetask.el	\
-		org-jsinfo.el		\
-		org-irc.el		\
-		org-latex.el		\
-		org-list.el		\
-		org-mac-message.el	\
-	     	org-macs.el		\
-		org-mew.el              \
-		org-mhe.el		\
-		org-mks.el		\
-		org-mobile.el		\
-		org-mouse.el		\
-		org-publish.el		\
-		org-plot.el		\
-		org-protocol.el		\
-		org-remember.el		\
-		org-rmail.el		\
-		org-special-blocks.el	\
-		org-src.el		\
-		org-table.el		\
-		org-taskjuggler.el	\
-		org-timer.el		\
-		org-vm.el		\
-		org-w3m.el              \
-		org-wl.el		\
-		org-xoxo.el		\
-		ob.el			\
-		ob-table.el		\
-		ob-lob.el		\
-		ob-ref.el		\
-		ob-exp.el		\
-		ob-tangle.el		\
-		ob-comint.el		\
-		ob-eval.el		\
-		ob-keys.el		\
-		ob-awk.el		\
-		ob-C.el			\
-		ob-calc.el		\
-		ob-ditaa.el		\
-		ob-haskell.el		\
-		ob-perl.el		\
-		ob-sh.el		\
-		ob-R.el			\
-		ob-dot.el		\
-		ob-mscgen.el		\
-		ob-latex.el		\
-		ob-lisp.el		\
-		ob-ledger.el		\
-		ob-python.el		\
-		ob-sql.el		\
-		ob-asymptote.el		\
-		ob-emacs-lisp.el	\
-		ob-matlab.el		\
-		ob-ruby.el		\
-		ob-sqlite.el		\
-		ob-clojure.el		\
-		ob-ocaml.el		\
-		ob-sass.el		\
-		ob-css.el		\
-		ob-gnuplot.el		\
-		ob-octave.el		\
-		ob-screen.el		\
-		ob-plantuml.el		\
-		ob-org.el		\
-		ob-js.el		\
-		ob-scheme.el
-
-LISPFILES0  = $(LISPF:%=lisp/%)
-LISPFILES   = $(LISPFILES0) lisp/org-install.el
-ELCFILES0   = $(LISPFILES0:.el=.elc)
-ELCFILES    = $(LISPFILES:.el=.elc)
-DOCFILES    = doc/org.texi doc/org.pdf doc/org doc/dir \
-              doc/pdflayout.sty doc/.nosearch \
-              doc/orgguide.texi doc/orgguide.pdf
-CARDFILES   = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf
-TEXIFILES   = doc/org.texi
-INFOFILES   = doc/org
-
-# Package Manager (ELPA)
-PKG_TAG = $(shell date +%Y%m%d)
-PKG_DOC = "Outline-based notes management and organizer"
-PKG_REQ = "nil"
-
-PKG_FILES = $(LISPFILES0)		\
-            doc/dir doc/org		\
-            doc/pdflayout.sty		\
-            doc/org.pdf			\
-            doc/orgguide.pdf		\
-            doc/orgcard.tex		\
-            doc/orgcard.pdf		\
-            doc/orgcard_letter.pdf
-
-.SUFFIXES: .el .elc .texi
-SHELL = /bin/sh
-
-# Additional distribution files
-DISTFILES_extra=  Makefile request-assign-future.txt contrib
-
-default: $(ELCFILES) $(ELCBFILES)
-
-all:	$(ELCFILES) $(ELCBFILES) $(INFOFILES)
-
-up2:	update
-	sudo ${MAKE} install
-
-update:
-	git pull
-	${MAKE} clean
-	${MAKE} all
-
-compile: $(ELCFILES0) $(ELCBFILES)
-
-install: install-lisp
-
-doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt
-
-p:
-	${MAKE} pdf && open doc/org.pdf
-
-g:
-	${MAKE} pdf && open doc/orgguide.pdf
-
-install-lisp: $(LISPFILES) $(ELCFILES)
-	if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;
-	$(CP) $(LISPFILES)  $(lispdir)
-	$(CP) $(ELCFILES)   $(lispdir)
-
-install-info: $(INFOFILES)
-	if [ ! -d $(infodir) ]; then $(MKDIR) $(infodir); else true; fi ;
-	$(CP) $(INFOFILES) $(infodir)
-	$(INSTALL_INFO) --info-file=$(INFOFILES) --info-dir=$(infodir)
-
-install-info-debian: $(INFOFILES)
-	$(INSTALL_INFO) --infodir=$(infodir) $(INFOFILES)
-
-autoloads: lisp/org-install.el
-
-lisp/org-install.el: $(LISPFILES0) Makefile
-	$(BATCH) --eval "(require 'autoload)" \
-		--eval '(find-file "org-install.el")'  \
-		--eval '(erase-buffer)' \
-		--eval '(mapc (lambda (x) (generate-file-autoloads (symbol-name x))) (quote ($(LISPFILES0))))' \
-		--eval '(insert "\n(provide (quote org-install))\n")' \
-		--eval '(save-buffer)'
-	mv org-install.el lisp
-
-doc/org: doc/org.texi
-	(cd doc && $(MAKEINFO) --no-split org.texi -o org)
-
-doc/org.pdf: doc/org.texi
-	(cd doc && $(TEXI2PDF) org.texi)
-
-doc/orgguide.pdf: doc/orgguide.texi
-	(cd doc && $(TEXI2PDF) orgguide.texi)
-
-doc/org.html: doc/org.texi
-	(cd doc && $(TEXI2HTML) --no-split -o org.html org.texi)
-	UTILITIES/manfull.pl doc/org.html
-
-doc/orgcard.pdf: doc/orgcard.tex
-	(cd doc && pdftex orgcard.tex)
-
-doc/orgcard.txt: doc/orgcard.tex
-	(cd doc && perl ../UTILITIES/orgcard2txt.pl orgcard.tex > orgcard.txt)
-
-doc/orgcard_letter.tex: doc/orgcard.tex
-	perl -pe 's/\\pdflayout=\(0l\)/\\pdflayout=(1l)/' \
-                   doc/orgcard.tex > doc/orgcard_letter.tex
-
-doc/orgcard_letter.pdf: doc/orgcard_letter.tex
-	(cd doc && pdftex orgcard_letter.tex)
-
-# Below here are special targets for maintenance only
-
-html: doc/org.html
-
-html_manual: doc/org.texi
-	rm -rf doc/manual
-	mkdir doc/manual
-	$(TEXI2HTML) -o doc/manual doc/org.texi
-	UTILITIES/mansplit.pl doc/manual/*.html
-
-html_guide: doc/orgguide.texi
-	rm -rf doc/guide
-	mkdir doc/guide
-	$(TEXI2HTML) -o doc/guide doc/orgguide.texi
-	UTILITIES/guidesplit.pl doc/guide/*.html
-
-info:	doc/org
-
-pdf:	doc/org.pdf doc/orgguide.pdf
-
-card:	doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgcard.txt
-
-testrelease:
-	git checkout -b testrelease origin/maint
-	git merge -s recursive -X theirs master
-	UTILITIES/set-version.pl testing
-	git commit -a -m "Release testing"
-	make distfile TAG=testversion
-	make cleanrel
-	rm -rf org-testversion*
-	git reset --hard
-	git checkout master
-	git branch -D testrelease
-
-# The following target makes a full release for the stuff that is
-# currently on master.  Do it like this:
-#
-#   make release TAG=7.01
-
-release:
-	git checkout maint
-	git merge -s recursive -X theirs master
-	UTILITIES/set-version.pl $(TAG)
-	git commit -a -m "Release $(TAG)"
-	make relup TAG=$(TAG)
-	make cleanrel
-	rm -rf org-$(TAG)
-	rm -f org-$(TAG)*.zip
-	rm -f org-$(TAG)*.tar.gz
-	make pushreleasetag TAG=$(TAG)
-	git push -f origin maint
-	git checkout master
-	git merge -s ours maint
-	UTILITIES/set-version.pl -a $(TAG)
-	git commit -a -m "Update website to show $(TAG) as current release"
-	git push
-
-# The following target makes a release, but from the stuff that is on
-# maint, not from the stuff that is on master.  The idea is that it pushes
-# out a minor fix into a minor update, while development on master
-# already went full steam ahead.  To make a micro-relesse, cherry-pick
-# the necessary changes into maint, then run (with proper version number)
-# This is just like release, but we skip  the step which merges master
-# into maint.
-#
-#   make fixrelease TAG=7.01.02
-
-fixrelease:
-	git checkout maint
-	git merge -s recursive -X theirs master
-	UTILITIES/set-version.pl $(TAG)
-	git commit -a -m "Release $(TAG)"
-	make relup TAG=$(TAG)
-	make cleanrel
-	rm -rf org-$(TAG)
-	rm org-$(TAG)*.zip
-	rm org-$(TAG)*.tar.gz
-	make pushreleasetag TAG=$(TAG)
-	git push -f origin maint
-	git checkout master
-	git merge -s ours maint
-	UTILITIES/set-version.pl -o $(TAG)
-	git commit -a -m "Update website to show $(TAG) as current release"
-	git push
-
-# ~$ make relup only makes sense from orgmode.org server
-# Don't call it from your computer!
-relup:
-	${MAKE} makerelease
-	${MAKE} sync_release
-	${MAKE} sync_manual
-
-makerelease:
-	@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
-	${MAKE} distfile
-	${MAKE} doc
-	UTILITIES/gplmanual.pl
-	${MAKE} html_manual
-	${MAKE} html_guide
-	rm -rf RELEASEDIR
-	$(MKDIR) RELEASEDIR
-	cp org-$(TAG).zip org-$(TAG).tar.gz RELEASEDIR
-	cp doc/org.pdf doc/orgcard.pdf doc/org.texi doc/org.html RELEASEDIR
-	cp doc/org_dual_license.texi RELEASEDIR
-	cp doc/orgguide.pdf doc/orgcard.txt RELEASEDIR
-	cp RELEASEDIR/org-$(TAG).zip    RELEASEDIR/org.zip
-	cp RELEASEDIR/org-$(TAG).tar.gz RELEASEDIR/org.tar.gz
-
-# ~$ make sync_release only makes sense from orgmode.org server
-# Don't call it from your computer!
-sync_release:
-	rsync -avuz RELEASEDIR/ /var/www/orgmode.org/
-
-# ~$ make sync_manual only makes sense from orgmode.org server
-# Don't call it from your computer!
-sync_manual:
-	rsync -avuz --delete doc/manual/ /var/www/orgmode.org/manual/
-	rsync -avuz --delete doc/guide/ /var/www/orgmode.org/guide/
-
-distfile:
-	@if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
-	touch doc/org.texi doc/orgcard.tex # force update
-	${MAKE} cleancontrib
-	${MAKE} info
-	${MAKE} doc
-	${MAKE} lisp/org-install.el
-	rm -rf org-$(TAG) org-$(TAG).zip
-	$(MKDIR) org-$(TAG)
-	$(MKDIR) org-$(TAG)/doc
-	$(MKDIR) org-$(TAG)/lisp
-	cp -r $(LISPFILES) org-$(TAG)/lisp
-	cp -r $(DOCFILES) $(CARDFILES) org-$(TAG)/doc
-	cp -r $(DISTFILES_extra) org-$(TAG)/
-	cp -r README_DIST org-$(TAG)/README
-	zip -r org-$(TAG).zip org-$(TAG)
-	tar zcvf org-$(TAG).tar.gz org-$(TAG)
-
-pkg:
-	@if [ "X$(PKG_TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
-	touch doc/org.texi doc/orgcard.tex # force update
-	${MAKE} info
-	${MAKE} doc
-	rm -rf org-$(PKG_TAG) org-$(PKG_TAG).tar
-	$(MKDIR) org-$(PKG_TAG)
-	cp -r $(PKG_FILES) org-$(PKG_TAG)
-	echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" > org-$(PKG_TAG)/org-pkg.el
-	tar cf org-$(PKG_TAG).tar org-$(PKG_TAG) --remove-files
-
-cleanall:
-	${MAKE} clean
-	rm -f lisp/org-install.el
-
-clean:
-	${MAKE} cleanelc
-	${MAKE} cleandoc
-	${MAKE} cleanrel
-	rm -f *~ */*~ */*/*~
-
-cleancontrib:
-	find contrib -name \*~ -exec rm {} \;
-
-cleanelc:
-	rm -f $(ELCFILES)
-cleandoc:
-	-(cd doc && rm -f org.pdf org org.html orgcard.pdf orgguide.pdf)
-	-(cd doc && rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs)
-	-(cd doc && rm -f *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps)
-	-(cd doc && rm -f orgcard_letter.tex orgcard_letter.pdf)
-	-(cd doc && rm -rf manual)
-
-cleanrel:
-	rm -rf RELEASEDIR
-	rm -rf org-7.*
-	rm -rf org-7*zip org-7*tar.gz
-
-.el.elc:
-	$(ELC) $<
-
-
-push:
-	git-push orgmode@orgmode.org:org-mode.git master
-
-pushtag:
-	git-tag -m "Adding tag" -a $(TAG)
-	git-push orgmode@orgmode.org:org-mode.git $(TAG)
-
-pushreleasetag:
-	git-tag -m "Adding release tag" -a release_$(TAG)
-	git-push orgmode@orgmode.org:org-mode.git release_$(TAG)
-
-# Dependencies
-
-lisp/org.elc:		lisp/org-macs.el lisp/org-compat.el lisp/org-faces.el
-lisp/org-agenda.elc:	lisp/org.el
-lisp/org-ascii.elc:	lisp/org-exp.el
-lisp/org-attach.elc:	lisp/org.el lisp/org-id.el
-lisp/org-archive.elc:	lisp/org.el
-lisp/org-bbdb.elc:	lisp/org.el
-lisp/org-beamer.elc:	lisp/org.el
-lisp/org-bibtex.elc:	lisp/org.el
-lisp/org-capture.elc:	lisp/org.el lisp/org-mks.el
-lisp/org-clock.elc:	lisp/org.el
-lisp/org-colview.elc:	lisp/org.el
-lisp/org-colview-xemacs.elc:	lisp/org.el
-lisp/org-compat.elc:	lisp/org-macs.el
-lisp/org-crypt.elc:	lisp/org-crypt.el lisp/org.el
-lisp/org-ctags.elc:	lisp/org.el
-lisp/org-datetree.elc:	lisp/org.el
-lisp/org-docview.elc:	lisp/org.el
-lisp/org-entities.elc:
-lisp/org-exp.elc:	lisp/org.el lisp/org-agenda.el
-lisp/org-exp-blocks.elc: lisp/org.el
-lisp/org-latex.elc:	lisp/org.el lisp/org-exp.el lisp/org-beamer.el
-lisp/org-docbook.elc:	lisp/org.el lisp/org-exp.el
-lisp/org-faces.elc:	lisp/org-macs.el lisp/org-compat.el
-lisp/org-feed.elc:	lisp/org.el
-lisp/org-footnotes.elc:	lisp/org-macs.el lisp/org-compat.el
-lisp/org-freemind.elc:	lisp/org.el
-lisp/org-gnus.elc:	lisp/org.el
-lisp/org-html.elc:	lisp/org-exp.el
-lisp/org-habit.elc:	lisp/org.el lisp/org-agenda.el
-lisp/org-icalendar.elc:	lisp/org-exp.el
-lisp/org-id.elc:	lisp/org.el
-lisp/org-indent.elc:	lisp/org.el lisp/org-macs.el lisp/org-compat.el
-lisp/org-info.elc:	lisp/org.el
-lisp/org-inlinetask.elc:
-lisp/org-irc.elc:	lisp/org.el
-lisp/org-jsinfo.elc:	lisp/org.el lisp/org-exp.el
-lisp/org-list.elc:	lisp/org-macs.el lisp/org-compat.el
-lisp/org-mac-message.elc:	lisp/org.el
-lisp/org-macs.elc:
-lisp/org-mew.elc:	lisp/org.el
-lisp/org-mhe.elc:	lisp/org.el
-lisp/org-mks.elc:
-lisp/org-mobile.elc:	lisp/org.el
-lisp/org-mouse.elc:	lisp/org.el
-lisp/org-plot.elc:	lisp/org.el lisp/org-exp.el lisp/org-table.el
-lisp/org-publish.elc:
-lisp/org-protocol.elc:	lisp/org.el
-lisp/org-remember.elc:	lisp/org.el
-lisp/org-rmail.elc:	lisp/org.el
-lisp/org-special-blocks.elc:	lisp/org-compat.el
-lisp/org-src.elc:	lisp/org-macs.el lisp/org-compat.el
-lisp/org-table.elc:	lisp/org.el
-lisp/org-taskjuggler.elc: lisp/org.el lisp/org-exp.el
-lisp/org-timer.elc:	lisp/org.el
-lisp/org-vm.elc:	lisp/org.el
-lisp/org-w3m.elc:	lisp/org.el
-lisp/org-wl.elc:	lisp/org.el
-lisp/org-xoxo.elc:	lisp/org-exp.el
+# default target is "all" unless overridden in local.mk
+all::
 
 # Describe valid make targets for org-mode.
-targets help:
-	@echo "make - compile Org ELisp files"
-	@echo "make clean - clean Elisp and documentation files"
-	@echo "make all - compile Org ELisp files and documentation"
+.PHONY:	targets help helpall
+targets:	help
+help helpall::
+	$(info )
+	$(info Getting Help)
+	$(info ============)
+	$(info )
+	$(info make help           - show brief help)
+	$(info make targets        - ditto)
+	$(info make helpall        - show extended help)
+	$(info )
+	$(info Build and Check)
+	$(info ===============)
+	$(info make                - build Org ELisp and all documentation)
+	$(info make all            - ditto)
+	$(info make compile        - build Org ELisp files)
+	$(info make single         - build Org ELisp files, single Emacs per source)
+	$(info make autoloads      - create org-install.el to load Org in-place)
+	$(info make test           - build Org ELisp files and run test suite)
+helpall::
+	$(info make test-dirty     - check without building first)
+	$(info make compile-dirty  - build only stale Org ELisp files)
+	$(info )
+	$(info Compatibility)
+	$(info =============)
+	$(info make oldorg         - what the old make did: compile autoloads info)
+	$(info )
+	$(info Cleaning)
+	$(info ========)
+	$(info make clean          - remove built Org ELisp files and documentation)
+	$(info make cleanall       - remove everything that can be built and all remnants)
+	$(info make clean-install  - remove previous Org installation)
+	$(info )
+	$(info Configuration Check)
+	$(info ===================)
+help helpall::
+	$(info make config         - check main configuration)
+helpall::
+	$(info make config-version - check Org version)
+	$(info make config-test    - check test configuration)
+	$(info make config-exe     - check executables configuration)
+	$(info make config-cmd     - check command configuration)
+	$(info make config-all     - check all configuration)
+	$(info )
+	$(info Documentation)
+	$(info =============)
+help helpall::
+	$(info make doc            - build all documentation)
+helpall::
+	$(info make docs           - ditto)
+help helpall::
+	$(info make info           - build Info documentation)
+helpall::
+	$(info make html           - build HTML documentation)
+	$(info make pdf            - build PDF documentation)
+	$(info make card           - build reference cards)
+	$(info make refcard        - ditto)
+help helpall::
+	$(info )
+	$(info Installation)
+	$(info ============)
+	$(info make install        - build and install Org)
+helpall::
+	$(info make install-etc    - build and install files in /etc)
+	$(info make install-lisp   - build and install Org Elisp files)
+	$(info make install-info   - build and install Info documentation)
+	$(info )
+	$(info Convenience)
+	$(info ===========)
+	$(info make up0            - pull from upstream)
+	$(info make up1            - pull from upstream, build and check)
+	$(info make up2            - pull from upstream, build, check and install)
+	$(info make update         - pull from upstream and build)
+	$(info make update2        - pull from upstream, build and install)
+	$(info make uncompiled     - combine cleanlisp and autoloads)
+	$(info make local.mk       - create new local.mk as template for adaptation)
+help helpall::
+	$(info )
+	$(info Full documentation on Worg)
+	$(info ==========================)
+	$(info http://orgmode.org/worg/dev/org-build-system.html)
 	@echo ""
-	@echo "make doc - make all documentation"
-	@echo "make info - make Info documentation"
-	@echo "make html - make HTML documentation"
-	@echo "make pdf - make pdf documentation"
-	@echo "make card - make refcards documentation"
-	@echo ""
-	@echo "make install - install Org"
-	@echo "make install-lisp - install Org ELisp files"
-	@echo "make install-info - install Org Info file"
-	@echo "make install-info-debian - install info on old debian systems (newer use ginstall)"
+
+ include mk/targets.mk	# toplevel make machinery

File elisp/contrib/org/README

 The is a distribution of Org, a plain text notes and project planning
 tool for Emacs.
 
-The version of this release is: 7.6
+The version of this release is: 7.9.1
 
 The homepage of Org is at http://orgmode.org
 
 README
     This file.
 
+COPYING
+    The GNU General Public License.
+
+Makefile
+    The makefile to compile and install Org.  For installation
+    instructions, see the manual or the more detailed procedure
+    on Worg: http://orgmode.org/worg/dev/org-build-system.html
+
+mk/
+    Files needed for building Org.
+
 lisp/
     Directory with all the Emacs Lisp files that make up Org.
 
     A directory with third-party additions for Org.  Some really cool
     stuff is in there.
 
-ChangeLog
-    The standard ChangeLog file, for geeks.
+etc/
+    Files needed for the ODT exporter.
 
-Changes.org
-    An Org-mode file listing the user visible changes in each release.
-
-Makefile
-    The makefile to compile and install Org.  For installation
-    instructions, see the manual.
+testing/
+    Testing suite for Org.
 
 request-assign-future.txt
-    The form that contributors have to sign and get processed with the
-    FSF before contributed changes can be integrated into the Org
-    core.  All files in this distribution except the CONTRIB directory
+    The form that contributors have to sign and get processed with
+    the FSF before contributed changes can be integrated into the Org
+    core.  All files in this distribution except the contrib/ directory
     have copyright assigned to the FSF.
-

File elisp/contrib/org/contrib/README

 to distribute and develop them as long as they are distributed under a free
 software license.
 
-Please put your contribution in one of these three directories:
+Please put your contribution in one of these directories:
 
 LISP (emacs-lisp code)
 ======================
 htmlize.el               --- Convert buffer text and decorations to HTML
 org2rem.el               --- Convert org appointments into reminders
 org-annotate-file.el     --- Annotate a file with org syntax
+org-bibtex-extras.el     --- Extras for working with org-bibtex entries
 org-bookmark.el          --- Links to bookmarks
 org-checklist.el         --- org functions for checklist handling
 org-choose.el            --- Use TODO keywords to mark decision states
 org-contribdir.el        --- Dummy file to mark the org contrib Lisp directory
 org-depend.el            --- TODO dependencies for Org-mode
 org-drill.el             --- Self-testing with org-learn
-org-depend.el            --- TODO dependencies for Org-mode
+org-element.el           --- Parser and applications for Org syntax
 org-elisp-symbol.el      --- Org links to emacs-lisp symbols
-org-eshell.el            --- Support for links to working directories in eshell
 org-eval.el              --- The <lisp> tag, adapted from Muse
 org-eval-light.el        --- Evaluate in-buffer code on demand
 org-exp-bibtex.el        --- Export citations to LaTeX and HTML
 org-expiry.el 	         --- Expiry mechanism for Org entries
+org-export.el            --- Generic Export Engine For Org
 org-export-generic.el    --- Export framework for configurable backends
 org-git-link.el          --- Provide org links to specific file version
 org-interactive-query.el --- Interactive modification of tags query
 org-invoice.el           --- Help manage client invoices in OrgMode
 org-jira.el              --- Add a jira:ticket protocol to Org
 org-learn.el             --- SuperMemo's incremental learning algorithm
-org-lparse.el            --- Library for building custom exporters
 org-mac-iCal.el          --- Imports events from iCal.app to the Emacs diary
 org-mac-link-grabber.el  --- Grab links and URLs from various Mac applications
 org-mairix.el 	         --- Hook mairix search into Org for different MUAs
 org-man.el 	         --- Support for links to manpages in Org-mode
 org-mime.el              --- org html export for text/html MIME emails
 org-mtags.el 	         --- Support for some Muse-like tags in Org-mode
-org-odt.el 	         --- OpenDocumentText exporter for Org-mode
+org-notify.el            --- Notifications for Org-mode
+org-notmuch.el           --- Support for links to notmuch messages
 org-panel.el 	         --- Simple routines for us with bad memory
 org-registry.el          --- A registry for Org links
 org-screen.el            --- Visit screen sessions through Org-mode links
 org-secretary.el         --- Team management with org-mode
-org-special-blocks.el    --- Turn blocks into LaTeX envs and HTML divs
+org-static-mathjax.el    --- Muse-like tags in Org-mode
+org-sudoku.el            --- Create and solve SUDOKU puzzles in Org tables
 orgtbl-sqlinsert.el      --- Convert Org-mode tables to SQL insertions
 org-toc.el 	         --- Table of contents for Org-mode buffer
 org-track.el             --- Keep up with Org development
 org-velocity.el          --- something like Notational Velocity for Org
-org-wikinodes            --- CamelCase wiki-like links for Org
+org-wikinodes.el         --- CamelCase wiki-like links for Org
 
 
-PACKAGES
-========
+EXPORT ENGINE AND BACKENDS (emacs-lisp code)
+============================================
+
+org-export.el            --- the new export engine
+org-e-latex.el           --- LaTeX export backend
+org-e-ascii.el           --- ASCII export backend
+org-e-beamer.el          --- Beamer export backend
+org-e-groff.el           --- Groff export backend
+org-e-html.el            --- HTML export backend
+org-e-man.el             --- man pages export backend
+org-e-odt.el             --- ODT export backend
+org-e-texinfo.el         --- TeXinfo export backend
+org-md.el                --- MarkDown export backend
+
+
+BABEL
+=====
+library-of-babel.org     --- Documentation for the library of babel
+langs/ob-fomus.el        --- Org-babel functions for fomus evaluation
+langs/ob-oz.el           --- Org-babel functions for Oz evaluation
+
+
+ODT (OpenDocumentText)
+======================
+README.org               --- Legacy documentation for Org ODT exporter
+
 
 SCRIPTS (shell, bash, etc.)
 ===========================
 
 dir2org.zsh          --- Org compatible fs structure output
-org2hpda	     --- Generate hipster pda style printouts from Org-mode
 ditaa.jar            --- ASCII to PNG converter by Stathis Sideris, GPL
+org2hpda             --- Generate hipster pda style printouts from Org-mode
+org-docco.org        --- docco side-by-side annotated code export to HTML
+StartOzServer.oz     --- implements the Oz-side of the Org-babel Oz interface
+staticmathjax        --- XULRunner application to process MathJax statically
+
+This directory also contains supporting files for the following
+packages: ob-oz.el, org-docco.org, and org-static-mathjax.el.

File elisp/contrib/org/contrib/babel/langs/ob-fomus.el

+;;; ob-fomus.el --- org-babel functions for fomus evaluation
+
+;; Copyright (C) 2011-2012 Torsten Anders
+
+;; Author: Torsten Anders
+;; Keywords: literate programming, reproducible research
+;; Homepage: http://orgmode.org
+;; Version: 
+
+;;; License:
+