Mercurial > hg > xemacs-beta
changeset 670:12095b04a9b6
[xemacs-hg @ 2001-09-29 08:02:03 by ben]
font-lock.el: fix problem with last patch, reported by Katsumi Yamaoka.
| author | ben |
|---|---|
| date | Sat, 29 Sep 2001 08:03:01 +0000 |
| parents | 5c696033aec4 |
| children | 53ec80338ec1 |
| files | configure lisp/ChangeLog lisp/font-lock.el |
| diffstat | 3 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Sep 28 15:31:01 2001 +0000 +++ b/configure Sat Sep 29 08:03:01 2001 +0000 @@ -222,13 +222,13 @@ infopath='' install_pp='' lispdir='${datadir}/${instvardir}/lisp' -moduledir='${datadir}/${instvardir}/${configuration}/modules' +moduledir='${libdir}/${instvardir}/${configuration}/modules' sitelispdir='${datadir}/${inststaticdir}/site-lisp' -sitemoduledir='${datadir}/${inststaticdir}/site-modules' +sitemoduledir='${libdir}/${inststaticdir}/site-modules' pkgdir='${datadir}/${instvardir}/lisp' package_path='' etcdir='${datadir}/${instvardir}/etc' -archlibdir='${datadir}/${instvardir}/${configuration}' +archlibdir='${libdir}/${instvardir}/${configuration}' docdir='${archlibdir}' with_netinstall="no" with_prefix='yes'
--- a/lisp/ChangeLog Fri Sep 28 15:31:01 2001 +0000 +++ b/lisp/ChangeLog Sat Sep 29 08:03:01 2001 +0000 @@ -1,3 +1,9 @@ +2001-09-28 Ben Wing <ben@xemacs.org> + + * font-lock.el: + * font-lock.el (font-lock-after-change-function): + fix problem with last patch, reported by Katsumi Yamaoka. + 2001-09-17 Ben Wing <ben@xemacs.org> * font-lock.el (font-lock-after-change-function):
--- a/lisp/font-lock.el Fri Sep 28 15:31:01 2001 +0000 +++ b/lisp/font-lock.el Sat Sep 29 08:03:01 2001 +0000 @@ -2,7 +2,7 @@ ;; Copyright (C) 1992-1995, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Amdahl Corporation. -;; Copyright (C) 1996, 2000 Ben Wing. +;; Copyright (C) 1996, 2000, 2001 Ben Wing. ;; Author: Jamie Zawinski <jwz@jwz.org>, for the LISPM Preservation Society. ;; Minimally merged with FSF 19.34 by Barry Warsaw <bwarsaw@python.org> @@ -1210,7 +1210,8 @@ ;; line of code turns the comment color.) this is a bit of a hack ;; but allows us to use text properties for everything. (if (= beg end) - (cond ((not (eolp)) (setq end (1+ end))) + (cond ((not (save-excursion (goto-char end) (eolp))) + (setq end (1+ end))) ((/= beg (point-min)) (setq beg (1- beg))) (t nil))) (put-text-property beg end 'font-lock-pending t)