aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorJoakim Verona2013-03-10 00:04:02 +0100
committerJoakim Verona2013-03-10 00:04:02 +0100
commitc446797d60edf1058f6cbec28e57255d245dd47b (patch)
treecde628bacb1ec48c0bea9b9db71516c953b1e534 /etc
parent4b882bf72aa0ed074cde5c27af51b8cf0b4d8620 (diff)
parent78cd48e721d04b94b35f6e02e7c1022092bf702e (diff)
downloademacs-c446797d60edf1058f6cbec28e57255d245dd47b.tar.gz
emacs-c446797d60edf1058f6cbec28e57255d245dd47b.zip
auto upstream
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/refcards/calccard.tex1
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index efa2c26b808..5bb1d89c25e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12013-03-09 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * refcards/calccard.tex: Remove incorrect entry.
4
12013-03-05 Paul Eggert <eggert@cs.ucla.edu> 52013-03-05 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 FILE's lock is now always .#FILE and may be a regular file (Bug#13807). 7 FILE's lock is now always .#FILE and may be a regular file (Bug#13807).
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index f0d84575f32..f9803ebd39d 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -554,7 +554,6 @@ Variable names are single digits or whole words.
554\key{symbolic (vs.\ numeric) mode}{m s} 554\key{symbolic (vs.\ numeric) mode}{m s}
555\key{fractions (vs.\ float) mode}{m f} 555\key{fractions (vs.\ float) mode}{m f}
556\key{suppress evaluation of formulas}{m O} 556\key{suppress evaluation of formulas}{m O}
557\key{simplify formulas automatically}{m S}
558\key{return to default evaluation rules}{m D} 557\key{return to default evaluation rules}{m D}
559 558
560\key{``Big'' display mode}{d B} 559\key{``Big'' display mode}{d B}