emacs: lisp/jit-lock.el comparison

comparison lisp/jit-lock.el @ 90596:6823a91487f2

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 399-413) - Update from CVS - Rcirc update from Ryan Yeske - Merge from gnus--rel--5.10 - Miscellaneous tq-related fixes. * gnus--rel--5.10 (patch 126-127) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-105

author	Miles Bader <miles@gnu.org>
date	Mon, 28 Aug 2006 04:33:45 +0000
parents	858cb33ae39d 5d642f9eff22
children	b5c13d1564a9

comparison

equal deleted inserted replaced

-:fd59c4164a14
+:6823a91487f2
 (make-variable-buffer-local 'jit-lock-context-unfontify-pos)
 (defvar jit-lock-stealth-timer nil
 "Timer for stealth fontification in Just-in-time Lock mode.")
+(defvar jit-lock-stealth-repeat-timer nil
+"Timer for repeated stealth fontification in Just-in-time Lock mode.")
 (defvar jit-lock-context-timer nil
 "Timer for context fontification in Just-in-time Lock mode.")
 (defvar jit-lock-defer-timer nil
 "Timer for deferred fontification in Just-in-time Lock mode.")
 (defvar jit-lock-defer-buffers nil
 "List of buffers with pending deferred fontification.")
+(defvar jit-lock-stealth-buffers nil
+"List of buffers that are being fontified stealthily.")
 ;;; JIT lock mode
 (defun jit-lock-mode (arg)
 "Toggle Just-in-time Lock mode.
 	 ;; Install an idle timer for stealth fontification.
 	 (when (and jit-lock-stealth-time (null jit-lock-stealth-timer))
 	   (setq jit-lock-stealth-timer
 		 (run-with-idle-timer jit-lock-stealth-time t
 				      'jit-lock-stealth-fontify)))
+	 ;; Create, but do not activate, the idle timer for repeated
+	 ;; stealth fontification.
+	 (when (and jit-lock-stealth-time (null jit-lock-stealth-repeat-timer))
+	   (setq jit-lock-stealth-repeat-timer (timer-create))
+	   (timer-set-function jit-lock-stealth-repeat-timer
+			       'jit-lock-stealth-fontify '(t)))
 	 ;; Init deferred fontification timer.
 	 (when (and jit-lock-defer-time (null jit-lock-defer-timer))
 	   (setq jit-lock-defer-timer
 		 (run-with-idle-timer jit-lock-defer-time t
 (lexical-let ((start start)
 (orig-start orig-start)
 (buf (current-buffer)))
 (run-with-timer
 0 nil (lambda ()
-(with-buffer-prepared-for-jit-lock
+(with-current-buffer buf
-(put-text-property start orig-start
+(with-buffer-prepared-for-jit-lock
-'fontified t buf))))))
+(put-text-property start orig-start
+'fontified t)))))))
 	   ;; Find the start of the next chunk, if any.
 	   (setq start (text-property-any next end 'fontified nil))))))))
 			   ((null next) start)
 			   ((< (- around start) (- next around)) start)
 			   (t next))))
 	result))))
+(defun jit-lock-stealth-fontify (&optional repeat)
-(defun jit-lock-stealth-fontify ()
 "Fontify buffers stealthily.
-This functions is called after Emacs has been idle for
+This function is called repeatedly after Emacs has become idle for
-`jit-lock-stealth-time' seconds."
+`jit-lock-stealth-time' seconds.  Optional argument REPEAT is expected
-;; I used to check `inhibit-read-only' here, but I can't remember why.  -stef
+non-nil in a repeated invocation of this function."
+;; Cancel timer for repeated invocations.
+(unless repeat
+(cancel-timer jit-lock-stealth-repeat-timer))
 (unless (or executing-kbd-macro
 	      memory-full
-	      (window-minibuffer-p (selected-window)))
+	      (window-minibuffer-p (selected-window))
-(let ((buffers (buffer-list))
+	      ;; For first invocation set up `jit-lock-stealth-buffers'.
-	  (outer-buffer (current-buffer))
+	      ;; In repeated invocations it's already been set up.
+	      (null (if repeat
+			jit-lock-stealth-buffers
+		      (setq jit-lock-stealth-buffers (buffer-list)))))
+(let ((buffer (car jit-lock-stealth-buffers))
+	  (delay 0)
 	  minibuffer-auto-raise
-	  message-log-max)
+	  message-log-max
-(with-local-quit
+	  start)
-	(while (and buffers (not (input-pending-p)))
+(if (and jit-lock-stealth-load
-	  (with-current-buffer (pop buffers)
+	       (> (car (load-average)) jit-lock-stealth-load))
-	    (when jit-lock-mode
+	  ;; Wait a little if load is too high.
-	      ;; This is funny.  Calling sit-for with 3rd arg non-nil
+	  (setq delay jit-lock-stealth-time)
-	      ;; so that it doesn't redisplay, internally calls
+	(if (buffer-live-p buffer)
-	      ;; wait_reading_process_input also with a parameter
+	    (with-current-buffer buffer
-	      ;; saying "don't redisplay."  Since this function here
+	      (if (and jit-lock-mode
-	      ;; is called periodically, this effectively leads to
+		       (setq start (jit-lock-stealth-chunk-start (point))))
-	      ;; process output not being redisplayed at all because
+		  ;; Fontify one block of at most `jit-lock-chunk-size'
-	      ;; redisplay_internal is never called.  (That didn't
+		  ;; characters.
-	      ;; work in the old redisplay either.)  So, we learn that
+		  (with-temp-message (if jit-lock-stealth-verbose
-	      ;; we mustn't call sit-for that way here.  But then, we
+					 (concat "JIT stealth lock "
-	      ;; have to be cautious not to call sit-for in a widened
+						 (buffer-name)))
-	      ;; buffer, since this could display hidden parts of that
+		    (jit-lock-fontify-now start
-	      ;; buffer.  This explains the seemingly weird use of
+					  (+ start jit-lock-chunk-size))
-	      ;; save-restriction/widen here.
+		    ;; Run again after `jit-lock-stealth-nice' seconds.
+		    (setq delay (or jit-lock-stealth-nice 0)))
-	      (with-temp-message (if jit-lock-stealth-verbose
+		;; Nothing to fontify here.  Remove this buffer from
-				     (concat "JIT stealth lock "
+		;; `jit-lock-stealth-buffers' and run again immediately.
-					     (buffer-name)))
+		(setq jit-lock-stealth-buffers (cdr jit-lock-stealth-buffers))))
+	  ;; Buffer is no longer live.  Remove it from
-		;; In the following code, the `sit-for' calls cause a
+	  ;; `jit-lock-stealth-buffers' and run again immediately.
-		;; redisplay, so it's required that the
+	  (setq jit-lock-stealth-buffers (cdr jit-lock-stealth-buffers))))
-		;; buffer-modified flag of a buffer that is displayed
+;; Call us again.
-		;; has the right value---otherwise the mode line of
+(when jit-lock-stealth-buffers
-		;; an unmodified buffer would show a `*'.
+	(timer-set-idle-time jit-lock-stealth-repeat-timer (current-idle-time))
-		(let (start
+	(timer-inc-time jit-lock-stealth-repeat-timer delay)
-		      (nice (or jit-lock-stealth-nice 0))
+	(timer-activate-when-idle jit-lock-stealth-repeat-timer t)))))
-		      (point (point-min)))
-		  (while (and (setq start
-				    (jit-lock-stealth-chunk-start point))
-			      ;; In case sit-for runs any timers,
-			      ;; give them the expected current buffer.
-			      (with-current-buffer outer-buffer
-				(sit-for nice)))
-		    ;; fontify a block.
-		    (jit-lock-fontify-now start (+ start jit-lock-chunk-size))
-		    ;; If stealth jit-locking is done backwards, this leads to
-		    ;; excessive O(n^2) refontification.   -stef
-		    ;; (when (>= jit-lock-context-unfontify-pos start)
-		    ;;   (setq jit-lock-context-unfontify-pos end))
-		    ;; Wait a little if load is too high.
-		    (when (and jit-lock-stealth-load
-			       (> (car (load-average)) jit-lock-stealth-load))
-		      ;; In case sit-for runs any timers,
-		      ;; give them the expected current buffer.
-		      (with-current-buffer outer-buffer
-			(sit-for (or jit-lock-stealth-time 30))))))))))))))
 ;;; Deferred fontification.
 (defun jit-lock-deferred-fontify ()
 This is run after every buffer change.  The functions are called with
 the three arguments of `after-change-functions': START END OLD-LEN.
 The extended region to refontify is returned indirectly by modifying
 the variables `jit-lock-start' and `jit-lock-end'.
-Note that extending the region this way is not strictly necessary,
+Note that extending the region this way is not strictly necessary, except
-except that the nature of the redisplay code tends to otherwise leave
+that the nature of the redisplay code tends to otherwise leave some of
-some of the rehighlighted text displayed with the old highlight until the
+the rehighlighted text displayed with the old highlight until the next
-next redisplay.  See comment in `jit-lock-fontify-now'.")
+redisplay (see comment about repeated redisplay in `jit-lock-fontify-now').")
 (defun jit-lock-after-change (start end old-len)
 "Mark the rest of the buffer as not fontified after a change.
 Installed on `after-change-functions'.
 START and END are the start and end of the changed text.  OLD-LEN

Mercurial > emacs

comparison lisp/jit-lock.el @ 90596:6823a91487f2