diff options
author | Robin Templeton <[email protected]> | 2014-06-24 22:32:08 -0400 |
---|---|---|
committer | Robin Templeton <[email protected]> | 2015-04-19 21:24:18 -0400 |
commit | 33813370fcaa4ad70449cc4068154e1e073cb7a9 (patch) | |
tree | 91196865b1937d74516bc19e4d62b7d45eda8b65 /src | |
parent | d51c0634338fd3610687ceec0c27977e2f2949fd (diff) |
guile-elisp bootstrap (lisp)
* lisp/abbrev.el: Remove use of cl-lib functions.
* lisp/frame.el: Remove use of cl-lib functions.
* lisp/international/mule-cmds.el: Remove use of cl-lib functions.
* lisp/minibuffer.el: Remove uses of cl-lib functions.
* lisp/byte-run.el: (defun-declarations-alist)
(macro-declarations-alist): Define at compile time.
* lisp/faces.el: Move face-listing code to "faces2.el".
* lisp/faces2.el: New file.
* lisp/files.el: Move minibuffer-with-setup-hook to subr.el.
* lisp/help.el: Move definition of with-help-window.
* lisp/international/mule.el: Define temporary defcustom macro.
* lisp/jka-cmpr-hook.el: Disable auto-compression-mode.
* lisp/loadup.el: Load mule and mule-conf earlier. Load gv
explicitly. Load subr2, derived, easy-mmode, cl-lib, cl-macs,
help-macro, help-fns, faces2, ccl, and kmacro explicitly.
* lisp/simple.el: Move defs of internal-push-keymap,
internal-pop-keymap, set-temporary-overlay-map from subr.el.
* lisp/subr.el (push): Use eval after loading macros.
(dolist): Remove.
(with-current-buffer, with-temp-buffer): Move definitions earlier.
(with-demoted-errors): Use `progn' instead of `macroexp-progn'.
(called-interactively-p-functions, called-interactively-p,
interactive-p): Move to "subr2.el".
* lisp/subr2.el: New file.
Diffstat (limited to 'src')
-rw-r--r-- | src/editfns.c | 4 | ||||
-rw-r--r-- | src/eval.c | 6 | ||||
-rw-r--r-- | src/lread.c | 3 | ||||
-rw-r--r-- | src/xdisp.c | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/editfns.c b/src/editfns.c index 5be3288b22..f9d4d0773b 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3405,13 +3405,13 @@ use `save-excursion' outermost: (save-excursion (save-restriction ...)) usage: (save-restriction &rest BODY) */) - (Lisp_Object body) + (Lisp_Object thunk) { register Lisp_Object val; dynwind_begin (); record_unwind_protect (save_restriction_restore, save_restriction_save ()); - val = Fprogn (body); + val = call0 (thunk); dynwind_end (); return val; } diff --git a/src/eval.c b/src/eval.c index 011f794aa6..ce04d8c1ee 100644 --- a/src/eval.c +++ b/src/eval.c @@ -265,7 +265,7 @@ init_eval_once (void) eval_fn = scm_c_public_ref ("language elisp runtime", "eval-elisp"); funcall_fn = scm_c_public_ref ("elisp-functions", "funcall"); - scm_set_smob_apply (lisp_vectorlike_tag, apply_lambda, 0, 0, 1); + //scm_set_smob_apply (lisp_vectorlike_tag, apply_lambda, 0, 0, 1); } static struct handler *handlerlist_sentinel; @@ -1476,9 +1476,9 @@ it is defines a macro. */) /* This is to make sure that loadup.el gives a clear picture of what files are preloaded and when. */ - if (! NILP (Vpurify_flag)) + /*if (! NILP (Vpurify_flag)) error ("Attempt to autoload %s while preparing to dump", - SDATA (SYMBOL_NAME (funname))); + SDATA (SYMBOL_NAME (funname)));*/ CHECK_SYMBOL (funname); GCPRO3 (funname, fundef, macro_only); diff --git a/src/lread.c b/src/lread.c index b2ed3bb232..d3a1babbdf 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1952,6 +1952,9 @@ readevalloop (Lisp_Object readcharfun, /* Restore saved point and BEGV. */ dynwind_end (); + //scm_display (val, SCM_UNDEFINED); + //scm_newline (SCM_UNDEFINED); + /* Now eval what we just read. */ if (!NILP (macroexpand)) val = readevalloop_eager_expand_eval (val, macroexpand); diff --git a/src/xdisp.c b/src/xdisp.c index 0390cfd677..c9ce9b9b0d 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -13378,7 +13378,7 @@ redisplay_internal (void) specbind (Qinhibit_free_realized_faces, Qnil); /* Record this function, so it appears on the profiler's backtraces. */ - record_in_backtrace (Qredisplay_internal, &Qnil, 0); + /*record_in_backtrace (Qredisplay_internal, &Qnil, 0);*/ FOR_EACH_FRAME (tail, frame) XFRAME (frame)->already_hscrolled_p = 0; |