8 files changed, 230 insertions, 248 deletions
diff --git a/ChangeLog b/ChangeLog
index b8726468397..ec25d5f7a7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-01  Glenn Morris  <rgm@gnu.org>
+        * make-dist: Only README files exist in lisp/ now, not README*.
 2013-01-23  Giorgos Keramidas  <gkeramidas@gmail.com>  (tiny change)
        * .bzrignore: add lib-src/blessmail.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 942f0fbab31..d4dde056461 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,6 +1,7 @@
 2013-02-01  Glenn Morris  <rgm@gnu.org>
        * calc.texi (Help Commands): Update calc-view-news description.
+        Mention etc/CALC-NEWS.
 2013-01-24  Michael Albinus  <michael.albinus@gmx.de>
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index ff3ec06fc40..a5514867a99 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -9910,7 +9910,8 @@ listed.
 @kindex h n
 The @kbd{h n} or @kbd{h C-n} (@code{calc-view-news}) command displays
 the ``news'' or change history of Emacs, and jumps to the most recent
-portion concerning Calc (if present).
+portion concerning Calc (if present).  For older history, see the file
+@file{etc/CALC-NEWS} in the Emacs distribution.
 @kindex h C-c
 @kindex h C-d
diff --git a/lisp/calc/README.prev b/etc/CALC-NEWS
index eae72cbbe6c..95e8686be62 100644
--- a/lisp/calc/README.prev
+++ b/etc/CALC-NEWS
@@ -1,13 +1,227 @@
 Copyright (C) 2001-2013 Free Software Foundation, Inc.
 See the end of the file for license conditions.
