Mercurial > hg > xemacs-beta
annotate lisp/buffer.el @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 19 Sep 2009 22:53:13 +0100 |
| parents | 627e25731054 |
| children | 74a5eaa67982 |
| rev | line source |
|---|---|
| 428 | 1 ;;; buffer.el --- buffer routines taken from C |
| 2 | |
| 3 ;; Copyright (C) 1985-1989, 1992-1995, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 ;; Copyright (C) 1995, 1996 Ben Wing. | |
| 6 | |
| 7 ;; Maintainer: XEmacs Development Team | |
| 8 ;; Keywords: internal, dumped | |
| 9 | |
| 10 ;; This file is part of XEmacs. | |
| 11 | |
| 12 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 13 ;; under the terms of the GNU General Public License as published by | |
| 14 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 15 ;; any later version. | |
| 16 | |
| 17 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 20 ;; General Public License for more details. | |
| 21 | |
| 22 ;; You should have received a copy of the GNU General Public License | |
| 23 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 24 ;; Free Software Foundation, 59 Temple Place - Suite 330, | |
| 25 ;; Boston, MA 02111-1307, USA. | |
| 26 | |
| 27 ;;; Synched up with: FSF 19.30 buffer.c. | |
| 28 | |
| 29 ;;; Commentary: | |
| 30 | |
| 31 ;; This file is dumped with XEmacs. | |
| 32 | |
| 33 ;;; Code: | |
| 34 | |
| 35 (defun switch-to-buffer (bufname &optional norecord) | |
| 36 "Select buffer BUFNAME in the current window. | |
| 37 BUFNAME may be a buffer or a buffer name and is created if it did not exist. | |
| 38 Optional second arg NORECORD non-nil means do not put this buffer at the | |
| 39 front of the list of recently selected ones. | |
| 40 | |
| 41 WARNING: This is NOT the way to work on another buffer temporarily | |
| 42 within a Lisp program! Use `set-buffer' instead. That avoids messing with | |
| 43 the window-buffer correspondences." | |
| 44 (interactive "BSwitch to buffer: ") | |
| 45 ;; #ifdef I18N3 | |
| 46 ;; #### Doc string should indicate that the buffer name will get | |
| 47 ;; translated. | |
| 48 ;; #endif | |
| 49 (if (eq (minibuffer-window) (selected-window)) | |
| 50 (error "Cannot switch buffers in minibuffer window")) | |
| 51 (if (window-dedicated-p (selected-window)) | |
| 52 (error "Cannot switch buffers in a dedicated window")) | |
| 53 (let (buf) | |
| 54 (if (null bufname) | |
| 55 (setq buf (other-buffer (current-buffer))) | |
| 56 (setq buf (get-buffer bufname)) | |
| 57 (if (null buf) | |
| 58 (progn | |
| 59 (setq buf (get-buffer-create bufname)) | |
| 60 (set-buffer-major-mode buf)))) | |
| 61 (push-window-configuration) | |
| 62 (set-buffer buf) | |
| 442 | 63 (set-window-buffer (last-nonminibuf-window) buf norecord) |
| 428 | 64 buf)) |
| 65 | |
| 66 (defun pop-to-buffer (bufname &optional not-this-window-p on-frame) | |
| 67 "Select buffer BUFNAME in some window, preferably a different one. | |
| 68 If BUFNAME is nil, then some other buffer is chosen. | |
| 69 If `pop-up-windows' is non-nil, windows can be split to do this. | |
| 70 If optional second arg NOT-THIS-WINDOW-P is non-nil, insist on finding | |
| 71 another window even if BUFNAME is already visible in the selected window. | |
| 72 If optional third arg is non-nil, it is the frame to pop to this | |
| 73 buffer on. | |
| 2590 | 74 If `focus-follows-mouse' is non-nil, keyboard focus is left unchanged. |
| 75 | |
| 76 Buffers with names that are members of the `same-window-buffer-names' | |
| 77 list, or that match an element of the `same-window-regexps' list are | |
| 78 treated specially by this function--they are always selected in the | |
| 79 same window rather than in a different one." | |
| 428 | 80 ;; #ifdef I18N3 |
| 81 ;; #### Doc string should indicate that the buffer name will get | |
| 82 ;; translated. | |
| 83 ;; #endif | |
| 84 ;; This is twisted. It is evil to throw the keyboard focus around | |
| 85 ;; willy-nilly if the user wants focus-follows-mouse. | |
| 86 (let ((oldbuf (current-buffer)) | |
| 87 buf window frame) | |
| 88 (if (null bufname) | |
| 89 (setq buf (other-buffer (current-buffer))) | |
| 90 (setq buf (get-buffer bufname)) | |
| 91 (if (null buf) | |
| 92 (progn | |
| 93 (setq buf (get-buffer-create bufname)) | |
| 94 (set-buffer-major-mode buf)))) | |
| 95 (push-window-configuration) | |
| 96 (set-buffer buf) | |
| 97 (setq window (display-buffer buf not-this-window-p on-frame)) | |
| 98 (setq frame (window-frame window)) | |
| 99 ;; if the display-buffer hook decided to show this buffer in another | |
| 100 ;; frame, then select that frame, (unless obeying focus-follows-mouse -sb). | |
| 101 (if (and (not focus-follows-mouse) | |
| 102 (not (eq frame (selected-frame)))) | |
| 103 (select-frame frame)) | |
| 104 (record-buffer buf) | |
| 105 (if (and focus-follows-mouse | |
| 106 on-frame | |
| 107 (not (eq on-frame (selected-frame)))) | |
| 108 (set-buffer oldbuf) | |
| 109 ;; select-window will modify the internal keyboard focus of XEmacs | |
| 110 (select-window window)) | |
| 111 buf)) | |
| 112 | |
| 113 ;;; buffer.el ends here |