aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2015-12-07 08:35:53 -0800
committerPaul Eggert2015-12-07 08:38:05 -0800
commit9b0ffdbaddec7d9d46dcd7fc525c4fde7c842c46 (patch)
tree2ca71fc967f2ecd5c59c51bad3d8f10e666eabfa /src
parentf366f23624d9c571a9203c23d73cd5a2b141483f (diff)
downloademacs-9b0ffdbaddec7d9d46dcd7fc525c4fde7c842c46.tar.gz
emacs-9b0ffdbaddec7d9d46dcd7fc525c4fde7c842c46.zip
Spelling fixes
* doc/misc/calc.texi (Predefined Units): Use the bland modern scientific style for spelling the units “ampere” and “angstrom” rather than the older style “Ampere” and “Ångstrom”. The latter spelling was wrong anyway (it should have been “Ångström”). * lisp/emacs-lisp/ert.el (ert--explain-equal-rec): Fix misspelling of ‘atom’ in code.
Diffstat (limited to 'src')
-rw-r--r--src/emacs-module.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emacs-module.c b/src/emacs-module.c
index 9967fc49afe..620df930a44 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -906,7 +906,7 @@ value_to_lisp (emacs_value v)
906 906
907/* Attempt to convert O to an emacs_value. Do not do any checking or 907/* Attempt to convert O to an emacs_value. Do not do any checking or
908 or allocate any storage; the caller should prevent or detect 908 or allocate any storage; the caller should prevent or detect
909 any resulting bitpattern that is not a valid emacs_value. */ 909 any resulting bit pattern that is not a valid emacs_value. */
910static emacs_value 910static emacs_value
911lisp_to_value_bits (Lisp_Object o) 911lisp_to_value_bits (Lisp_Object o)
912{ 912{
@@ -932,7 +932,7 @@ lisp_to_value (Lisp_Object o)
932 932
933 if (! EQ (o, value_to_lisp_bits (v))) 933 if (! EQ (o, value_to_lisp_bits (v)))
934 { 934 {
935 /* Package the uncompressible object pointer inside a pair 935 /* Package the incompressible object pointer inside a pair
936 that is compressible. */ 936 that is compressible. */
937 Lisp_Object pair = Fcons (o, ltv_mark); 937 Lisp_Object pair = Fcons (o, ltv_mark);
938 938
@@ -944,7 +944,7 @@ lisp_to_value (Lisp_Object o)
944 pair = Fcons (o, pair); 944 pair = Fcons (o, pair);
945 945
946 /* Plant the mark. The garbage collector will eventually 946 /* Plant the mark. The garbage collector will eventually
947 reclaim any just-allocated uncompressible pairs. */ 947 reclaim any just-allocated incompressible pairs. */
948 XSETCDR (pair, ltv_mark); 948 XSETCDR (pair, ltv_mark);
949 } 949 }
950 950