# HG changeset patch # User Dave Love # Date 1035816018 0 # Node ID af717e120019a292b4e5c008e391e7edfb627aef # Parent 129cd0abffe7cebb08ba8fb0196e4671a104f12c (diacritic-composition-function): Modify confused prog1 form. diff -r 129cd0abffe7 -r af717e120019 lisp/language/european.el --- a/lisp/language/european.el Mon Oct 28 14:38:00 2002 +0000 +++ b/lisp/language/european.el Mon Oct 28 14:40:18 2002 +0000 @@ -625,13 +625,12 @@ Optional 4th argument STRING, if non-nil, is a string containing text to compose. -The return value is number of composed characters." - (if (< (1+ from) to) - (prog1 (- to from) - (if string - (compose-string string from to) - (compose-region from to)) - (- to from)))) +The return value is the number of composed characters." + (when (< (1+ from) to) + (if string + (compose-string string from to) + (compose-region from to)) + (- to from))) ;; Register a function to compose Unicode diacrtics and marks. (let ((patterns '(("\\C^\\c^+" . diacritic-composition-function))))