diff options
| author | Richard M. Stallman | 1997-08-15 19:30:25 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-08-15 19:30:25 +0000 |
| commit | 34fbecde23fc6731b2414ac0fcaf4732dc5fbc72 (patch) | |
| tree | 9f9d46934b5bb996182dd8184799ab2484889a03 | |
| parent | 350ce4cf0aa3fa61e04572888ea5a5dfd36b5184 (diff) | |
| download | emacs-34fbecde23fc6731b2414ac0fcaf4732dc5fbc72.tar.gz emacs-34fbecde23fc6731b2414ac0fcaf4732dc5fbc72.zip | |
(format-annotate-atomic-property-change): Fix prev change.
| -rw-r--r-- | lisp/format.el | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lisp/format.el b/lisp/format.el index 9a74869be86..8ed5d78ab47 100644 --- a/lisp/format.el +++ b/lisp/format.el | |||
| @@ -860,20 +860,20 @@ OLD and NEW are the values." | |||
| 860 | (setq num-ann (cdr num-ann))))) | 860 | (setq num-ann (cdr num-ann))))) |
| 861 | (if num-ann | 861 | (if num-ann |
| 862 | ;; Numerical annotation - use difference | 862 | ;; Numerical annotation - use difference |
| 863 | 863 | (progn | |
| 864 | ;; If property is numeric, nil means 0 | 864 | ;; If property is numeric, nil means 0 |
| 865 | (cond ((and (numberp old) (null new)) | 865 | (cond ((and (numberp old) (null new)) |
| 866 | (setq new 0)) | 866 | (setq new 0)) |
| 867 | ((and (numberp new) (null old)) | 867 | ((and (numberp new) (null old)) |
| 868 | (setq old 0))) | 868 | (setq old 0))) |
| 869 | 869 | ||
| 870 | (let* ((entry (car num-ann)) | 870 | (let* ((entry (car num-ann)) |
| 871 | (increment (car entry)) | 871 | (increment (car entry)) |
| 872 | (n (ceiling (/ (float (- new old)) (float increment)))) | 872 | (n (ceiling (/ (float (- new old)) (float increment)))) |
| 873 | (anno (car (cdr entry)))) | 873 | (anno (car (cdr entry)))) |
| 874 | (if (> n 0) | 874 | (if (> n 0) |
| 875 | (cons nil (make-list n anno)) | 875 | (cons nil (make-list n anno)) |
| 876 | (cons (make-list (- n) anno) nil))) | 876 | (cons (make-list (- n) anno) nil)))) |
| 877 | 877 | ||
| 878 | ;; Standard annotation | 878 | ;; Standard annotation |
| 879 | (let ((close (and old (cdr (assoc old prop-alist)))) | 879 | (let ((close (and old (cdr (assoc old prop-alist)))) |