Mercurial > hg > xemacs-beta
view lisp/coding.el @ 617:af57a77cbc92
[xemacs-hg @ 2001-06-18 07:09:50 by ben]
---------------------------------------------------------------
DOCUMENTATION FIXES:
---------------------------------------------------------------
eval.c: Correct documentation.
elhash.c: Doc correction.
---------------------------------------------------------------
LISP OBJECT CLEANUP:
---------------------------------------------------------------
bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them)
-- an expression to encapsulate a pointer into a Lisp object,
rather than the inconvenient XSET*. "wrap" was chosen because
"make" as in make_int(), make_char() is not appropriate. (It
implies allocation. The issue does not exist for ints and chars
because they are not allocated.)
Full error checking has been added to these expressions. When
used without error checking, non-union build, use of these
expressions will incur no loss of efficiency. (In fact, XSET* is
now defined in terms of wrap_* in a non-union build.) In a union
build, you will also get no loss of efficiency provided that you
have a decent optimizing compiler, and a compiler that either
understands inlines or automatically inlines those particular
functions. (And since people don't normally do their production
builds on union, it doesn't matter.)
Update the sample Lisp object definition in lrecord.h accordingly.
dumper.c: Fix places in dumper that referenced wrap_object to reference
its new name, wrap_pointer_1.
buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h,
just like for the other structures.
-- Extract out the remaining (not copied into the window config)
Lisp objects in `struct window' into winslots.h; use different
macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them.
-- Eliminate the `dead' flag of `struct frame', since it
duplicates information already available in `framemeths', and fix
FRAME_LIVE_P accordingly. (Devices and consoles already work this
way.)
-- In *slots.h, switch to system where MARKED_SLOT is automatically
undef'd at the end of the file. (Follows what winslots.h already
does.)
-- Update the comments at the beginning of *slots.h to be accurate.
-- When making any of the above objects dead, zero it out entirely
and reset all Lisp object slots to Qnil. (We were already doing
this somewhat, but not consistently.) This (1) Eliminates the
possibility of extra objects hanging around that ought to be
GC'd, (2) Causes an immediate crash if anyone tries to access a
structure in one of these objects, (3) Ensures consistent behavior
wrt dead objects.
dialog-msw.c: Use internal_object_printer, since this object should not escape.
---------------------------------------------------------------
FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR):
---------------------------------------------------------------
eval.c: Fix up some comments about the FSF implementation.
Fix two nasty bugs:
(1) condition_case_unwind frees the conses sitting in the
catch->tag slot too quickly, resulting in a crash that I hit.
(2) catches need to be unwound one at a time when calling
unwind-protect code, rather than all at once at the end; otherwise,
incorrect behavior can result. (A comment shows exactly how.)
backtrace.h: Improve comment about FSF differences in the handler stack.
---------------------------------------------------------------
FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL
UNDER MSWINDOWS:
---------------------------------------------------------------
Basic idea: My crash is due either to a dead, non-marked,
GC-collected frame inside of a window mirror, or a prematurely
freed window mirror. We need to mark the Lisp objects inside of
window mirrors. Tracking the lifespan of window mirrors and
scrollbar instances is extremely hard, and there may well be
lurking bugs where such objects are freed too soon. The only safe
way to fix these problems (and it fixes both problems at once) is
to make both of these structures Lisp objects.
lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window
mirrors in them. inline.c needs to know about scrollbar.h now.
Record the new type in lrecord.h. Fix up scrollbar-*.c
appropriately. Create a hash table in scrollbar-msw.c so that the
scrollbar instances stored in scrollbar HWND's are properly
GC-protected. Create complex_vars_of_scrollbar_mswindows() to
create the hash table at startup, and call it from emacs.c. Don't
store the scrollbar instance as a property of the GTK scrollbar,
as it's not used and if we did this, we'd have to separately
GC-protect it in a hash table, like in MS Windows.
lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window
mirrors actual Lisp objects. Tell lrecord.h about them. Change
the window mirror member of struct frame from a pointer to a Lisp
object, and add XWINDOW_MIRROR in appropriate places. Mark the
scrollbar instances in the window mirror.
redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark
frame-specific structures in mark_frame.
NOTE: I also deleted an extremely questionable call to
update_frame_window_mirrors(). It was extremely questionable
before, and now totally impossible, since it will create
Lisp objects during redisplay.
frame.c: Mark the scrollbar instances, which are now Lisp objects.
Call mark_gutter() here, not in mark_redisplay().
gutter.c: Update comments about correct marking.
---------------------------------------------------------------
ISSUES BROUGHT UP BY MARTIN:
---------------------------------------------------------------
buffer.h: Put back these macros the way Steve T and I think they ought to be.
I already explained in a previous changelog entry why I think these
macros should be the way I'd defined them. Once again:
We fix these macros so they don't care about the type of their
lvalues. The non-C-string equivalents of these already function
in the same way, and it's correct because it should be OK to pass
in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *,
etc. The whole reason for these different types is to work around
errors caused by signed-vs-unsigned non-matching types. Any
possible error that might be caught in a DFC macro would also be
caught wherever the argument is used elsewhere. So creating
multiple macro versions would add no useful error-checking and
just further complicate an already complicated area.
As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing
clean and probably never will be. Unless the board agrees to
change XEmacs in this way (and we really don't want to go down
that road), this is not a bug.
sound.h: Undo Martin's type change.
signal.c: Fix problem identified by Martin with Linux and g++ due to
non-standard declaration of setitimer().
systime.h: Update the docs for "qxe_" to point out why making the
encapsulation explicit is always the right way to go. (setitimer()
itself serves as an example.)
For 21.4:
update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get
recompiled.
| author | ben |
|---|---|
| date | Mon, 18 Jun 2001 07:10:32 +0000 |
| parents | 55614ee2fb8d |
| children | 4d00488244c1 |
line wrap: on
line source
;;; coding.el --- Coding-system functions for XEmacs. ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN. ;; Licensed to the Free Software Foundation. ;; Copyright (C) 1995 Amdahl Corporation. ;; Copyright (C) 1995 Sun Microsystems. ;; Copyright (C) 1997 MORIOKA Tomohiko ;; This file is part of XEmacs. ;; This file is very similar to mule-coding.el ;; 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 2, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;;; split off of mule.el. ;;; Code: (globally-declare-fboundp '(coding-system-lock-shift coding-system-seven coding-system-charset charset-dimension)) (defalias 'check-coding-system 'get-coding-system) (defconst modeline-multibyte-status '("%C") "Modeline control for showing multibyte extension status.") ;; override the default value defined in loaddefs.el. (setq-default modeline-format (cons "" (cons 'modeline-multibyte-status (cdr modeline-format)))) (defun modify-coding-system-alist (target-type regexp coding-system) "Modify one of look up tables for finding a coding system on I/O operation. There are three of such tables, `file-coding-system-alist', `process-coding-system-alist', and `network-coding-system-alist'. TARGET-TYPE specifies which of them to modify. If it is `file', it affects `file-coding-system-alist' (which see). If it is `process', it affects `process-coding-system-alist' (which see). If it is `network', it affects `network-coding-system-alist' (which see). REGEXP is a regular expression matching a target of I/O operation. The target is a file name if TARGET-TYPE is `file', a program name if TARGET-TYPE is `process', or a network service name or a port number to connect to if TARGET-TYPE is `network'. CODING-SYSTEM is a coding system to perform code conversion on the I/O operation, or a cons cell (DECODING . ENCODING) specifying the coding systems for decoding and encoding respectively, or a function symbol which, when called, returns such a cons cell." (or (memq target-type '(file process network)) (error "Invalid target type: %s" target-type)) (or (stringp regexp) (and (eq target-type 'network) (integerp regexp)) (error "Invalid regular expression: %s" regexp)) (if (symbolp coding-system) (if (not (fboundp coding-system)) (progn (check-coding-system coding-system) (setq coding-system (cons coding-system coding-system)))) (check-coding-system (car coding-system)) (check-coding-system (cdr coding-system))) (cond ((eq target-type 'file) (let ((slot (assoc regexp file-coding-system-alist))) (if slot (setcdr slot coding-system) (setq file-coding-system-alist (cons (cons regexp coding-system) file-coding-system-alist))))) ((eq target-type 'process) (let ((slot (assoc regexp process-coding-system-alist))) (if slot (setcdr slot coding-system) (setq process-coding-system-alist (cons (cons regexp coding-system) process-coding-system-alist))))) (t (let ((slot (assoc regexp network-coding-system-alist))) (if slot (setcdr slot coding-system) (setq network-coding-system-alist (cons (cons regexp coding-system) network-coding-system-alist))))))) (defsubst keyboard-coding-system () "Return coding-system of what is sent from terminal keyboard." keyboard-coding-system) (defun set-keyboard-coding-system (coding-system) "Set the coding system used for TTY keyboard input. Currently broken." (interactive "zkeyboard-coding-system: ") (get-coding-system coding-system) ; correctness check (setq keyboard-coding-system coding-system) (if (eq (device-type) 'tty) (declare-fboundp (set-console-tty-input-coding-system (device-console) keyboard-coding-system))) (redraw-modeline t)) (defsubst terminal-coding-system () "Return coding-system of your terminal." terminal-coding-system) (defun set-terminal-coding-system (coding-system) "Set the coding system used for TTY display output. Currently broken." (interactive "zterminal-coding-system: ") (get-coding-system coding-system) ; correctness check (setq terminal-coding-system coding-system) ; #### should this affect all current tty consoles ? (if (eq (device-type) 'tty) (declare-fboundp (set-console-tty-output-coding-system (device-console) terminal-coding-system))) (redraw-modeline t)) (defun set-pathname-coding-system (coding-system) "Set the coding system used for file system path names." (interactive "zPathname-coding-system: ") (get-coding-system coding-system) ; correctness check (setq file-name-coding-system coding-system)) (defun what-coding-system (start end &optional arg) "Show the encoding of text in the region. This function is meant to be called interactively; from a Lisp program, use `detect-coding-region' instead." (interactive "r\nP") (princ (detect-coding-region start end))) (defun decode-coding-string (str coding-system) "Decode the string STR which is encoded in CODING-SYSTEM. Does not modify STR. Returns the decoded string on successful conversion." (with-string-as-buffer-contents str (decode-coding-region (point-min) (point-max) coding-system))) (defun encode-coding-string (str coding-system) "Encode the string STR using CODING-SYSTEM. Does not modify STR. Returns the encoded string on successful conversion." (with-string-as-buffer-contents str (encode-coding-region (point-min) (point-max) coding-system))) ;;;; Coding system accessors (defun coding-system-mnemonic (coding-system) "Return the 'mnemonic property of CODING-SYSTEM." (coding-system-property coding-system 'mnemonic)) (defalias 'coding-system-docstring 'coding-system-doc-string) (defun coding-system-eol-type (coding-system) "Return the 'eol-type property of CODING-SYSTEM." (coding-system-property coding-system 'eol-type)) (defun coding-system-eol-lf (coding-system) "Return the 'eol-lf property of CODING-SYSTEM." (coding-system-property coding-system 'eol-lf)) (defun coding-system-eol-crlf (coding-system) "Return the 'eol-crlf property of CODING-SYSTEM." (coding-system-property coding-system 'eol-crlf)) (defun coding-system-eol-cr (coding-system) "Return the 'eol-cr property of CODING-SYSTEM." (coding-system-property coding-system 'eol-cr)) (defun coding-system-post-read-conversion (coding-system) "Return the 'post-read-conversion property of CODING-SYSTEM." (coding-system-property coding-system 'post-read-conversion)) (defun coding-system-pre-write-conversion (coding-system) "Return the 'pre-write-conversion property of CODING-SYSTEM." (coding-system-property coding-system 'pre-write-conversion)) (defun coding-system-base (coding-system) "Return the base coding system of CODING-SYSTEM." (if (not (coding-system-eol-type coding-system)) coding-system (find-coding-system (intern (substring (symbol-name (coding-system-name coding-system)) 0 (string-match "-unix$\\|-dos$\\|-mac$" (symbol-name (coding-system-name coding-system)))))))) ;;; #### bleagh!!!!!!! (defun coding-system-get (coding-system prop) "Extract a value from CODING-SYSTEM's property list for property PROP." (or (plist-get (get (coding-system-name coding-system) 'coding-system-property) prop) (condition-case nil (coding-system-property coding-system prop) (error nil)))) (defun coding-system-put (coding-system prop value) "Change value in CODING-SYSTEM's property list PROP to VALUE." (put (coding-system-name coding-system) 'coding-system-property (plist-put (get (coding-system-name coding-system) 'coding-system-property) prop value))) (defun coding-system-category (coding-system) "Return the coding category of CODING-SYSTEM." (or (coding-system-get coding-system 'category) (let ((type (coding-system-type coding-system))) (cond ((eq type 'no-conversion) 'no-conversion) ((eq type 'shift-jis) 'shift-jis) ((eq type 'ucs-4) 'ucs-4) ((eq type 'utf-8) 'utf-8) ((eq type 'big5) 'big5) ((eq type 'iso2022) (cond ((coding-system-lock-shift coding-system) 'iso-lock-shift) ((coding-system-seven coding-system) 'iso-7) (t (let ((dim 0) ccs (i 0)) (while (< i 4) (setq ccs (coding-system-charset coding-system i)) (if (and ccs (> (charset-dimension ccs) dim)) (setq dim (charset-dimension ccs)) ) (setq i (1+ i))) (cond ((= dim 1) 'iso-8-1) ((= dim 2) 'iso-8-2) (t 'iso-8-designate)) )))))))) ;;;; Definitions of predefined coding systems (make-coding-system 'undecided 'undecided "Automatic conversion." '(mnemonic "Auto")) ;;; Make certain variables equivalent to coding-system aliases (defun dontusethis-set-value-file-name-coding-system-handler (sym args fun harg handlers) (define-coding-system-alias 'file-name (or (car args) 'binary))) (dontusethis-set-symbol-value-handler 'file-name-coding-system 'set-value 'dontusethis-set-value-file-name-coding-system-handler) (defun dontusethis-set-value-terminal-coding-system-handler (sym args fun harg handlers) (define-coding-system-alias 'terminal (or (car args) 'binary))) (dontusethis-set-symbol-value-handler 'terminal-coding-system 'set-value 'dontusethis-set-value-terminal-coding-system-handler) (defun dontusethis-set-value-keyboard-coding-system-handler (sym args fun harg handlers) (define-coding-system-alias 'keyboard (or (car args) 'binary))) (dontusethis-set-symbol-value-handler 'keyboard-coding-system 'set-value 'dontusethis-set-value-keyboard-coding-system-handler) (unless (boundp 'file-name-coding-system) (setq file-name-coding-system nil)) (when (not (featurep 'mule)) ;; these are so that gnus and friends work when not mule (copy-coding-system 'undecided 'iso-8859-1) (copy-coding-system 'undecided 'iso-8859-2) (define-coding-system-alias 'ctext 'binary)) ;; compatibility for old XEmacsen (don't use it) (copy-coding-system 'undecided 'automatic-conversion) (make-compatible-variable 'enable-multibyte-characters "Unimplemented") (define-obsolete-variable-alias 'pathname-coding-system 'file-name-coding-system) ;;; mule-coding.el ends here
