1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Commit graph

98738 commits

Author SHA1 Message Date
Stefan Monnier
a9de04fa62 Compute freevars in cconv-analyse.
* lisp/emacs-lisp/cconv.el: Compute freevars in cconv-analyse.
(cconv-mutated, cconv-captured): Remove.
(cconv-captured+mutated, cconv-lambda-candidates): Don't give them
a global value.
(cconv-freevars-alist): New var.
(cconv-freevars): Remove.
(cconv--lookup-let): Remove.
(cconv-closure-convert-function): Extract from cconv-closure-convert-rec.
(cconv-closure-convert-rec): Adjust to above changes.
(fboundp): New function.
(cconv-analyse-function, form): Rewrite.
* lisp/emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment):
Handle declare-function here.
(byte-compile-obsolete): Remove.
(byte-compile-arglist-warn): Check late defsubst here.
(byte-compile-file-form): Simplify.
(byte-compile-file-form-defsubst): Remove.
(byte-compile-macroexpand-declare-function): Rename from
byte-compile-declare-function, turn it into a macro-expander.
(byte-compile-normal-call): Check obsolescence.
(byte-compile-quote-form): Remove.
(byte-compile-defmacro): Revert to trunk's definition which seems to
work just as well and handles `declare'.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Don't modify byte-compile.
* lisp/Makefile.in (BIG_STACK_DEPTH): Increase to 1200.
(compile-onefile): Pass $(BIG_STACK_OPTS) before "-l bytecomp".
* lisp/emacs-lisp/macroexp.el: Use lexbind.
(macroexpand-all-1): Check macro obsolescence.
* lisp/vc/diff-mode.el: Use lexbind.
* lisp/follow.el (follow-calc-win-end): Simplify.
2011-02-26 10:19:08 -05:00
Stefan Monnier
876c194cba Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.

* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-24 22:27:45 -05:00
Stefan Monnier
cb9336bd97 * lisp/emacs-lisp/cconv.el (cconv-closure-convert-rec): Let the byte
compiler choose the representation of closures.
(cconv--env-var): Remove.
* lisp/emacs-lisp/bytecomp.el (byte-compile--env-var): New var.
(byte-compile-make-closure, byte-compile-get-closed-var):
New functions.
* lisp/cedet/semantic/wisent/comp.el (wisent-byte-compile-grammar):
Macroexpand before passing to byte-compile-form.
2011-02-21 18:40:54 -05:00
Stefan Monnier
f619ad4ca2 Merge from trunk 2011-02-21 17:34:51 -05:00
Stefan Monnier
a647cb26b6 Missing files in last commit; remove stack-depth in byte-optimize-lapcode 2011-02-21 15:31:07 -05:00
Christoph Scholtes
9f8370e63f Add stdint.h for MS-Windows.
nt/inc/stdint.h: New file, to support compilation with tool chains
 that do not have stdint.h (e.g. MSVC).
 lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on
 $(EMACS_ROOT)/nt/inc/stdint.h.
2011-02-21 22:16:43 +02:00
Stefan Monnier
3e21b6a72b Use offsets relative to top rather than bottom for stack refs
* lisp/emacs-lisp/byte-opt.el (byte-compile-side-effect-and-error-free-ops):
Remove interactive-p.
(byte-optimize-lapcode): Update optimizations now that stack-refs are
relative to the top rather than to the bottom.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode):
Turn stack-ref-0 into dup.
(byte-compile-form): Don't indirect-function since it can signal
errors.
(byte-compile-stack-ref, byte-compile-stack-set): Adjust to stack-refs
being relative to top rather than to bottom in the byte-code.
(with-output-to-temp-buffer): Remove.
(byte-compile-with-output-to-temp-buffer): Remove.
* lisp/emacs-lisp/cconv.el: Use lexical-binding.
(cconv--lookup-let): Rename from cconv-lookup-let.
(cconv-closure-convert-rec): Fix handling of captured+mutated
arguments in defun/defmacro.
* lisp/emacs-lisp/eieio-comp.el (eieio-byte-compile-file-form-defmethod):
Rename from byte-compile-file-form-defmethod.
Don't byte-compile-lambda.
(eieio-byte-compile-defmethod-param-convert): Rename from
byte-compile-defmethod-param-convert.
* lisp/emacs-lisp/eieio.el (eieio-defgeneric-form-primary-only-one):
Call byte-compile rather than byte-compile-lambda.
* src/alloc.c (Fgarbage_collect): Don't mark the byte-stack redundantly.
* src/bytecode.c (exec_byte_code): Change stack_ref and stack_set to use
offsets relative to top rather than to bottom.
* lisp/subr.el (with-output-to-temp-buffer): New macro.
* lisp/simple.el (count-words-region): Don't use interactive-p.
2011-02-21 15:12:44 -05:00
Eli Zaretskii
25c51af3a9 Adapt MS-Windows build to import of filemode.c from gnulib.
nt/inc/sys/stat.h (S_ISUID, S_ISGID, S_ISVTX, S_IRGRP, S_IROTH)
 (S_IWGRP, S_IWOTH, S_IXGRP, S_IXOTH, S_ISSOCK, S_ISLNK, S_ISCTG)
 (S_ISDOOR, S_ISMPB, S_ISMPC, S_ISNWK, S_ISPORT, S_ISWHT)
 (S_TYPEISMQ, S_TYPEISSEM, S_TYPEISSHM, S_TYPEISTMO): Define.
 (lstat): Define to stat.
 lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
 src/makefile.w32-in and adapt.  Depend on stamp_BLD.
 (GNULIBOBJS): Add $(BLD)/filemode.$(O).
 src/makefile.w32-in ($(BLD)/filemode.$(O)): Move recipe to
 lib/makefilw.w32-in.
 ($(BLD)/dired.$(O)): Depend on $(EMACS_ROOT)/lib/filemode.h.
 (GLOBAL_SOURCES): Remove filemode.c.
 (OBJ1): Remove $(BLD)/filemode.$(O).
 lib-src/makefile.w32-in ($(BLD)/ctags.$(O), $(BLD)/emacsclient.$(O))
 ($(BLD)/etags.$(O), $(BLD)/movemail.$(O), $(BLD)/ntlib.$(O)):
 Depend on $(EMACS_ROOT)/nt/inc/sys/stat.h.
2011-02-21 22:00:19 +02:00
Michael Albinus
c63090455f * net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not use
`field' property of `rfn-eshadow-overlay'.
2011-02-21 20:14:56 +01:00
Ben Key
6ca1c3b4f2 * make-docfile.c (scan_c_file): Adapt to the new BVAR macro. 2011-02-21 13:02:49 -05:00
Paul Eggert
5c185672d6 Import filemode module from gnulib. 2011-02-21 09:56:37 -08:00
Lars Ingebrigtsen
06b840e0d9 Merge changes made in Gnus trunk.
gnus.texi (Window Layout): Document layout names.
nntp.el (nntp-finish-retrieve-group-infos): Add a kludge to use the given method as in the group name if we're using an extended method.
 (nntp-finish-retrieve-group-infos): Wait for the end of the LIST ACTIVE command, if we're using that, instead of waiting for the beginning.
gnus-start.el (gnus-get-unread-articles): Extend the methods so that we're sure to get unique server names, and we don't output two async commands in the same buffer.  This fixes an NNTP hang for some users.
netrc.el (netrc-parse): Comment fix.
gnus-sum.el (gnus-summary-next-article): Add a kludge to reselect the summary buffer before reading going to the next buffer.  This avoids putting the point in the group buffer if you `C-g' the command.
auth-source.el (auth-source-netrc-parse): Add an in-memory netrc cache (for now) to make ~/.authinfo.gpg files usable.
nnfolder.el (copyright-update): Define for the compiler.
auth-source.el (auth-source-search): Fix unbound variable.
2011-02-21 13:29:15 +00:00
Chong Yidong
6d7132563c Merge some code from hexrgb.el into color.el.
* lisp/color.el (color-name-to-rgb): Rename from color-rgb->normalize.
Autoload.  Add optional arg FRAME, and pass it to color-values.
(color-complement): Caller changed.  Doc fix.
(color-gradient): Rewrite for better clarity and efficiency.
(color-rgb-to-hex): Rename from color-rgb->hex.
(color-rgb-to-hsv): Rename from color-rgb->hsv.  Force hue and
saturation to zero if the value is too small.
(color-rgb-to-hsl): Rename from color-rgb->hsl.
(color-srgb-to-xyz): Rename from color-srgb->xyz.  Doc fix.
(color-xyz-to-srgb): Rename from color-xyz->srgb.  Doc fix.
(color-xyz-to-lab): Rename from color-xyz->lab.  Doc fix.
(color-lab-to-xyz): Rename from color-lab->xyz.  Doc fix.
(color-lab-to-srgb): Rename from color-lab->srgb.  Doc fix.
(color-cie-de2000): Doc fix.

* lisp/facemenu.el (color-rgb-to-hsv): Deleted; use the version in
lisp/color.el instead.
(list-colors-sort-key, list-colors-print): Use
color-normalized-values.

* lisp/faces.el (color-values): Use cond for clarity.  Doc fix.

* lisp/gnus/shr-color.el (shr-color->hexadecimal): Use renamed
function names color-rgb-to-hex, color-name-to-rgb,
color-srgb-to-lab, and color-lab-to-srgb.
2011-02-21 01:03:36 -05:00
Chong Yidong
6b483b6643 * themes/tango-dark-theme.el: Tweak background on low-color terminals. 2011-02-21 00:59:20 -05:00
Juanma Barranquero
50a4e25afa lib-src/makefile.w32-in (obj): Remove md5.o. 2011-02-20 23:17:39 +01:00
Eli Zaretskii
e1e6b4fb85 Followup for 2011-02-20T18:50:26Z!eliz@gnu.org.
lib/makefile.w32-in ($(BLD)/md5.$(O)): Don't depend on
 $(EMACS_ROOT)/nt/inc/sys/stat.h.
2011-02-20 23:09:45 +02:00
Paul Eggert
6cac9cb117 * configure.in (C_WARNINGS_SWITCH): Do not prepend -Wno-pointer-sign. 2011-02-20 11:46:08 -08:00
Paul Eggert
2763cfc268 Merge from mainline. 2011-02-20 11:31:01 -08:00
Christoph Scholtes
32159fc37e Fix the MS-Windows build due to import of md5 from gnulib.
src/makefile.w32-in: Remove md5.$(O).
 ($(BLD)/md5.$(O)): Remove prerequisites, moved to
 lib/makefile.w32-in.
 ($(BLD)/fns.$(O)): Depend on $(EMACS_ROOT)/lib/md5.h and on stamp_BLD.
 lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
 src/makefile.w32-in.
2011-02-20 20:50:26 +02:00
Alan Mackenzie
bdfbdbb219 (c-end-of-statement): Set macro-end correctly at the end of a loop. 2011-02-20 18:36:29 +00:00
Alan Mackenzie
aa9c0efca4 . 2011-02-20 18:35:30 +00:00
Paul Eggert
d209feedbd * dired.c: Include <filemode.h> at top level. 2011-02-20 09:14:24 -08:00
Ulf Jasper
4856384c16 Convert test/icalendar-testsuite.el to ERT format.
* automated/icalendar-tests.el: Move from icalendar-testsuite.el;
  convert to ERT format.
2011-02-20 15:35:58 +01:00
Andreas Schwab
652db9c009 Update autoloads 2011-02-20 12:59:44 +01:00
Paul Eggert
cfd812fa03 Import filemode module from gnulib.
* Makefile.in (base_obj): Remove filemode.o, as it's now in ../lib.
* deps.mk (dired.o): Depend on ../lib/filemode.h, too.
(filemode.o): Remove; this is now in ../lib.
* dired.c: Include <filemode.h>.
(filemodestring): Remove now-redundant decl.
* config.in: Regenerate.

2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
2011-02-20 02:53:22 -08:00
Paul Eggert
5fa4ac767c Import filemode module from gnulib.
* .bzrignore: Add lib/sys/.
* Makefile.in (GNULIB_MODULES): Add filemode.
* lib/Makefile.am (MOSTLYCLEANDIRS): New macro.
* lib/filemode.c: Renamed from src/filemode.c and regenerated
from gnulib.  This adds support for some more file types, e.g.,
Cray DMF migrated files.
* lisp/emacs-lisp/find-gc.el (find-gc-source-files): Remove filemode.c.
* lib/filemode.h, lib/sys_stat.in.h, m4/filemode.m4, m4/st_dm_mode.m4:
* m4/sys_stat_h.m4: New files, generated from gnulib.
* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
Regenerate.

2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
2011-02-20 02:51:50 -08:00
Paul Eggert
61353ac8cd Merge: Import crypto/md5 and stdint modules from gnulib. 2011-02-20 00:48:52 -08:00
Gnus developers
01baa1e6f2 nnimap.el (nnimap-wait-for-response): Ensure that we get the entire line we're waiting for.
gnus-art.el (gnus-article-next-page-1): Because customized mode-line face with line-width greater than zero will cause RET in gnus summary buffer to scroll down article page-wise because auto vscroll happens, it should be temporalily disabled when doing a scroll-up.
2011-02-20 04:08:04 +00:00
Glenn Morris
e17816e57e edmacro.el trivia.
* lisp/edmacro.el: Remove old header comment.
(edmacro-eight-bits): Make it a defcustom.  Don't autoload it.
2011-02-19 16:16:54 -08:00
Glenn Morris
18cfb5a1ea autorevert.el trivia.
* lisp/autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-ignore-buffer): Remove leading "*" from docs.
It makes zero sense to use it with these variables.
2011-02-19 16:09:28 -08:00
Dmitry Bolshakov
a87af185c9 Prevent hideshow from parsing braces inside comments (Bug#8036).
* progmodes/hideshow.el (hs-find-block-beginning)
(hs-hide-level-recursive): Ignore comments when parsing braces.
2011-02-19 17:20:35 -05:00
Chong Yidong
3ab713fdac Improvements to vc-bzr conffile handling and pull/merge support.
* vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted.
(vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf
but returning an alist.  Ignore comments in bzr conffile.
(vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf.
(vc-bzr-error-regex-alist): New var.
(vc-bzr-merge-branch): Use it to highlight the pull/merge buffer.

* progmodes/compile.el (compilation--flush-directory-cache):
Handle the case where cdr of compilation--flush-directory-cache
points to no buffer, which can occur if we previously switched to
compilation-mode in a pregenerated buffer.

* vc/vc-dispatcher.el (vc-do-async-command): Bind
inhibit-read-only to t.
2011-02-19 16:23:51 -05:00
Glenn Morris
cad7445b36 dired-x no longer requires dired-aux.
* lisp/dired-x.el: Don't require dired-aux.
(dired-do-create-files, dired-mark-read-regexp)
(dired-do-create-files-regexp): Autoload from dired-aux.
2011-02-19 12:44:34 -08:00
Glenn Morris
bea584fae3 Merge dired-x's dired-find-buffer-nocreate into dired.el.
* lisp/dired-x.el (dired-find-buffer-nocreate): Merge into dired.el.

* lisp/dired.el (dired-find-buffer-nocreate): Merge dired-x version.

* doc/misc/dired-x.texi (Technical Details):
No longer redefines dired-find-buffer-nocreate.
2011-02-19 12:36:54 -08:00
Eli Zaretskii
615d868ee6 Adapt and fix the MS-DOS port due to gnulib imports.
msdos/depfiles.bat: New file.
 msdos/sedlibmk.inp: New file.
 msdos/sedlibcf.inp: New file.
 msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
 (BUILT_EMACS): Rename from BUILT-EMACS.
 msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
 (ENVADD): Adjust to MAKEINFO_OPTS.
 (texinputdir): Don't edit.
 msdos/sed3v2.inp (-DVERSION): Edit out.
 (LOADLIBES): Don't edit to empty.
 msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
 BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE__BOOL): Edit to 1.
 (VERSION, inline, restrict): Edit for DJGPP.
 (my_strftime): Edit to nstrftime.
 msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
 (@true): Edit to "@rem".
 (move-if-change): Edit to "update".
 (echo): Edit to "djecho".
 (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
 (LIBOBJS): Edit to empty.
 ($(libsrc)/make-docfile): Two new edits, one each for every
 invocation of make-docfile.
 (move-if-change): Fix edit.
 Remove some unused switches from $(ALL_CFLAGS), to make the GCC
 command line shorter.
 msdos/mainmake.v2 (version): Remove, no longer needed (config.in
 defines VERSION).
 (all): Add lib.
 (lib): New target and recipe.
 (lib-src): Depend on lib.
 (src): Depend on lib and lib-src.
 (clean, mostlyclean, distclean, maintainer-clean, extraclean)
 (bootstrap-clean): Recurse into lib.
 (lib, lib-src, src): Specify "all" as an explicit target.
 .bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
 Add lib/deps/.
 config.bat: Configure in `lib'.
 Generate *.Po files in lib/deps.
 src/termcap.c (tputs): Don't declare baud_rate.
 src/s/msdos.h (strtold): Define to _strtold.
2011-02-19 21:56:29 +02:00
Eli Zaretskii
83627c032a Fix MS-DOS build in src/: delete gl-tmp.
msdos/sed1v2.inp: Delete gl-tmp after updating globals.h
2011-02-19 21:49:10 +02:00
Eli Zaretskii
f601db19da Finish fixing the MS-DOS build. Everything builds and works.
src/termcap.c (tputs): Don't declare baud_rate.
 msdos/sedlibmk.inp (gl_LIBOBJS): Add getloadavg.o.
 msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
 (BUILT_EMACS): Rename from BUILT-EMACS.
 msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
 (ENVADD): Adjust to MAKEINFO_OPTS.
 (texinputdir): Don't edit.
 msdos/sed2v2.inp (my_strftime): Edit to nstrftime.
 msdos/sed1v2.inp (LIBOBJS): Edit to empty.
 ($(libsrc)/make-docfile): Two new edits, one each for every
 invocation of make-docfile.
 (move-if-change): Fix edit.
 Remove some unused switches from $(ALL_CFLAGS), to make the GCC
 command line shorter.
2011-02-19 21:41:00 +02:00
Glenn Morris
67ab0163d6 Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca 2011-02-19 11:40:59 -08:00
Chong Yidong
27ac6e7908 Fix typo in auth.texi (Bug#8068). 2011-02-19 14:26:37 -05:00
Glenn Morris
d6e96966e8 Merge dired-x's dired-read-shell-command into dired-aux's version.
* lisp/dired-x.el (dired-read-shell-command): Merge into dired-aux's version.

* lisp/dired-aux.el (dired-read-shell-command): Merge dired-x's version.

* doc/misc/dired-x.texi (Technical Details):
No longer redefines dired-read-shell-command.
2011-02-19 11:20:38 -08:00
Glenn Morris
429242317e Merge dired-x's dired-clean-up-after-deletion into dired's version.
* lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el.

* lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version.
(dired-clean-up-buffers-too): Declare.

* doc/misc/dired-x.texi (Technical Details):
No longer redefine dired-clean-up-after-deletion.
2011-02-19 10:55:15 -08:00
Eli Zaretskii
534e4e80e6 Fix msdos/sed3v2.inp. lib-src/ now builds.
sed3v2.inp (-DVERSION): Edit out.
 (LOADLIBES): Don't edit to empty.
 mainmake.v2 (lib, lib-src, src): Specify "all" as an explicit target.
2011-02-19 19:54:18 +02:00
Eli Zaretskii
27087453c9 Fix msdos/sedlibmk.inp. lib/ builds now.
sedlibmk.inp (HAVE_GETOPT_H, PRAGMA_SYSTEM_HEADER, PRAGMA_COLUMNS): Fix
 editing.
 (DEFS): Edit to -DHAVE_CONFIG_H.
 (Makefile, &&): Fix removal.
2011-02-19 19:35:11 +02:00
Chong Yidong
f6ed3dbe85 * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
See http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00715.html
2011-02-19 12:34:50 -05:00
Eli Zaretskii
219463da10 Fix generation of auto-dependency files in lib/.
.bzrignore: Add lib/deps/.
 config.bat: Generate *.Po files in lib/deps.
 msdos/sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Fix editing of *-clean
 rules.
 msdos/depfiles.bat: New file.
2011-02-19 18:53:10 +02:00
Eli Zaretskii
152be435b9 Update .bzrignore for files produced by the MS-DOS build.
.bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
2011-02-19 18:12:18 +02:00
Eli Zaretskii
9d9ce65995 Commit new Sed scripts in msdos/. 2011-02-19 18:05:27 +02:00
Eli Zaretskii
9d9d12cdf3 Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
 msdos/sedlibmk.inp: New file.
 msdos/sedlibcf.inp: New file.
 msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
 (@true): Edit to "@rem".
 (move-if-change): Edit to "update".
 (echo): Edit to "djecho".
 (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
 msdos/mainmake.v2 (version): Remove, no longer needed (config.in
 defines VERSION).
 (all): Add lib.
 (lib): New target and recipe.
 (lib-src): Depend on lib.
 (src): Depend on lib and lib-src.
 (clean, mostlyclean, distclean, maintainer-clean, extraclean)
 (bootstrap-clean): Recurse into lib.
 msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
 BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE__BOOL): Edit to 1.
 (VERSION, inline, restrict): Edit for DJGPP.
 src/s/msdos.h (strtold): Define to _strtold.
 admin/admin.el (set-version): Add msdos/sed2v2.inp.
2011-02-19 17:57:35 +02:00
Kenichi Handa
51a1211543 merge emacs-23 2011-02-19 19:46:49 +09:00
Paul Eggert
ff05203ec6 * deps.mk (fns.o): Depend on ../lib/md5.h. 2011-02-19 01:51:59 -08:00