diff options
| author | Paul Eggert | 2011-08-04 19:19:34 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-08-04 19:19:34 -0700 |
| commit | 0e51f7172bd1ab8b9c1bb52598afb5017e19b9c3 (patch) | |
| tree | 5f09676e1b87f3f274a60fe79728f84a3d0c9a9b /src/chartab.c | |
| parent | 0065d05491ce5981ea20896bb26d21dcd31e6769 (diff) | |
| parent | e504613cc63d2a3925c546177a04637e25a1a4ae (diff) | |
| download | emacs-0e51f7172bd1ab8b9c1bb52598afb5017e19b9c3.tar.gz emacs-0e51f7172bd1ab8b9c1bb52598afb5017e19b9c3.zip | |
Merge from trunk.
Diffstat (limited to 'src/chartab.c')
| -rw-r--r-- | src/chartab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chartab.c b/src/chartab.c index efe23eca83f..fb72004356e 100644 --- a/src/chartab.c +++ b/src/chartab.c | |||
| @@ -1310,7 +1310,7 @@ uniprop_get_encoder (Lisp_Object table) | |||
| 1310 | function may load a Lisp file and thus may cause | 1310 | function may load a Lisp file and thus may cause |
| 1311 | garbage-collection. */ | 1311 | garbage-collection. */ |
| 1312 | 1312 | ||
| 1313 | static Lisp_Object | 1313 | Lisp_Object |
| 1314 | uniprop_table (Lisp_Object prop) | 1314 | uniprop_table (Lisp_Object prop) |
| 1315 | { | 1315 | { |
| 1316 | Lisp_Object val, table, result; | 1316 | Lisp_Object val, table, result; |