diff options
| author | Paul Eggert | 2013-08-03 14:09:57 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-08-03 14:09:57 -0700 |
| commit | 98f638d640c0bb4cbda7a3134611b03b6ee08d44 (patch) | |
| tree | 7fd18ad6b0446afcf7211e50eec3bc954a8f3454 /src/composite.c | |
| parent | 416a3e013f845dc93385cfdf8b95e1f42bab5462 (diff) | |
| download | emacs-98f638d640c0bb4cbda7a3134611b03b6ee08d44.tar.gz emacs-98f638d640c0bb4cbda7a3134611b03b6ee08d44.zip | |
* composite.h: Minor fixups.
(composition_registered_p): Rename from COMPOSITION_REGISTERD_P
to fix a misspelling, and change it to an inline function while
we're at it (it need not be a macro). All uses changed.
(composition_method, composition_valid_p):
Rewrite to avoid assignments in if-conditions.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/composite.c b/src/composite.c index 91a5c75630a..28942fe4f74 100644 --- a/src/composite.c +++ b/src/composite.c | |||
| @@ -1873,7 +1873,7 @@ See `find-composition' for more details. */) | |||
| 1873 | if (NILP (detail_p)) | 1873 | if (NILP (detail_p)) |
| 1874 | return list3 (make_number (start), make_number (end), Qt); | 1874 | return list3 (make_number (start), make_number (end), Qt); |
| 1875 | 1875 | ||
| 1876 | if (COMPOSITION_REGISTERD_P (prop)) | 1876 | if (composition_registered_p (prop)) |
| 1877 | id = COMPOSITION_ID (prop); | 1877 | id = COMPOSITION_ID (prop); |
| 1878 | else | 1878 | else |
| 1879 | { | 1879 | { |