aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2002-10-28 14:40:18 +0000
committerDave Love2002-10-28 14:40:18 +0000
commit34b5d116a3fed46503f6a8844095c88031e36759 (patch)
treebfe166c5329a7fb4dd47896b546d4ac2b87870a1
parentd14a2a1f3656673dcd9e73ac9fb9f36faa4dad0d (diff)
downloademacs-34b5d116a3fed46503f6a8844095c88031e36759.tar.gz
emacs-34b5d116a3fed46503f6a8844095c88031e36759.zip
(diacritic-composition-function): Modify
confused prog1 form.
-rw-r--r--lisp/language/european.el13
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 338b73fe960..c531b74fbda 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -625,13 +625,12 @@ The text matches the regular expression PATTERN.
625Optional 4th argument STRING, if non-nil, is a string containing text 625Optional 4th argument STRING, if non-nil, is a string containing text
626to compose. 626to compose.
627 627
628The return value is number of composed characters." 628The return value is the number of composed characters."
629 (if (< (1+ from) to) 629 (when (< (1+ from) to)
630 (prog1 (- to from) 630 (if string
631 (if string 631 (compose-string string from to)
632 (compose-string string from to) 632 (compose-region from to))
633 (compose-region from to)) 633 (- to from)))
634 (- to from))))
635 634
636;; Register a function to compose Unicode diacrtics and marks. 635;; Register a function to compose Unicode diacrtics and marks.
637(let ((patterns '(("\\C^\\c^+" . diacritic-composition-function)))) 636(let ((patterns '(("\\C^\\c^+" . diacritic-composition-function))))