xemacs-beta: lisp/edebug/cl-read.el comparison

comparison lisp/edebug/cl-read.el @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30

author	cvs
date	Mon, 13 Aug 2007 09:02:59 +0200
parents	ec9a17fef872
children	b9518feda344

comparison

equal deleted inserted replaced

-:804d1389bcd6
+:131b0175ea99
 ;; Customizable, Common Lisp like reader for Emacs Lisp.
 ;;
 ;; Copyright (C) 1993 by Guido Bosch <Guido.Bosch@loria.fr>
-;; This file is part of XEmacs
+;; This file is written in GNU Emacs Lisp, but not (yet) part of GNU Emacs.
-;; XEmacs is free software; you can redistribute it and/or modify it
+;; The software contained in this file is free software; you can
-;; under the terms of the GNU General Public License as published by
+;; redistribute it and/or modify it under the terms of the GNU General
-;; the Free Software Foundation; either version 2, or (at your option)
+;; Public License as published by the Free Software Foundation; either
-;; any later version.
+;; version 2, or (at your option) any later version.
-;; XEmacs is distributed in the hope that it will be useful, but
+;; GNU Emacs is distributed in the hope that it will be useful,
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; General Public License for more details.
+;; 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
+;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; 02111-1307, USA.
+;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;
-;;; Synched up with: Not in FSF
-;;; Commentary:
 ;; Please send bugs and comments to the author.
 ;;
 ;; <DISCLAIMER>
 ;; This program is still under development.  Neither the author nor
 ;; his employer accepts responsibility to anyone for the consequences of
 ;;
 ;;
 ;; Dispatch Character Macro" `#'
 ;;
 ;; #'<function>			function quoting
-;; #\<character>		character syntax
+;; #\<charcter>			character syntax
 ;; #.<form>    			read time evaluation
 ;; #p<path>, #P<path> 		paths
 ;; #+<feature>, #-<feature> 	conditional reading
 ;; #<n>=, #<n># 		tags for shared structure reading
 ;;
 ; Change History
 ;
 ; $Log: cl-read.el,v $
-; Revision 1.2  1997/03/09 02:36:46  steve
+; Revision 1.1.1.1  1996/12/18 22:43:07  steve
-; Patches to beta98
+; XEmacs 20.0 -- Beta 30
 ;
 ; Revision 1.19  94/03/21  19:59:24  liberte
 ; Add invalid-cl-read-syntax error symbol.
 ; Add reader::read-sexp and reader::read-sexp-func to allow customization
 ; based on the results of reading.
 ; Revision 1.1  1993/03/29  19:37:21  bosch
 ; Initial revision
 ;
 ;
-;;; Code:
+;;
 (require 'cl)
-;; Thou shalt evaluate a defadvice only once, or thou shalt surely lose. -sb
-(require 'advise-eval-region)
+(provide 'cl-read)
 ;; load before compiling
-;; This is ugly, but apparently the only way to do it :-(  -sb
-(provide 'cl-read)
 (require 'cl-read)
 ;; bootstrapping with cl-packages
 ;; defpackage and in-package are ignored until cl-read is installed.
 '(defpackage reader
 ;; 2. A function (i.e., a symbol with a function definition, a byte
 ;;    compiled function or an uncompiled lambda expression).  It means the
 ;;    character is a macro character.
 ;;
 ;; 3. A vector of length `reader::readtable-size'. Elements of this vector
-;;    may be `nil' or a function (see 2.). It means the character is a
+;;    may be `nil' or a function (see 2.). It means the charater is a
-;;    dispatch character, and the vector its dispatch function table.
+;;    dispatch character, and the vector its dispatch fucntion table.
 (defvar *readtable*)
 (defvar reader::internal-standard-readtable)
 (defun* copy-readtable
 ;; evals) in the current buffer.  Alternatively, this could be fixed
 ;; in C.  In Lemacs 19.6 and later, this function is already written
 ;; in lisp, and based on more primitive read functions we already
 ;; replaced. The reading happens during the interactive parameter
 ;; retrieval, which is written in lisp, too.  So this replacement of
-;; eval-expression is only required for (FSF) Emacs 18 (and 19?).
+;; eval-expresssion is only required fro (FSF) Emacs 18 (and 19?).
 (or (fboundp 'reader::original-eval-expression)
 (fset 'reader::original-eval-expression
 (symbol-function 'eval-expression)))
 )))))
 (setq values (cons (eval reader::expression) values))
 (prin1 (car values) t))
 (require 'eval-reg "eval-reg")
-; (require 'advice)
+(require 'advice)
 ;; installing/uninstalling the cl reader
 ;; These two should always be used in pairs, or just install once and
 ;; never uninstall.
 ;; for buffers without cl read syntax. The buffer local variable
 ;; `cl-read-active' controls whether the replacement funtions of this
 ;; package or the original ones are actually called.
 (cl-reader-install)
 (cl-reader-uninstall)
+;; Advise the redefined eval-region
+(defadvice eval-region (around cl-read activate)
+"Use the reader::read instead of the original read if cl-read-active."
+(with-elisp-eval-region (not cl-read-active)
+(ad-do-it)))
+;;(ad-unadvise 'eval-region)
 (add-hook 'emacs-lisp-mode-hook 'cl-reader-autoinstall-function)
 '(defvar read-syntax)
 	     (make-local-variable 'cl-read-active)
 	     (setq cl-read-active t))))))
 (run-hooks 'cl-read-load-hooks)
+;; end cl-read.el
-;; cl-read.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/edebug/cl-read.el @ 70:131b0175ea99 r20-0b30