[Emacs-diffs] /srv/bzr/emacs/trunk r111643: Merge calc news from lisp/calc/README into etc/NEWS files

[Glenn Morris]

------------------------------------------------------------
revno: 111643
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2013-01-31 19:51:08 -0800
message:
  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
modified:
  doc/misc/ChangeLog
  doc/misc/calc.texi
  etc/NEWS
  etc/NEWS.23
  lisp/ChangeLog
  lisp/calc/README
  lisp/calc/calc-help.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-01-24 09:43:32 +0000
+++ b/doc/misc/ChangeLog        2013-02-01 03:51:08 +0000
@@ -1,3 +1,7 @@
+2013-02-01  Glenn Morris  <address@hidden>
+
+       * calc.texi (Help Commands): Update calc-view-news description.
+
 2013-01-24  Michael Albinus  <address@hidden>
 
        * tramp.texi (Filename Syntax): Filenames must be unibyte strings.

=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi        2013-01-02 16:13:04 +0000
+++ b/doc/misc/calc.texi        2013-02-01 03:51:08 +0000
@@ -9909,9 +9909,8 @@
 
 @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
address@hidden, 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

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-01-31 02:57:35 +0000
+++ b/etc/NEWS  2013-02-01 03:51:08 +0000
@@ -107,6 +107,8 @@
 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 @@
 *** 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 @@
 *** 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".

=== modified file 'etc/NEWS.23'
--- a/etc/NEWS.23       2013-01-01 09:11:05 +0000
+++ b/etc/NEWS.23       2013-02-01 03:51:08 +0000
@@ -329,6 +329,8 @@
 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 @@
 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.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-31 08:33:03 +0000
+++ b/lisp/ChangeLog    2013-02-01 03:51:08 +0000
@@ -1,3 +1,7 @@
+2013-02-01  Glenn Morris  <address@hidden>
+
+       * calc/calc-help.el (calc-view-news): Use view-emacs-news.
+
 2013-01-31  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-tramp-file-p): Comment check for

=== modified file 'lisp/calc/README'
--- a/lisp/calc/README  2013-01-03 02:37:57 +0000
+++ b/lisp/calc/README  2013-02-01 03:51:08 +0000
@@ -70,64 +70,7 @@
 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:
 

=== modified file 'lisp/calc/calc-help.el'
--- a/lisp/calc/calc-help.el    2013-01-01 09:11:05 +0000
+++ b/lisp/calc/calc-help.el    2013-02-01 03:51:08 +0000
@@ -386,23 +386,9 @@
 
 (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")