Mercurial > hg > xemacs-beta
view lisp/mule/mule-x-init.el @ 5552:85210c453a97
Fix performance regression in refactored syntax cache setup.
More doc improvements.
* syntax.h (enum syntax_source):
New. Specify whether syntax is from property or buffer.
(struct syntax_cache):
Use enum syntax_source source, instead of no_syntax_table_prop
and use_code.
Improve comments.
(SOURCE_IS_TABLE):
New predicate.
(SYNTAX_CODE_FROM_CACHE):
Use it instead of use_code, and adjust logic.
* syntax.c (syntax_cache_table_was_changed):
Check cache->source (cache->no_syntax_table_prop is gone).
(reset_syntax_cache_range):
All information about OBJECT and BUFFER is in CACHE already.
Also reset markers in OBJECT if it is a buffer.
Rename INFINITE to VALID_EVERYWHERE.
(init_syntax_cache):
Initialize source (cache->no_syntax_table_prop is gone).
Maybe initialize start and end to null markers.
Initialize cache range with reset_syntax_cache_range.
(update_syntax_cache):
Use source instead of no_syntax_table_prop and use_code.
(setup_syntax_cache):
Add header comment. Improve other comments.
Make calls to reset_syntax_cache_range and init_syntax_cache match
their prototypes.
(init_buffer_syntax_cache):
Use init_syntax_cache to do the work.
(signal_syntax_cache_extent_changed):
Make call to reset_syntax_cache_range match its prototype.
Improve local variable naming.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Tue, 23 Aug 2011 04:41:45 +0900 |
| parents | 308d34e9f07d |
| children | 3bc58dc9d688 |
line wrap: on
line source
;;; mule-x-init.el --- initialization code for X Windows under MULE -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1994 Free Software Foundation, Inc. ;; Copyright (C) 1996, 2002 Ben Wing <ben@xemacs.org> ;; Author: various ;; Keywords: mule X11 ;; This file is part of XEmacs. ;; XEmacs is free software: you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by the ;; Free Software Foundation, either version 3 of the License, or (at your ;; option) any later version. ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;; for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;;; Code: ;;; Work around what is arguably a Sun CDE bug. ;; #### This is unused, apparently. (defun x-use-halfwidth-roman-font (fullwidth-charset roman-registry) "Maybe set charset registry of the 'ascii charset to ROMAN-REGISTRY. Do this only if: - the current display is an X device - the displayed width of FULLWIDTH-CHARSET is twice the displayed width of the 'ascii charset, but only when using ROMAN-REGISTRY. Traditionally, Asian characters have been displayed so that they occupy exactly twice the screen space of ASCII (`halfwidth') characters. On many systems, e.g. Sun CDE systems, this can only be achieved by using a national variant roman font to display ASCII." (flet ((charset-font-width (charset) (font-instance-width (face-font-instance 'default (selected-device) charset))) (twice-as-wide (cs1 cs2) (let ((width1 (charset-font-width cs1)) (width2 (charset-font-width cs2))) (and width1 width2 (eq (+ width1 width1) width2))))) (when (eq 'x (device-type)) (let ((original-registries (charset-registries 'ascii))) (condition-case nil (unless (twice-as-wide 'ascii fullwidth-charset) (set-charset-registries 'ascii (vector roman-registry)) (unless (twice-as-wide 'ascii fullwidth-charset) ;; Restore if roman-registry didn't help (set-charset-registries 'ascii original-registries))) (error (set-charset-registries 'ascii original-registries))))))) ;;;;