Mercurial > hg > xemacs-beta
view lisp/code-files.el @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 8905163c49c5 |
| children | 308d34e9f07d |
line wrap: on
line source
;;; code-files.el --- File I/O functions for XEmacs. ;; Copyright (C) 1992,93,94,95 Free Software Foundation, Inc. ;; Copyright (C) 1995 Amdahl Corporation. ;; Copyright (C) 1995 Sun Microsystems. ;; Copyright (C) 2001, 2002 Ben Wing. ;; 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 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. ;;; Synched up with: Not synched. ;;; Commentary: ;; Derived from mule.el in the original Mule but heavily modified ;; by Ben Wing. ;; 1997/3/11 modified by MORIOKA Tomohiko to sync with Emacs 20 API. ;; This file was derived from the former mule-files.el which has been removed ;; as of XEmacs 21.2.15. ;;; Code: (put 'buffer-file-coding-system 'permanent-local t) (defvar buffer-file-coding-system-when-loaded nil "Coding system used when current buffer's file was read in. Automatically buffer-local when set in any fashion. This is set automatically when a file is loaded and is used when the file needs to be reloaded (e.g. `revert-buffer'). Normally this will have the same value as `buffer-file-coding-system', but the latter may be changed because it's also used to specify the encoding when the file is written out.") (make-variable-buffer-local 'buffer-file-coding-system-when-loaded) (put 'buffer-file-coding-system-when-loaded 'permanent-local t) (define-obsolete-variable-alias 'file-coding-system 'buffer-file-coding-system) (define-obsolete-variable-alias 'overriding-file-coding-system 'coding-system-for-read) ;; NOTE: The real default value is set in code-init.el. (defvar buffer-file-coding-system-for-read nil "Default coding system used when reading a file. This provides coarse-grained control; for finer-grained control, use `file-coding-system-alist'. From a Lisp program, if you wish to unilaterally specify the coding system used for one particular operation, you should bind the variable `coding-system-for-read' rather than setting this variable, which is intended to be used for global environment specification. See `insert-file-contents' for a full description of how a file's coding system is determined when it is read in.") (define-obsolete-variable-alias 'file-coding-system-for-read 'buffer-file-coding-system-for-read) (defvar file-coding-system-alist `( ;; This must not be necessary, slb suggests -kkm ;; ("loaddefs.el$" . (binary . binary)) ,@(mapcar #'(lambda (regexp) (cons regexp 'binary)) binary-file-regexps) ("TUTORIAL\\.\\(?:hr\\|pl\\|ro\\)\\'" . iso-8859-2) ;; ("\\.\\(el\\|emacs\\|info\\(-[0-9]+\\)?\\|texi\\)$" . iso-2022-8) ;; ("\\(ChangeLog\\|CHANGES-beta\\)$" . iso-2022-8) ;; This idea is totally broken, and the code didn't work anyway. ;; Mailboxes should be decoded by mail clients, who actually know ;; how to deal with them. Otherwise, their contents should be ;; treated as `binary'. ;("/spool/mail/.*$" . convert-mbox-coding-system) ) "Alist to decide a coding system to use for a file I/O operation. The format is ((PATTERN . VAL) ...), where PATTERN is a regular expression matching a file name, VAL is a coding system, a cons of coding systems, or a function symbol. If VAL is a coding system, it is used for both decoding and encoding the file contents. If VAL is a cons of coding systems, the car part is used for decoding, and the cdr part is used for encoding. If VAL is a function symbol, the function must return a coding system or a cons of coding systems which are used as above. This overrides the more general specification in `buffer-file-coding-system-for-read', but is overridden by `coding-system-for-read'.") (defun set-buffer-file-coding-system (coding-system &optional force nomodify) "Set the file coding-system of the current buffer to CODING-SYSTEM. This means that when you save the buffer, it will be converted according to CODING-SYSTEM. For a list of possible values of CODING-SYSTEM, use \\[list-coding-systems]. If CODING-SYSTEM leaves the text conversion unspecified, or if it leaves the end-of-line conversion unspecified, FORCE controls what to do. If FORCE is nil, get the unspecified aspect (or aspects) from the buffer's previous `buffer-file-coding-system' value (if it is specified there). Otherwise, leave it unspecified. This marks the buffer modified so that the succeeding \\[save-buffer] surely saves the buffer with CODING-SYSTEM. From a program, if you don't want to mark the buffer modified, specify t for NOMODIFY. If you know exactly what coding system you want to use, just set the variable `buffer-file-coding-system' directly." (interactive "zCoding system for saving file (default nil): \nP") (check-coding-system coding-system) (if (and coding-system buffer-file-coding-system (null force)) (setq coding-system (subsidiary-coding-system coding-system (coding-system-eol-type buffer-file-coding-system)))) (setq buffer-file-coding-system coding-system) ;; XEmacs change; remove a call to ucs-set-table-for-input, which we don't ;; have. (unless nomodify (set-buffer-modified-p t)) (force-mode-line-update)) (defun toggle-buffer-file-coding-system () "Set EOL type of buffer-file-coding-system of the current buffer to something other than what it is at the moment." (interactive) (let ((eol-type (coding-system-eol-type buffer-file-coding-system))) (setq buffer-file-coding-system (subsidiary-coding-system (coding-system-base buffer-file-coding-system) (cond ((eq eol-type 'lf) 'crlf) ((eq eol-type 'crlf) 'lf) ((eq eol-type 'cr) 'lf)))) (set-buffer-modified-p t))) (define-obsolete-function-alias 'set-file-coding-system 'set-buffer-file-coding-system) (defun set-buffer-file-coding-system-for-read (coding-system) "Set the coding system used when reading in a file. This is equivalent to setting the variable `buffer-file-coding-system-for-read'. You can also use `file-coding-system-alist' to specify the coding system for particular files." (interactive "zFile coding system for read: ") (get-coding-system coding-system) ;; correctness check (setq buffer-file-coding-system-for-read coding-system)) (define-obsolete-function-alias 'set-file-coding-system-for-read 'set-buffer-file-coding-system-for-read) (defun set-default-buffer-file-coding-system (coding-system) "Set the default value of `buffer-file-coding-system' to CODING-SYSTEM. The default value is used both for buffers without associated files and for files with no apparent coding system (i.e. primarily ASCII). See `buffer-file-coding-system' for more information." (interactive "zDefault file coding system: ") (setq-default buffer-file-coding-system coding-system) (redraw-modeline t)) (define-obsolete-function-alias 'set-default-file-coding-system 'set-default-buffer-file-coding-system) (defun find-file-coding-system-for-read-from-filename (filename) "Look up coding system to read a file in `file-coding-system-alist'. The return value will be nil (no applicable entry) or a coding system object (the entry specified a coding system)." (let ((alist file-coding-system-alist) (found nil) (codesys nil)) (let ((case-fold-search nil)) (setq filename (file-name-sans-versions filename)) (while (and (not found) alist) (if (string-match (car (car alist)) filename) (setq codesys (cdr (car alist)) found t)) (setq alist (cdr alist)))) (when codesys (if (functionp codesys) (setq codesys (funcall codesys 'insert-file-contents filename)) ) (cond ((consp codesys) (find-coding-system (car codesys))) ((find-coding-system codesys)) )))) (define-obsolete-function-alias 'find-file-coding-system-from-filename 'find-file-coding-system-for-read-from-filename) (defun find-file-coding-system-for-write-from-filename (filename) "Look up coding system to write a file in `file-coding-system-alist'. The return value will be nil (no applicable entry) or a coding system object (the entry specified a coding system)." (let ((alist file-coding-system-alist) (found nil) (codesys nil)) (let ((case-fold-search nil)) (setq filename (file-name-sans-versions filename)) (while (and (not found) alist) (if (string-match (car (car alist)) filename) (setq codesys (cdr (car alist)) found t)) (setq alist (cdr alist)))) (when codesys (if (functionp codesys) (setq codesys (funcall codesys 'write-region filename)) ) (cond ((consp codesys) (find-coding-system (cdr codesys))) ((find-coding-system codesys)) )))) ;; This was completely broken, not only in implementation (does not ;; understand MIME), but in concept -- such high-level decoding should ;; be done by mail readers, not by IO code! Removed 2000-04-18. ;(defun convert-mbox-coding-system (filename visit start end) ...) (defun load (filename &optional noerror nomessage nosuffix) "Execute a file of Lisp code named FILENAME, or load a binary module. First tries to find a Lisp file FILENAME with .elc appended, then with .el, then with FILENAME unmodified. If unsuccessful, tries to find a binary module FILE with the elements of `module-extensions' appended, one at a time. Searches directories in load-path for Lisp files, and in `module-load-path' for binary modules. If optional second arg NOERROR is non-nil, report no error if FILE doesn't exist. Print messages at start and end of loading unless optional third arg NOMESSAGE is non-nil. If optional fourth arg NOSUFFIX is non-nil, don't try adding suffixes .elc, .el, or elements of `module-extensions' to the specified name FILE. Return t if file exists." (declare (special load-modules-quietly)) (let ((handler (find-file-name-handler filename 'load)) (path nil)) (if handler (funcall handler 'load filename noerror nomessage nosuffix) ;; First try to load a Lisp file (if (and (> (length filename) 0) (setq path (locate-file filename load-path (and (not nosuffix) '(".elc" ".el" ""))))) ;; now use the internal load to actually load the file. (load-internal filename noerror nomessage nosuffix (let ((elc ; use string= instead of string-match to keep match-data. (equalp ".elc" (substring path -4)))) (or (and (not elc) coding-system-for-read) ;prefer for source file ;; find magic-cookie (let ((codesys (find-coding-system-magic-cookie-in-file path))) (when codesys (setq codesys (intern codesys)) (if (find-coding-system codesys) codesys))) (if elc ;; if reading a byte-compiled file and we didn't find ;; a coding-system magic cookie, then use `binary'. ;; We need to guarantee that we never do autodetection ;; on byte-compiled files because confusion here would ;; be a very bad thing. Pre-existing byte-compiled ;; files are always in the `binary' coding system. ;; Also, byte-compiled files always use `lf' to terminate ;; a line; don't risk confusion here either. 'binary (or (find-file-coding-system-for-read-from-filename path) ;; looking up in `file-coding-system-alist'. ;; otherwise use `buffer-file-coding-system-for-read', ;; as normal buffer-file-coding-system-for-read) )))) ;; The file name is invalid, or we want to load a binary module (if (and (> (length filename) 0) (locate-file filename module-load-path (and (not nosuffix) module-extensions))) (if (featurep 'modules) (let ((load-modules-quietly nomessage)) (declare-fboundp (load-module filename))) (signal 'file-error '("This XEmacs does not support modules"))) (and (null noerror) (signal 'file-error (list "Cannot open load file" filename)))) )))) (defvar insert-file-contents-access-hook nil "A hook to make a file accessible before reading it. `insert-file-contents' calls this hook before doing anything else. Called with two arguments: FILENAME and VISIT, the same as the corresponding arguments in the call to `insert-file-contents'.") (defvar insert-file-contents-pre-hook nil "A special hook to decide the coding system used for reading in a file. Before reading a file, `insert-file-contents' calls the functions on this hook with arguments FILENAME and VISIT, the same as the corresponding arguments in the call to `insert-file-contents'. In these functions, you may refer to the global variable `buffer-file-coding-system-for-read'. The return value of the functions should be either -- nil -- A coding system or a symbol denoting it, indicating the coding system to be used for reading the file -- A list of two elements (absolute pathname and length of data inserted), which is used as the return value to `insert-file-contents'. In this case, `insert-file-contents' assumes that the function has inserted the file for itself and suppresses further reading. If any function returns non-nil, the remaining functions are not called.") (defvar insert-file-contents-error-hook nil "A hook to set `buffer-file-coding-system' when a read error has occurred. When a file error (e.g. nonexistent file) occurs while read a file, `insert-file-contents' calls the functions on this hook with three arguments: FILENAME and VISIT (the same as the corresponding arguments in the call to `insert-file-contents') and a cons (SIGNALED-CONDITIONS . SIGNAL-DATA). After calling this hook, the error is signalled for real and propagates to the caller of `insert-file-contents'.") (defvar insert-file-contents-post-hook nil "A hook to set `buffer-file-coding-system' for the current buffer. After successful reading, `insert-file-contents' calls the functions on this hook with four arguments: FILENAME and VISIT (the same as the corresponding arguments in the call to `insert-file-contents'), CODING-SYSTEM (the actual coding system used to decode the file), and a cons of absolute pathname and length of data inserted (the same thing as will be returned from `insert-file-contents').") (defun insert-file-contents (filename &optional visit start end replace) "Insert contents of file FILENAME after point. Returns list of absolute file name and length of data inserted. If second argument VISIT is non-nil, the buffer's visited filename and last save file modtime are set, and it is marked unmodified. If visiting and the file does not exist, visiting is completed before the error is signaled. The optional third and fourth arguments START and END specify what portion of the file to insert, and start at zero, in direct and needless contrast to buffer offsets. That is, values of 0 and 10 for START and END respectively will give the first ten octets of a file. If VISIT is non-nil, START and END must be nil. If optional fifth argument REPLACE is non-nil, it means replace the current buffer contents (in the accessible portion) with the file contents. This is better than simply deleting and inserting the whole thing because (1) it preserves some marker positions and (2) it puts less data in the undo list. The coding system used for decoding the file is determined as follows: 1. `coding-system-for-read', if non-nil. (Intended as a temporary overriding mechanism for use by Lisp code.) 2. The result of `insert-file-contents-pre-hook', if non-nil. (Intended for handling tricky cases where the coding system of the file cannot be determined just by looking at the filename's extension and the standard auto-detection mechanism isn't suitable, so more clever code is required. In general, this hook should rarely be used.) 3. The matching value for this filename from `file-coding-system-alist', if any. (Intended as the standard way of determining encoding from the name, or esp. the extension, of the file. Akin to the way file-name extensions are used under MS Windows to determine how to handle the file, but more flexible.) 4. `buffer-file-coding-system-for-read', if non-nil. (Intended to be where the global default coding system is set. Usually, you want to use the value `undecided', to let the system auto-detect according to the priorities set up by `set-coding-priority-list'. This is usually initialized from the `coding-system' property of the current language environment.) 5. The coding system 'raw-text. If a local value for `buffer-file-coding-system' in the current buffer does not exist, it is set to the coding system which was actually used for reading. #### This should explain in more detail the exact workings of the coding-system determination procedure. See also `insert-file-contents-access-hook', `insert-file-contents-pre-hook', `insert-file-contents-error-hook', and `insert-file-contents-post-hook'." (let ((handler (find-file-name-handler filename 'insert-file-contents))) (if handler (funcall handler 'insert-file-contents filename visit start end replace) (let (return-val coding-system used-codesys) ;; OK, first load the file. (condition-case err (progn (run-hook-with-args 'insert-file-contents-access-hook filename visit) ;; determine the coding system to use, as described above. (setq coding-system (or ;; #1. coding-system-for-read ;; #2. (run-hook-with-args-until-success 'insert-file-contents-pre-hook filename visit) ;; #3. (find-file-coding-system-for-read-from-filename filename) ;; #4. buffer-file-coding-system-for-read ;; #5. 'raw-text)) (if (consp coding-system) (setq return-val coding-system) (if (null (find-coding-system coding-system)) (progn (lwarn 'coding-system 'notice "Invalid coding-system (%s), using 'undecided" coding-system) (setq coding-system 'undecided))) (setq return-val (insert-file-contents-internal filename visit start end replace coding-system ;; store here! 'used-codesys)) )) (file-error ;; If we error, which we may if the file does not exist, we still ;; want to set the buffer-file-coding-system if that is ;; appropriate: (when (eq 'undecided (coding-system-type coding-system)) (setq used-codesys (coding-system-property coding-system 'coding-system)) (if (and used-codesys (not (eq 'undecided (coding-system-type used-codesys)))) ;; If this property is available, and not undecided, it should ;; be a coding system that we can use to write a file (as ;; opposed to the true undecided coding system, which trashes ;; non-Latin-1 on writing). It might just be the value of ;; coding-system passed to #'insert-file-contents-internal. (setq coding-system used-codesys) ;; Otherwise, take the value normally specified by the ;; language environment: (setq coding-system (default-value 'buffer-file-coding-system)))) (if (local-variable-p 'buffer-file-coding-system (current-buffer)) (set-buffer-file-coding-system (subsidiary-coding-system buffer-file-coding-system (coding-system-eol-type coding-system)) t t) (set-buffer-file-coding-system coding-system t t)) (setq buffer-file-coding-system-when-loaded coding-system) (run-hook-with-args 'insert-file-contents-error-hook filename visit err) (signal (car err) (cdr err)))) (setq coding-system used-codesys) ;; If the file was zero-length, used-codesys is undecided. Set it to ;; a more sane value. (when (eq 'undecided (coding-system-type coding-system)) (unless (zerop (buffer-size)) (warn "%s: autodetection failed: setting to default." (file-name-nondirectory (buffer-file-name)))) (setq used-codesys (coding-system-property coding-system 'coding-system)) (if (and used-codesys (not (eq 'undecided (coding-system-type used-codesys)))) ;; If this property is available, and not undecided, it should ;; be a coding system that we can use to write a file (as ;; opposed to the true undecided coding system, which trashes ;; non-Latin-1 on writing). It might just be the value of ;; coding-system passed to #'insert-file-contents-internal. (setq coding-system used-codesys) ;; Otherwise, take the value normally specified by the ;; language environment: (setq coding-system (default-value 'buffer-file-coding-system)))) ;; call any `post-read-conversion' for the coding system that ;; was used ... (let ((func (coding-system-property coding-system 'post-read-conversion)) (endmark (make-marker))) (set-marker endmark (+ (point) (nth 1 return-val))) (if func (unwind-protect (save-excursion (let (buffer-read-only) (if (>= (function-max-args func) 2) ;; #### fuckme! Someone at FSF changed the calling ;; convention of post-read-conversion. We try to ;; support the old way. #### Should we kill this? (funcall func (point) (marker-position endmark)) (funcall func (- (marker-position endmark) (point)))))) (if visit (progn (set-buffer-auto-saved) (set-buffer-modified-p nil))))) (setcar (cdr return-val) (- (marker-position endmark) (point)))) ;; now finally set the buffer's `buffer-file-coding-system' ... (if (run-hook-with-args-until-success 'insert-file-contents-post-hook filename visit return-val) nil (if (local-variable-p 'buffer-file-coding-system (current-buffer)) ;; if buffer-file-coding-system is already local, just ;; set its eol type to what was found, if it wasn't ;; set already. (set-buffer-file-coding-system (subsidiary-coding-system buffer-file-coding-system (coding-system-eol-type coding-system)) t t) ;; otherwise actually set buffer-file-coding-system. (set-buffer-file-coding-system coding-system t t))) ;; ... and `buffer-file-coding-system-when-loaded'. the machinations ;; of set-buffer-file-coding-system cause the actual coding system ;; object to be stored, so do that here, too. (setq buffer-file-coding-system-when-loaded (get-coding-system coding-system)) return-val)))) (defvar write-region-pre-hook nil "A special hook to decide the coding system used for writing out a file. Before writing a file, `write-region' calls the functions on this hook with arguments START, END, FILENAME, APPEND, VISIT, LOCKNAME and CODING-SYSTEM, the same as the corresponding arguments in the call to `write-region'. The return value of each function should be one of -- nil -- A coding system or a symbol denoting it, indicating the coding system to be used for writing the file -- A list of two elements (absolute pathname and length of data written), which is used as the return value to `write-region'. In this case, `write-region' assumes that the function has written the file and returns. If any function returns non-nil, the remaining functions are not called.") (defvar write-region-post-hook nil "A hook called by `write-region' after a file has been written out. The functions on this hook are called with arguments START, END, FILENAME, APPEND, VISIT, LOCKNAME, and CODING-SYSTEM, the same as the corresponding arguments in the call to `write-region'.") (defun write-region (start end filename &optional append visit lockname coding-system-or-mustbenew) "Write current region into specified file. Called interactively, prompts for a file name. With a prefix arg, prompts for a coding system as well. When called from a program, takes three required arguments: START, END and FILENAME. START and END are buffer positions. APPEND, if non-nil, means append to existing file contents (if any), else the file's existing contents are replaced by the specified region. VISIT, if non-nil, should be a string naming a file. The buffer is marked as visiting VISIT. VISIT is also the file name to lock and unlock for clash detection. LOCKNAME, if non-nil, specifies the name to use for locking and unlocking, overriding FILENAME and VISIT. CODING-SYSTEM-OR-MUSTBENEW specifies the coding system used to encode the text written. It defaults to the value of `buffer-file-coding-system' in the current buffer. For compatibility with GNU Emacs, several arguments are overloaded: START may be a string, which is written to the file. END is ignored. VISIT may take the value t, meaning to set last-save-file-modtime of buffer to this file's modtime and mark buffer not modified. With any other non-nil value of VISIT, suppress printing of the \"Wrote file\" message. CODING-SYSTEM-OR-MUSTBENEW may be a non-nil, non-coding-system value. If it is `excl' and FILENAME already exists, signal `file-already-exists'. Otherwise, if FILENAME already exists, ask for confirmation before writing, and signal `file-already-exists' if not confirmed. See also `write-region-pre-hook' and `write-region-post-hook'." (interactive "r\nFWrite region to file: \ni\ni\ni\nZCoding-system: ") (let (mustbenew coding-system func hook-result) (setq hook-result (or coding-system-for-write (run-hook-with-args-until-success 'write-region-pre-hook start end filename append visit lockname coding-system-or-mustbenew) (if (and coding-system-or-mustbenew (coding-system-p (find-coding-system coding-system-or-mustbenew))) coding-system-or-mustbenew) buffer-file-coding-system (find-file-coding-system-for-write-from-filename filename))) (if (consp hook-result) ;; One of the `write-region-pre-hook' functions wrote the file. hook-result ;; The hooks didn't do the work; do it ourselves. (setq hook-result (find-coding-system hook-result) mustbenew (unless (coding-system-p (find-coding-system coding-system-or-mustbenew)) coding-system-or-mustbenew) coding-system (cond ((coding-system-p hook-result) hook-result) ((null mustbenew) coding-system-or-mustbenew)) func (coding-system-property coding-system 'pre-write-conversion)) (if func (let ((curbuf (current-buffer)) (tempbuf (generate-new-buffer " *temp-write-buffer*")) (modif (buffer-modified-p))) (unwind-protect (save-excursion (set-buffer tempbuf) (erase-buffer) (insert-buffer-substring curbuf start end) (funcall func (point-min) (point-max)) (write-region-internal (point-min) (point-max) filename append (if (eq visit t) nil visit) lockname coding-system mustbenew)) ;; leaving a buffer associated with file will cause problems ;; when next visiting. (kill-buffer tempbuf) (if (or visit (null modif)) (progn (set-buffer-auto-saved) (set-buffer-modified-p nil) (if (buffer-file-name) (set-visited-file-modtime)))))) (write-region-internal start end filename append visit lockname coding-system mustbenew))) (run-hook-with-args 'write-region-post-hook start end filename append visit lockname coding-system))) ;;; code-files.el ends here