Merge from trunk
[bpt/emacs.git] / src / insdel.c
diff --cc src/insdel.c
Simple merge