-;;; fast-lock.el --- Automagic text properties caching for fast Font Lock mode.
+;;; fast-lock.el --- automagic text properties caching for fast Font Lock mode
-;; Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-;; Author: Simon Marshall <simon@gnu.ai.mit.edu>
+;; Author: Simon Marshall <simon@gnu.org>
+;; Maintainer: FSF
;; Keywords: faces files
-;; Version: 3.12.03
+;; Version: 3.14
-;;; This file is part of GNU Emacs.
+;; This file is part of GNU Emacs.
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; - Added `fast-lock-get-syntactic-properties'
;; - Renamed `fast-lock-set-face-properties' to `fast-lock-add-properties'
;; - Made `fast-lock-add-properties' add syntactic and face fontification data
+;; 3.13--3.14:
+;; - Made `fast-lock-cache-name' cope with `windowsnt' (Geoff Voelker fix)
+;; - Made `fast-lock-verbose' use `other' widget (Andreas Schwab fix)
+;; - Used `with-temp-message' where possible to make messages temporary.
\f
;;; Code:
(error "`fast-lock' was written for long file name systems"))
(eval-when-compile
- ;;
- ;; We don't do this at the top-level as we only use non-autoloaded macros.
- (require 'cl)
- ;;
- ;; We use this to preserve or protect things when modifying text properties.
- (defmacro save-buffer-state (varlist &rest body)
- "Bind variables according to VARLIST and eval BODY restoring buffer state."
- (` (let* ((,@ (append varlist
- '((modified (buffer-modified-p)) (buffer-undo-list t)
- (inhibit-read-only t) (inhibit-point-motion-hooks t)
- before-change-functions after-change-functions
- deactivate-mark buffer-file-name buffer-file-truename))))
- (,@ body)
- (when (and (not modified) (buffer-modified-p))
- (set-buffer-modified-p nil)))))
- (put 'save-buffer-state 'lisp-indent-function 1)
- ;;
- ;; We use this to verify that a face should be saved.
- (defmacro fast-lock-save-facep (face)
- "Return non-nil if FACE is one of `fast-lock-save-faces'."
- (` (or (null fast-lock-save-faces)
- (if (symbolp (, face))
- (memq (, face) fast-lock-save-faces)
- (let ((faces (, face)))
- (while (unless (memq (car faces) fast-lock-save-faces)
- (setq faces (cdr faces))))
- faces)))))
- ;;
- ;; We use this for compatibility with a future Emacs.
- (or (fboundp 'defcustom)
- (defmacro defcustom (symbol value doc &rest args)
- (` (defvar (, symbol) (, value) (, doc))))))
+ ;;
+ ;; We don't do this at the top-level as we only use non-autoloaded macros.
+ (require 'cl)
+ ;;
+ ;; We use this to preserve or protect things when modifying text properties.
+ (defmacro save-buffer-state (varlist &rest body)
+ "Bind variables according to VARLIST and eval BODY restoring buffer state."
+ `(let* (,@(append varlist
+ '((modified (buffer-modified-p)) (buffer-undo-list t)
+ (inhibit-read-only t) (inhibit-point-motion-hooks t)
+ before-change-functions after-change-functions
+ deactivate-mark buffer-file-name buffer-file-truename)))
+ ,@body
+ (when (and (not modified) (buffer-modified-p))
+ (set-buffer-modified-p nil))))
+ (put 'save-buffer-state 'lisp-indent-function 1)
+ ;;
+ ;; We use this to verify that a face should be saved.
+ (defmacro fast-lock-save-facep (face)
+ "Return non-nil if FACE is one of `fast-lock-save-faces'."
+ `(or (null fast-lock-save-faces)
+ (if (symbolp ,face)
+ (memq ,face fast-lock-save-faces)
+ (let ((faces ,face))
+ (while (unless (memq (car faces) fast-lock-save-faces)
+ (setq faces (cdr faces))))
+ faces))))
+ ;;
+ ;; We use this for compatibility with a future Emacs.
+ (or (fboundp 'with-temp-message)
+ (defmacro with-temp-message (message &rest body)
+ `(let ((temp-message ,message) current-message)
+ (unwind-protect
+ (progn
+ (when temp-message
+ (setq current-message (current-message))
+ (message temp-message))
+ ,@body)
+ (when temp-message
+ (message current-message))))))
+ ;;
+ ;; We use this for compatibility with a future Emacs.
+ (or (fboundp 'defcustom)
+ (defmacro defcustom (symbol value doc &rest args)
+ `(defvar ,symbol ,value ,doc))))
;(defun fast-lock-submit-bug-report ()
; "Submit via mail a bug report on fast-lock.el."
; (interactive)
; (let ((reporter-prompt-for-summary-p t))
-; (reporter-submit-bug-report "simon@gnu.ai.mit.edu" "fast-lock 3.12.03"
+; (reporter-submit-bug-report "simon@gnu.org" "fast-lock 3.14"
; '(fast-lock-cache-directories fast-lock-minimum-size
; fast-lock-save-others fast-lock-save-events fast-lock-save-faces
; fast-lock-verbose)
\f
;; User Variables:
-(defcustom fast-lock-minimum-size (* 25 1024)
+(defcustom fast-lock-minimum-size 25600
"*Minimum size of a buffer for cached fontification.
Only buffers more than this can have associated Font Lock cache files saved.
If nil, means cache files are never created.
"*If non-nil, means show status messages for cache processing.
If a number, only buffers greater than this size have processing messages."
:type '(choice (const :tag "never" nil)
- (const :tag "always" t)
+ (other :tag "always" t)
(integer :tag "size"))
:group 'fast-lock)
(concat buffer-file-name ".flc")
(let* ((bufile (expand-file-name buffer-file-truename))
(chars-alist
- (if (eq system-type 'emx)
+ (if (memq system-type '(emx windows-nt))
'((?/ . (?#)) (?# . (?# ?#)) (?: . (?\;)) (?\; . (?\; ?\;)))
'((?/ . (?#)) (?# . (?# ?#)))))
(mapchars
(> (buffer-size) fast-lock-verbose)
fast-lock-verbose))
(saved t))
- (if verbose (message "Saving %s font lock cache..." (buffer-name)))
- (condition-case nil
- (save-excursion
- (print (list 'fast-lock-cache-data 3
- (list 'quote timestamp)
- (list 'quote font-lock-syntactic-keywords)
- (list 'quote (fast-lock-get-syntactic-properties))
- (list 'quote font-lock-keywords)
- (list 'quote (fast-lock-get-face-properties)))
- tpbuf)
- (set-buffer tpbuf)
- (write-region (point-min) (point-max) file nil 'quietly)
- (setq fast-lock-cache-timestamp timestamp
- fast-lock-cache-filename file))
- (error (setq saved 'error)) (quit (setq saved 'quit)))
- (kill-buffer tpbuf)
- (if verbose (message "Saving %s font lock cache...%s" (buffer-name)
- (cond ((eq saved 'error) "failed")
- ((eq saved 'quit) "aborted")
- (t "done"))))
+ (with-temp-message
+ (when verbose
+ (format "Saving %s font lock cache..." (buffer-name)))
+ (condition-case nil
+ (save-excursion
+ (print (list 'fast-lock-cache-data 3
+ (list 'quote timestamp)
+ (list 'quote font-lock-syntactic-keywords)
+ (list 'quote (fast-lock-get-syntactic-properties))
+ (list 'quote font-lock-keywords)
+ (list 'quote (fast-lock-get-face-properties)))
+ tpbuf)
+ (set-buffer tpbuf)
+ (write-region (point-min) (point-max) file nil 'quietly)
+ (setq fast-lock-cache-timestamp timestamp
+ fast-lock-cache-filename file))
+ (error (setq saved 'error)) (quit (setq saved 'quit)))
+ (kill-buffer tpbuf))
+ (cond ((eq saved 'quit)
+ (message "Saving %s font lock cache...quit" (buffer-name)))
+ ((eq saved 'error)
+ (message "Saving %s font lock cache...failed" (buffer-name))))
;; We return non-nil regardless of whether a failure occurred.
saved))
(setq font-lock-syntactic-keywords (font-lock-eval-keywords
font-lock-syntactic-keywords))
;; Compile all keywords in case some are and some aren't.
- (setq font-lock-syntactic-keywords (font-lock-compile-keywords
- font-lock-syntactic-keywords)
- syntactic-keywords (font-lock-compile-keywords syntactic-keywords)
-
- font-lock-keywords (font-lock-compile-keywords font-lock-keywords)
+ (when font-lock-syntactic-keywords
+ (setq font-lock-syntactic-keywords (font-lock-compile-keywords
+ font-lock-syntactic-keywords)))
+ (when syntactic-keywords
+ (setq syntactic-keywords (font-lock-compile-keywords syntactic-keywords)))
+ (setq font-lock-keywords (font-lock-compile-keywords font-lock-keywords)
keywords (font-lock-compile-keywords keywords))
;; Use the Font Lock cache SYNTACTIC-PROPERTIES and FACE-PROPERTIES if we're
;; using cache VERSION format 3, the current buffer's file timestamp matches
(not (equal syntactic-keywords font-lock-syntactic-keywords))
(not (equal keywords font-lock-keywords)))
(setq loaded nil)
- (if verbose (message "Loading %s font lock cache..." (buffer-name)))
- (condition-case nil
- (fast-lock-add-properties syntactic-properties face-properties)
- (error (setq loaded 'error)) (quit (setq loaded 'quit)))
- (if verbose (message "Loading %s font lock cache...%s" (buffer-name)
- (cond ((eq loaded 'error) "failed")
- ((eq loaded 'quit) "aborted")
- (t "done")))))
+ (with-temp-message
+ (when verbose
+ (format "Loading %s font lock cache..." (buffer-name)))
+ (condition-case nil
+ (fast-lock-add-properties syntactic-properties face-properties)
+ (error (setq loaded 'error)) (quit (setq loaded 'quit))))
+ (cond ((eq loaded 'quit)
+ (message "Loading %s font lock cache...quit" (buffer-name)))
+ ((eq loaded 'error)
+ (message "Loading %s font lock cache...failed" (buffer-name)))))
(setq font-lock-fontified (eq loaded t)
fast-lock-cache-timestamp (and (eq loaded t) timestamp))))
\f
(if (consp alist)
(cdr (or (assq major-mode alist) (assq t alist)))
alist)))
+
+(unless (fboundp 'current-message)
+ (defun current-message ()
+ ""))
\f
;; Install ourselves: