diff options
| author | Jay Belanger | 2013-04-04 21:20:35 -0500 |
|---|---|---|
| committer | Jay Belanger | 2013-04-04 21:20:35 -0500 |
| commit | 0ccecc08cd5946f1dd3923d655862d160973f7dd (patch) | |
| tree | 2a47640fb169c30dcc8f9d0efc4521faf1712ad6 /lisp/ChangeLog | |
| parent | 567d89caf1304c780e3cedc9db4c31a2ce57d588 (diff) | |
| download | emacs-0ccecc08cd5946f1dd3923d655862d160973f7dd.tar.gz emacs-0ccecc08cd5946f1dd3923d655862d160973f7dd.zip | |
* lisp/calc/calc.el (calc-allow-units-as-numbers): Move declaration.
* lisp/calc/calc-units.el (calc-convert-units): Redo conditional.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8806bc2ac48..015ce23ef8e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-04-05 Jay Belanger <jay.p.belanger@gmail.com> | ||
| 2 | |||
| 3 | * calc/calc-units.el (calc-convert-units): Rewrite conditional. | ||
| 4 | |||
| 1 | 2013-04-04 Glenn Morris <rgm@gnu.org> | 5 | 2013-04-04 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * electric.el (electric-pair-inhibit-predicate): Add :version. | 7 | * electric.el (electric-pair-inhibit-predicate): Add :version. |