merge patch by Stefan Monnier from PR#5884

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk/emacs@13253 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02