comparison lisp/format.el @ 19235:759e45894579

(format-annotate-single-property-change, format-annotate-atomic-property-change): move code that interprets nil as 0 inside test that property is numeric.

19234:55924d8a5b9e

Annotations to open and to close are returned as a dotted pair."
  (let ((prop-alist (cdr (assoc prop trans)))
	default)
    (if (not prop-alist)
	nil
      ;; If property is numeric, nil means 0
      (cond ((and (numberp old) (null new))
	     (setq new 0))
	    ((and (numberp new) (null old))
	     (setq old 0)))
      ;; If either old or new is a list, have to treat both that way.
      (if (or (consp old) (consp new))
	  (let* ((old (if (listp old) old (list old)))
		 (new (if (listp new) new (list new)))
		 (tail (format-common-tail old new))

PROP-ALIST is the relevant segment of a TRANSLATIONS list.
OLD and NEW are the values."
  (let (num-ann)
    ;; If old and new values are numbers,
    ;; look for a number in PROP-ALIST.
    (if (and (numberp old) (numberp new))
	(progn
	  (setq num-ann prop-alist)
	  (while (and num-ann (not (numberp (car (car num-ann)))))
	    (setq num-ann (cdr num-ann)))))
    (if num-ann
       ;; Numerical annotation - use difference
       (let* ((entry (car num-ann))
              (increment (car entry))
              (n (ceiling (/ (float (- new old)) (float increment))))
              (anno (car (cdr entry))))
         (if (> n 0)

19235:759e45894579

Annotations to open and to close are returned as a dotted pair."
  (let ((prop-alist (cdr (assoc prop trans)))
	default)
    (if (not prop-alist)
	nil
      ;; If either old or new is a list, have to treat both that way.
      (if (or (consp old) (consp new))
	  (let* ((old (if (listp old) old (list old)))
		 (new (if (listp new) new (list new)))
		 (tail (format-common-tail old new))

PROP-ALIST is the relevant segment of a TRANSLATIONS list.
OLD and NEW are the values."
  (let (num-ann)
    ;; If old and new values are numbers,
    ;; look for a number in PROP-ALIST.
    (if (and (or (null old) (numberp old))
	     (or (null new) (numberp new)))
	(progn
	  (setq num-ann prop-alist)
	  (while (and num-ann (not (numberp (car (car num-ann)))))
	    (setq num-ann (cdr num-ann)))))
    (if num-ann
	;; Numerical annotation - use difference

	;; If property is numeric, nil means 0
	(cond ((and (numberp old) (null new))
	       (setq new 0))
	      ((and (numberp new) (null old))
	       (setq old 0)))

       (let* ((entry (car num-ann))
              (increment (car entry))
              (n (ceiling (/ (float (- new old)) (float increment))))
              (anno (car (cdr entry))))
         (if (> n 0)