summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calc/README59
-rw-r--r--lisp/calc/calc-help.el20
3 files changed, 8 insertions, 75 deletions
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")