aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2013-01-31 19:51:08 -0800
committerGlenn Morris2013-01-31 19:51:08 -0800
commit86e100a6936882a982648c3fe2e09d82f5a94e55 (patch)
treeeb775b25f7549fce94fe38348cb9c45446571c07 /doc
parent1e77b18e33526319ee8bb9f1ebb28860ad20a4c2 (diff)
downloademacs-86e100a6936882a982648c3fe2e09d82f5a94e55.tar.gz
emacs-86e100a6936882a982648c3fe2e09d82f5a94e55.zip
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
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/calc.texi5
2 files changed, 6 insertions, 3 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 @@
12013-02-01 Glenn Morris <rgm@gnu.org>
2
3 * calc.texi (Help Commands): Update calc-view-news description.
4
12013-01-24 Michael Albinus <michael.albinus@gmx.de> 52013-01-24 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * tramp.texi (Filename Syntax): Filenames must be unibyte strings. 7 * 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.
9909 9909
9910@kindex h n 9910@kindex h n
9911The @kbd{h n} or @kbd{h C-n} (@code{calc-view-news}) command displays 9911The @kbd{h n} or @kbd{h C-n} (@code{calc-view-news}) command displays
9912the ``news'' or change history of Calc. This is kept in the file 9912the ``news'' or change history of Emacs, and jumps to the most recent
9913@file{README}, which Calc looks for in the same directory as the Calc 9913portion concerning Calc (if present).
9914source files.
9915 9914
9916@kindex h C-c 9915@kindex h C-c
9917@kindex h C-d 9916@kindex h C-d