comparison lisp/occur.el @ 5473:ac37a5f7e5be

Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Thu, 17 Mar 2011 23:42:59 +0100
parents 308d34e9f07d ed74d2ca7082
children cc6f0266bc36
comparison
equal deleted inserted replaced
5472:e79980ee5efe 5473:ac37a5f7e5be
465 (setq marker (make-marker)) 465 (setq marker (make-marker))
466 (set-marker marker matchbeg) 466 (set-marker marker matchbeg)
467 (if (and keep-props 467 (if (and keep-props
468 (if-boundp 'jit-lock-mode jit-lock-mode) 468 (if-boundp 'jit-lock-mode jit-lock-mode)
469 (text-property-not-all begpt endpt 'fontified t)) 469 (text-property-not-all begpt endpt 'fontified t))
470 (if-fboundp #'jit-lock-fontify-now 470 (if-fboundp 'jit-lock-fontify-now
471 (jit-lock-fontify-now begpt endpt))) 471 (jit-lock-fontify-now begpt endpt)))
472 (setq curstring (buffer-substring begpt endpt)) 472 (setq curstring (buffer-substring begpt endpt))
473 ;; Depropertize the string, and maybe 473 ;; Depropertize the string, and maybe
474 ;; highlight the matches 474 ;; highlight the matches
475 (let ((len (length curstring)) 475 (let ((len (length curstring))