Merge calc news from lisp/calc/README into etc/NEWS files

* doc/misc/calc.texi (Help Commands): Update calc-view-news description.

* lisp/calc/calc-help.el (calc-view-news): Use view-emacs-news.

* lisp/calc/README: Move news entries from here...
* etc/NEWS, etc/NEWS.23: ... to here

7 files changed, 65 insertions, 78 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index f139b4255e0..942f0fbab31 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-01  Glenn Morris  <rgm@gnu.org>
+
+        * calc.texi (Help Commands): Update calc-view-news description.
+
 2013-01-24  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Filename Syntax): Filenames must be unibyte strings.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 5dabf5cd314..ff3ec06fc40 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -9909,9 +9909,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 Calc.  This is kept in the file
-@file{README}, which Calc looks for in the same directory as the Calc
-source files.
+the ``news'' or change history of Emacs, and jumps to the most recent
+portion concerning Calc (if present).
 
 @kindex h C-c
 @kindex h C-d
diff --git a/etc/NEWS b/etc/NEWS
index 2128be01b65..4696d9aace6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -107,6 +107,8 @@ Nil, the default value, means to always use the Gregorian calendar.
 The value (YEAR MONTH DAY) means to start using the Gregorian calendar
 on the given date.
 
+*** Support for ISO 8601 dates.
+
 ** ERC
 
 *** New option `erc-accidental-paste-threshold-seconds'.
@@ -719,6 +721,12 @@ see the `apropos' Custom group for details.
 *** Option `Buffer-menu-buffer+size-width' is now obsolete.
 Use `Buffer-menu-name-width' and `Buffer-menu-size-width' instead.
 
+** Calc
+
+*** Algebraic simplification mode is now the default.
+To restrict to the limited simplifications given by the former
+default simplification mode, use `m I'.
+
 ** Calendar
 
 *** You can customize the header text that appears above each calendar month.
@@ -1648,6 +1656,23 @@ Use the variable `bibtex-dialect' to select different BibTeX dialects.
 *** The default browser used by the package is now the "xdg-open" program,
 on platforms that support it.  This calls your desktop's preferred browser.
 
+** Calc
+
+*** Support for musical notes.
+
+*** Support for logarithmic units.
+
+*** No longer uses the tex prefix for TeX specific unit names when
+using TeX or LaTeX mode.
+
+*** New option to highlight selections using faces.
+
+*** `calc-histogram' has the option of using a vector to determine the bins.
+
+*** New "O" option prefix.
+
+*** Use the "O" prefix to "d r" (`calc-radix') to turn on twos-complement mode.
+
 ** Calendar, Diary, and Appt
 
 *** Diary entries can contain non-printing "comments".
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index eaef3220d41..88371c30cef 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -329,6 +329,8 @@ that file exists.
 user-emacs-directory; but the old location, ~/.calc.el, is used if
 that file exists.
 
+*** New twos-complement display.
+
 *** Graphing commands (`g f' etc.) now work on MS-Windows, if you have
 the native Windows port of Gnuplot version 3.8 or later installed.
 
@@ -1372,6 +1374,30 @@ identify cited keys in BibTeX entries, used by `bibtex-find-crossref'.
 bookmark.el can read a .emacs.bmk file saved by an older Emacs, but an
 older Emacs cannot read one saved by Emacs 23.
 
+** Calc
+
+*** `j *' (cal-sel-mult-both-sides) has an option to expand the denominator.
+
+*** `calc-embedded-word-regexp' is used for finding words in
+`calc-embedded-word' in place of delimiters.
+
+*** The separate Calc version number has been removed; use the Emacs
+version for reference.
+
+*** Support for using registers.
+
+*** Support for Yacas, Maxima and Giac languages.
+
+*** Addition of a menu.
+
+*** Logistic non-linear curves have been added to curve-fitting.
+
+*** New option to plot data points and curve when curve-fitting.
+
+*** Unit conversions are now exact when possible.
+
+*** The precedence of negation has been lowered.
+
 ** Calendar and diary
 
 *** There is a new date style, `iso', essentially year/month/day.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2be5f5fae4..ef5cb151aac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-01  Glenn Morris  <rgm@gnu.org>
+
+        * calc/calc-help.el (calc-view-news): Use view-emacs-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
index c44ffe5aef0..be5f9bdf34f 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -70,64 +70,7 @@ opinions.
 Summary of changes to "Calc"
 ------- -- ------- --  ----
 
-Emacs 24.4
-
-* The date forms use the Gregorian calendar for all dates.
-  (Previously they were a combination of Julian and Gregorian
-  dates.)  This can be configured with the customizable variable
-  `calc-gregorian-switch'.
-
-* Support for ISO 8601 dates added.
-Emacs 24.3
-
-* Algebraic simplification mode is now the default.
-  To restrict to the limited simplifications given by the former
-  default simplification mode, use `m I'.
-
-Emacs 24.1
-
-* Support for musical notes added.
-
-* Support for logarithmic units added.
-
-* Calc no longer uses the tex prefix for TeX specific unit 
-names when using TeX or LaTeX mode.
-
-* Added option to highlight selections using faces.
-
-* Gave `calc-histogram' the option of using a vector to determine the bins.
-
-* Added "O" option prefix.
-
-* Used "O" prefix to "d r" (`calc-radix') to turn on twos-complement mode.
-
-Emacs 23.2
-
-* Added twos-complement display.
-
-Emacs 23.1:
-
-* Gave `j *' (cal-sel-mult-both-sides) an option to expand the
-  denominator.
-
-* Use `calc-embedded-word-regexp' for finding words in
-  `calc-embedded-word' in place of delimiters.
-
-* Remove version numbering; use Emacs version for reference.
-
-* Added support for using registers.
-
-* Added support for Yacas, Maxima and Giac languages.
-
-* Added a menu.
-
-* Added logistic non-linear curves to curve-fitting.
-
-* Added option of plotting data points and curve when curve-fitting.
-
-* Made unit conversions exact when possible.
-
-* Lowered the precedence of negation.
+For changes in Emacs 23.1 and later, see the main Emacs NEWS file.
 
 Version 2.1:
 
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 512faefa78f..2b7b56c3f89 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -386,23 +386,9 @@ C-w  Describe how there is no warranty for Calc."
 
 (defun calc-view-news ()
   (interactive)
-  (let ((path load-path))
-    (while (and path
-                (not (file-exists-p (expand-file-name "calc.el" (car path)))))
-      (setq path (cdr path)))
-    (or (and path
-             (file-exists-p (expand-file-name "README" (car path))))
-        (error "Can't locate Calc sources"))
-    (calc-quit)
-    (switch-to-buffer "*Help*")
-    (let ((inhibit-read-only t))
-      (erase-buffer)
-      (insert-file-contents (expand-file-name "README" (car path)))
-      (search-forward "Summary of changes")
-      (forward-line -1)
-      (delete-region (point-min) (point))
-      (goto-char (point-min)))
-    (help-mode)))
+  (calc-quit)
+  (view-emacs-news)
+  (re-search-forward "^\*+ .*\\<Calc\\>" nil t))
 
 (defvar calc-help-long-names '((?b . "binary/business")
                                (?g . "graphics")