summaryrefslogtreecommitdiff
path: root/src/composite.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-06-22 09:01:00 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-06-22 09:01:00 -0700
commit510005210ac9f4d813c4a2cc99b2c3c11e57c055 (patch)
tree85b8b7bd35e451c71f9f58f2de3ae3ae16c0b25f /src/composite.c
parentb79e8648b908c6600b99c20d4782e6413d6907ef (diff)
parentddb7ffeeb8ace6501eb453f50f0f9f6852eda21f (diff)
downloademacs-510005210ac9f4d813c4a2cc99b2c3c11e57c055.tar.gz
Merge from trunk.
Diffstat (limited to 'src/composite.c')
-rw-r--r--src/composite.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/composite.c b/src/composite.c
index f494f454a9c..796c5a58de6 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1677,7 +1677,6 @@ find_automatic_composition (EMACS_INT pos, EMACS_INT limit,
}
BACKWARD_CHAR (cur, stop);
}
- return 0;
}
/* Return the adjusted point provided that point is moved from LAST_PT