diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-08-30 15:57:42 +0200 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-08-30 15:57:42 +0200 |
| commit | d36b74ca27f877023620d33ca05f2b5b2ccb05cd (patch) | |
| tree | 2320cbbc070586fbf342f47ec4bfefa156dbbd3f /lisp/composite.el | |
| parent | f291fe60fb9ed250ded34b6b9ed26e085f119a4e (diff) | |
| download | emacs-d36b74ca27f877023620d33ca05f2b5b2ccb05cd.tar.gz | |
Use with-silent-modifications.
* lisp/composite.el (save-buffer-state): Delete, unused.
* lisp/font-lock.el (save-buffer-state): Use with-silent-modifications.
(font-lock-default-fontify-region): Use with-syntax-table.
* lisp/jit-lock.el (with-buffer-unmodified): Remove.
(with-buffer-prepared-for-jit-lock): Use with-silent-modifications.
Diffstat (limited to 'lisp/composite.el')
| -rw-r--r-- | lisp/composite.el | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/lisp/composite.el b/lisp/composite.el index 9fdf528d601..1ecfec86b5d 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -413,27 +413,6 @@ after a sequence of character events." ;;; Automatic character composition. -;; Copied from font-lock.el. -(eval-when-compile - ;; Borrowed from lazy-lock.el. - ;; 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) - (inhibit-modification-hooks t) - deactivate-mark buffer-file-name buffer-file-truename)) - ,@body - (unless modified - (restore-buffer-modified-p nil)))) - ;; Fixme: This makes bootstrapping fail with this error. - ;; Symbol's function definition is void: eval-defun - ;;(def-edebug-spec save-buffer-state let) - ) - -(put 'save-buffer-state 'lisp-indent-function 1) - ;; These macros must match with C macros LGSTRING_XXX and LGLYPH_XXX in font.h (defsubst lgstring-header (gstring) (aref gstring 0)) (defsubst lgstring-set-header (gstring header) (aset gstring 0 header)) |