[Emacs-diffs] Changes to emacs/lisp/enriched.el

[Pavel Janík]

Index: emacs/lisp/enriched.el
diff -c emacs/lisp/enriched.el:1.38 emacs/lisp/enriched.el:1.39
*** emacs/lisp/enriched.el:1.38 Sat Jan  5 04:05:35 2002
--- emacs/lisp/enriched.el      Sun Jan  6 06:35:17 2002
***************
*** 315,330 ****
  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))
        ;; Otherwise it is an annotation with parameters, represented as a list
        (positive
!        (let ((item (car name))
!              (params (cdr name)))
           (concat (format enriched-annotation-format "" item)
                   (mapconcat (lambda (i) (concat "<param>" i "</param>"))
                              params ""))))
!       (t (format enriched-annotation-format "/" (car name)))))
  
  (defun enriched-encode-other-face (old new)
    "Generate annotations for random face change.
--- 315,330 ----
  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 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 internal-ann))
!              (params (cdr internal-ann)))
           (concat (format enriched-annotation-format "" item)
                   (mapconcat (lambda (i) (concat "<param>" i "</param>"))
                              params ""))))
!       (t (format enriched-annotation-format "/" (car internal-ann)))))
  
  (defun enriched-encode-other-face (old new)
    "Generate annotations for random face change.
***************
*** 465,473 ****
    (let ((annotation "x-display")
        (param (prin1-to-string (or old new))))
      (if (null old)
!       (list nil (list annotation param))
!       (list (list annotation param)))))
! 
  
  (defun enriched-decode-display-prop (start end &optional param)
    "Decode a `display' property for text between START and END.
--- 465,472 ----
    (let ((annotation "x-display")
        (param (prin1-to-string (or old new))))
      (if (null old)
!         (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.