From 687a9f309a2a1c319d063399532af87e8f58d6fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pavel=20Jan=C3=ADk?= Date: Sun, 6 Jan 2002 11:37:36 +0000 Subject: [PATCH] (enriched-make-annotation): Fix the change from 2002-01-05. (enriched-handle-display-prop): Return proper values. --- lisp/ChangeLog | 4 ++++ lisp/enriched.el | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1ba740b9354..7b55a7eb46b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2002-01-06 Pavel Jan,Bm(Bk + * enriched.el (enriched-make-annotation): Fix the change from + 2002-01-05. + (enriched-handle-display-prop): Return proper values. + * net/eudcb-ldap.el (eudc-attribute-display-method-alist): Use proper attribute name labeledUri instead of deprecated labeledUrl. diff --git a/lisp/enriched.el b/lisp/enriched.el index d3bd7084d15..74258e60941 100644 --- a/lisp/enriched.el +++ b/lisp/enriched.el @@ -315,16 +315,16 @@ the region, and the START and END of each region." INTERNAL-ANN may be a string, for a flag, or a list of the form (PARAM VALUE). If POSITIVE is non-nil, this is the opening annotation; if nil, the matching close." - (cond ((stringp name) - (format enriched-annotation-format (if positive "" "/") name)) + (cond ((stringp internal-ann) + (format enriched-annotation-format (if positive "" "/") internal-ann)) ;; Otherwise it is an annotation with parameters, represented as a list (positive - (let ((item (car name)) - (params (cdr name))) + (let ((item (car internal-ann)) + (params (cdr internal-ann))) (concat (format enriched-annotation-format "" item) (mapconcat (lambda (i) (concat "" i "")) params "")))) - (t (format enriched-annotation-format "/" (car name))))) + (t (format enriched-annotation-format "/" (car internal-ann))))) (defun enriched-encode-other-face (old new) "Generate annotations for random face change. @@ -465,9 +465,8 @@ has the form `(ANNOTATION PARAM ...)'." (let ((annotation "x-display") (param (prin1-to-string (or old new)))) (if (null old) - (list nil (list annotation param)) - (list (list annotation param))))) - + (cons nil (list (list annotation param))) + (cons (list (list annotation param)) nil)))) (defun enriched-decode-display-prop (start end &optional param) "Decode a `display' property for text between START and END. -- 2.39.2