+Calc is an advanced desk calculator for GNU Emacs.
-Summary of changes to "Calc" Preceding 2.00
+"Calc"  Copyright (C) 1990-1993, 2001-2013 Free Software Foundation, Inc.
------- -- ------- --  ----  --------- ----
+Written by:
+        Dave Gillespie
+        c/o Synaptics, Inc.
+        2698 Orchard Parkway
+        San Jose CA 95134
+        daveg@synaptics.com, uunet!synaptx!daveg
+Currently maintained by:
+     Jay Belanger <jay.p.belanger@gmail.com>
+From the introduction to the manual:
+  "Calc" is an advanced calculator and mathematical tool that runs as
+  part of the GNU Emacs environment.  Very roughly based on the HP-28/48
+  series of calculators, its many features include:
+    * Choice of algebraic or RPN (stack-based) entry of calculations.
+    * Arbitrary precision integers and floating-point numbers.
+    * Arithmetic on rational numbers, complex numbers (rectangular and
+      polar), error forms with standard deviations, open and closed
+      intervals, vectors and matrices, dates and times, infinities,
+      sets, quantities with units, and algebraic formulas.
+    * Mathematical operations such as logarithms and trigonometric functions.
+    * Programmer's features (bitwise operations, non-decimal numbers).
+    * Financial functions such as future value and internal rate of return.
+    * Number theoretical features such as prime factorization and
+      arithmetic modulo M for any M.
+    * Algebraic manipulation features, including symbolic calculus.
+    * Moving data to and from regular editing buffers.
+    * "Embedded mode" for manipulating Calc formulas and data directly
+      inside any editing buffer.
+    * Graphics using GNUPLOT, a versatile (and free) plotting program.
+    * Easy programming using keyboard macros, algebraic formulas,
+      algebraic rewrite rules, or extended Emacs Lisp.
+Calc is written entirely in Emacs Lisp, for maximum portability.
+I am anxious to hear about your experiences using Calc.  Send mail to
+"jay.p.belanger@gmail.com".  A bug report is most useful if you include the
+exact input and output that occurred, any modes in effect (such as the
+current precision), and so on.  If you find Calc is difficult to operate
+in any way, or if you have other suggestions, don't hesitate to let me
+know.  If you find errors (including simple typos) in the manual, let
+me know.  Even if you find no bugs at all I would love to hear your
+opinions.
+Summary of changes to "Calc"
+------- -- ------- --  ----
+For changes in Emacs 23.1 and later, see the main Emacs NEWS file.
+Version 2.1:
+* New matrix mode for square matrices.  Improved handling of
+  non-commutative products.
+* New functions: powerexpand and ldiv.
+* Added new functions: sec, csc, cot, sech, csch, coth.
+* 0^0 now evaluates to 1.
+* Added a new language mode for LaTeX.
+* Calc now tries to use an appropriate language mode in embedded mode.
+* Calc now restores original modes when leaving embedded mode.
+* User settable variables which are not set with keystrokes are now
+  customizable.
+* Made ~/.calc.el the default Calc settings file.
+* Miscellaneous updates and bugfixes.
+Version 2.02f:
+ * Fixed a bug which broke `I', `H', `K' prefix keys in recent Emacs.
+ * Fixed a bug in calc.texinfo which prevented "make tex2" from working.
+ * Updated `C-y' (calc-yank) to understand Emacs 19 generalized kill ring.
+ * Added a copy of "calccard.tex", the Calc quick reference card.
+Version 2.02e:
+ * Fixed an installation bug caused by recent changes to `write-region'.
+Version 2.02d:
+ * Fixed a minor installation problem with a Emacs 19.29 byte-compiler bug.
+ * Removed archaic "macedit" package (superseded by "edmacro").
+Version 2.02c:
+ * Patch to port Calc to Lucid Emacs 19; still works with GNU 18 and GNU 19.
+ * Fixed a bug that broke `C-x C-c' after Calc graphics had been used.
+Version 2.02b:
+ * Minor patch to port Calc to GNU Emacs 19.  Will be superseded by Calc 3.00.
+Version 2.02:
+ * Revamped the manual a bit; rearranged some sections.
+ * Added marginal notes for Key/Function Index refs in printed manual.
+ * Changed `M-# r' to deal more gracefully with blank lines.
+ * Made reductions like `V R +' and `M-# :' considerably faster.
+ * Improved parsing and display of cases like "[a + b]".
+ * Added `t +' and `t -' for doing business date arithmetic.
+ * Added "syntax tables," the opposite of compositions.
+ * Added another Rewrites Tutorial exercise.
+ * Added the "vmatches" function.
+ * Added the `Modes' variable and `m g' command.
+ * Improved `u s' to cancel, e.g., "11 mph hr / yd" to get a number.
+ * Added "quick units" commands "u 0" through "u 9".
+ * Moved `M-%' to calc.el to avoid autoloading problems.
+ * Added `M-=' during algebraic entry, acts like `RET ='.
+ * Made `LFD' prevent evaluation when finishing a calc-edit command.
+ * Changed calc-store commands to use `t .' mode for trail display.
+ * Improved integrator to understand forms involving "erf".
+ * Fixed parser to make sense of "[1....1e2]" input.
+ * Fixed FORTRAN parser to treat a(i,j) as a_i_j if a is declared matrix.
+ * Got rid of some version number stamps to reduce size of patches.
+ * Fixed a bug in defmath treating "<=" and ">=" predicates.
+ * Fixed a bug in which Calc crashed multiplying two date forms.
+ * Fixed a bug in line breaker that crashed for large, nested formulas.
+ * Fixed a bug using ` to edit string("foo").
+ * Fixed a bug where `M-# y' in Big mode copied stack level number.
+ * Fixed a bug where `g O' used wrong default directory, no completion.
+ * Fixed a bug where "foo_bar(i)" parsed in C mode but showed as foo#bar.
+ * Fixed several bugs where large calculations got "computation too long."
+Version 2.01:
+ * Added percentage commands `M-%', `b %', and `c %'.
+ * Changed Big mode to force radix-10 in superscripts.
+ * Improved display of fractions in various language modes.
+ * Changed `a n' to work properly with equations and inequalities.
+ * The problem with cross references to Index nodes in TeX has been fixed.
+ * Fixed a bug where recursive esc-maps make calc-ext/-aent unloadable.
+ * Fixed a bug in `M-# k', then `OFF' right away, with fresh Emacs.
+ * Fixed a bug in which "S_i_j" was formatted wrong after `j s'.
+ * Fixed a bug in which `h k u c' positioned cursor on wrong line.
+ * Fixed a bug where `z ?' crashed if `z %' was defined.
+ * Fixed a bug in `j O' (calc-select-once-maybe).
+ * Fixed "make private" not to ask "Delete excess versions" and crash.
 Version 2.00:
+ * First complete posting of Calc since 1.01.
+ * Most parts of Calc have seen changes since version 1.07.  See
+   section "New for Calc 2.00" in the manual for a summary.
 * Changed to compile calc-macs/-maint, to allow "cp *.elc new-dir".
 * Improved calc-describe-bindings to avoid showing redundant ESC maps.
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6c1a08cb670..e50ae678a70 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-01  Glenn Morris  <rgm@gnu.org>
+        * CALC-NEWS: Move here from lisp/calc/README, README.prev.
 2012-12-23  Jan Djärv  <jan.h.d@swipnet.se>
        * TODO: Adjust entry about NS event loop.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef5cb151aac..b87c0c87da5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
        * calc/calc-help.el (calc-view-news): Use view-emacs-news.
+        * calc/README, calc/README.prev: Rename/merge to etc/CALC-NEWS.
 2013-01-31  Michael Albinus  <michael.albinus@gmx.de>
        * net/tramp.el (tramp-tramp-file-p): Comment check for
diff --git a/lisp/calc/README b/lisp/calc/README
deleted file mode 100644
index be5f9bdf34f..00000000000
--- a/lisp/calc/README
+++ /dev/null
@@ -1,244 +0,0 @@
-Copyright (C) 2001-2013 Free Software Foundation, Inc.
-See the end of the file for license conditions.
-This directory contains Calc, an advanced desk calculator for GNU
-Emacs.
-"Calc"  Copyright (C) 1990-1993, 2001-2013 Free Software Foundation, Inc.
-Written by:
-        Dave Gillespie
-        c/o Synaptics, Inc.
-        2698 Orchard Parkway
-        San Jose CA 95134
-        daveg@synaptics.com, uunet!synaptx!daveg
-Currently maintained by:
-     Jay Belanger <jay.p.belanger@gmail.com>
-From the introduction to the manual:
-  "Calc" is an advanced calculator and mathematical tool that runs as
-  part of the GNU Emacs environment.  Very roughly based on the HP-28/48
-  series of calculators, its many features include:
-    * Choice of algebraic or RPN (stack-based) entry of calculations.
-    * Arbitrary precision integers and floating-point numbers.
-    * Arithmetic on rational numbers, complex numbers (rectangular and
-      polar), error forms with standard deviations, open and closed
-      intervals, vectors and matrices, dates and times, infinities,
-      sets, quantities with units, and algebraic formulas.
-    * Mathematical operations such as logarithms and trigonometric functions.
-    * Programmer's features (bitwise operations, non-decimal numbers).
-    * Financial functions such as future value and internal rate of return.
-    * Number theoretical features such as prime factorization and
-      arithmetic modulo M for any M.
-    * Algebraic manipulation features, including symbolic calculus.
-    * Moving data to and from regular editing buffers.
-    * "Embedded mode" for manipulating Calc formulas and data directly
-      inside any editing buffer.
-    * Graphics using GNUPLOT, a versatile (and free) plotting program.
-    * Easy programming using keyboard macros, algebraic formulas,
-      algebraic rewrite rules, or extended Emacs Lisp.
-Calc is written entirely in Emacs Lisp, for maximum portability.
-I am anxious to hear about your experiences using Calc.  Send mail to
-"jay.p.belanger@gmail.com".  A bug report is most useful if you include the
-exact input and output that occurred, any modes in effect (such as the
-current precision), and so on.  If you find Calc is difficult to operate
-in any way, or if you have other suggestions, don't hesitate to let me
-know.  If you find errors (including simple typos) in the manual, let
-me know.  Even if you find no bugs at all I would love to hear your
-opinions.
-Summary of changes to "Calc"
------- -- ------- --  ----
-For changes in Emacs 23.1 and later, see the main Emacs NEWS file.
-Version 2.1:
-* New matrix mode for square matrices.  Improved handling of
-  non-commutative products.
-* New functions: powerexpand and ldiv.
-* Added new functions: sec, csc, cot, sech, csch, coth.
-* 0^0 now evaluates to 1.
-* Added a new language mode for LaTeX.
-* Calc now tries to use an appropriate language mode in embedded mode.
-* Calc now restores original modes when leaving embedded mode.
-* User settable variables which are not set with keystrokes are now
-  customizable.
-* Made ~/.calc.el the default Calc settings file.
-* Miscellaneous updates and bugfixes.
-Version 2.02f:
- * Fixed a bug which broke `I', `H', `K' prefix keys in recent Emacs.
- * Fixed a bug in calc.texinfo which prevented "make tex2" from working.
- * Updated `C-y' (calc-yank) to understand Emacs 19 generalized kill ring.
- * Added a copy of "calccard.tex", the Calc quick reference card.
-Version 2.02e:
- * Fixed an installation bug caused by recent changes to `write-region'.
-Version 2.02d:
- * Fixed a minor installation problem with a Emacs 19.29 byte-compiler bug.
- * Removed archaic "macedit" package (superseded by "edmacro").
-Version 2.02c:
- * Patch to port Calc to Lucid Emacs 19; still works with GNU 18 and GNU 19.
- * Fixed a bug that broke `C-x C-c' after Calc graphics had been used.
-Version 2.02b:
- * Minor patch to port Calc to GNU Emacs 19.  Will be superseded by Calc 3.00.
-Version 2.02:
- * Revamped the manual a bit; rearranged some sections.
- * Added marginal notes for Key/Function Index refs in printed manual.
- * Changed `M-# r' to deal more gracefully with blank lines.
- * Made reductions like `V R +' and `M-# :' considerably faster.
- * Improved parsing and display of cases like "[a + b]".
- * Added `t +' and `t -' for doing business date arithmetic.
- * Added "syntax tables," the opposite of compositions.
- * Added another Rewrites Tutorial exercise.
- * Added the "vmatches" function.
- * Added the `Modes' variable and `m g' command.
- * Improved `u s' to cancel, e.g., "11 mph hr / yd" to get a number.
- * Added "quick units" commands "u 0" through "u 9".
- * Moved `M-%' to calc.el to avoid autoloading problems.
- * Added `M-=' during algebraic entry, acts like `RET ='.
- * Made `LFD' prevent evaluation when finishing a calc-edit command.
- * Changed calc-store commands to use `t .' mode for trail display.
- * Improved integrator to understand forms involving "erf".
- * Fixed parser to make sense of "[1....1e2]" input.
- * Fixed FORTRAN parser to treat a(i,j) as a_i_j if a is declared matrix.
- * Got rid of some version number stamps to reduce size of patches.
- * Fixed a bug in defmath treating "<=" and ">=" predicates.
- * Fixed a bug in which Calc crashed multiplying two date forms.
- * Fixed a bug in line breaker that crashed for large, nested formulas.
- * Fixed a bug using ` to edit string("foo").
- * Fixed a bug where `M-# y' in Big mode copied stack level number.
- * Fixed a bug where `g O' used wrong default directory, no completion.
- * Fixed a bug where "foo_bar(i)" parsed in C mode but showed as foo#bar.
- * Fixed several bugs where large calculations got "computation too long."
-Version 2.01:
- * Added percentage commands `M-%', `b %', and `c %'.
- * Changed Big mode to force radix-10 in superscripts.
- * Improved display of fractions in various language modes.
- * Changed `a n' to work properly with equations and inequalities.
- * The problem with cross references to Index nodes in TeX has been fixed.
- * Fixed a bug where recursive esc-maps make calc-ext/-aent unloadable.
- * Fixed a bug in `M-# k', then `OFF' right away, with fresh Emacs.
- * Fixed a bug in which "S_i_j" was formatted wrong after `j s'.
- * Fixed a bug in which `h k u c' positioned cursor on wrong line.
- * Fixed a bug where `z ?' crashed if `z %' was defined.
- * Fixed a bug in `j O' (calc-select-once-maybe).
- * Fixed "make private" not to ask "Delete excess versions" and crash.
-Version 2.00:
- * First complete posting of Calc since 1.01.
- * Most parts of Calc have seen changes since version 1.07.  See
-   section "New for Calc 2.00" in the manual for a summary.  In
-   the FTP version of the Calc distribution, the file README.prev
-   contains a detailed change history from 1.00 up to 2.00.
-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/>.
diff --git a/make-dist b/make-dist
index 788dca3462c..a6410421b49 100755
--- a/make-dist
+++ b/make-dist
@@ -314,7 +314,7 @@ done
 echo "Making links to \`lisp' and its subdirectories"
 files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \
- -o -name 'README*' \)`
+ -o -name 'README' \)`
 ### Don't distribute site-init.el, site-load.el, or default.el.
 for file in lisp/Makefile.in lisp/makefile.w32-in $files; do