diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/composite.c | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2 emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/composite.c b/src/composite.c index ab1c11a0f70..92bedcc5f2b 100644 --- a/src/composite.c +++ b/src/composite.c @@ -2041,5 +2041,3 @@ See also the documentation of `auto-composition-mode'. */); defsubr (&Scomposition_get_gstring); } -/* arch-tag: 79cefaf8-ca48-4eed-97e5-d5afb290d272 - (do not change this comment) */ |