1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-04 14:40:54 -08:00
Commit graph

419 commits

Author SHA1 Message Date
John Wiegley
1dd4f26ab6 Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
2016-01-11 22:48:07 -08:00
Glenn Morris
c140eec06b ; * lisp/Makefile.in: Comment update. 2016-01-06 18:48:40 -05:00
Glenn Morris
c6d3c60f28 Build tweaks related to tags files.
* lib-src/Makefile.in (tagsfiles): New variable.
(TAGS): Also depend on the source files.  Use our own etags program.
* lisp/Makefile.in (ETAGS): Add EXEEXT.
(lisptagsfiles1, lisptagsfiles2, lisptagsfiles3, lisptagsfiles4):
Remove.
(tagsfiles): New, replacing lisptagsfiles1 etc.
Remove irrelevant source files here rather than in the TAGS rule.
(${ETAGS}): New rule.
(TAGS): Also depend on the etags executable.
* lwlib/Makefile.in (EXEEXT): New, set by configure.
(ETAGS): Add EXEEXT.
(${ETAGS}): New rule.
(ctagsfiles): Use "wildcard".
(TAGS): Also depend on the etags executable.
* nt/Makefile.in (ETAGS, tagsfiles): New variables.
(${ETAGS}): New rule.
(TAGS): Fix dependencies.
* oldXMenu/Makefile.in (EXEEXT): New, set by configure.
(ETAGS): New variable, replacing $TAGS.  Use our own etags program.
Remove "-t" argument.
(${ETAGS}): New rule.
(tagsfiles): New variable.
(TAGS): New rule, with proper dependencies.
* src/Makefile.in (ETAGS): Add EXEEXT.  Add a build rule.
(ctagsfiles1, ctagsfiles2): Use "wildcard".
(ctagsfiles3): Remove.
(TAGS): Depend on etags.
(../lisp/TAGS, $(lwlibdir)/TAGS): Let the rules in the relevant
directories decide if updates are needed.
2016-01-06 18:25:47 -05:00
Glenn Morris
efa8087d4b * lisp/Makefile.in (CAL_SRC): Skip calendar.el. 2016-01-06 17:40:00 -05:00
Paul Eggert
61e83e902b Spelling fixes 2016-01-04 14:47:01 -08:00
Paul Eggert
0e963201d0 Update copyright year to 2016
Run admin/update-copyright.
2016-01-01 01:34:24 -08:00
Phillip Lord
2f55a230d7 dired generate autoloads to non-versioned file.
* lisp/dired.el: Remove autoloads.
* lisp/Makefile.in: Add dired to autogenel.
* lisp/dired-aux.el,lisp/dired-x.el: Update file local.
* test/lisp/dired-tests.el: Add new test.
2015-12-17 20:42:16 +00:00
Phillip Lord
ee85661174 eieio generate autoloads to non-versioned file.
* lisp/Makefile.in: eieio-loaddefs add to autogenel.
* lisp/emacs-lisp/eieio.el,lisp/emacs-lisp/eieio-core.el:
  Remove autoloads.
* lisp/emacs-lisp/eieio-compat.el,lisp/emacs-lisp/eieio-custom.el,
  lisp/emacs-lisp/eieio-opt.el: Update file local.
* test/lisp/emacs-lisp/eieio-tests/eieio-tests.el: New test.
2015-12-17 20:42:15 +00:00
Phillip Lord
459cf7cb92 htmlfontify generate autoload to non-versioned file.
* lisp/Makefile.in: Add htmlfontity-loaddefs to autogenel.
* lisp/hfy-cmap.el: Update file local.
* lisp/htmlfontify.el: Remove autoloads, add require.
* test/lisp/htmlfontify-tests.el: Test autoload functionality.
2015-12-17 20:42:15 +00:00
Phillip Lord
a014779ffa ibuffer generate autoloads to non-versioned file.
* lisp/Makefile.in: Add ibuffer-loaddefs to autogenel.
* lisp/ibuf-ext.el: Update file local.
* lisp/ibuffer.el: Remove autoloads and add a require.
* test/lisp/ibuffer-tests.el: Test that autoload is working.
2015-12-17 20:42:15 +00:00
Phillip Lord
ef69697161 rmail generate autoloads to non-versioned file.
* lisp/Makefile.in: Add rmail-loaddefs.el to autogenel.
* lisp/mail/rmail.el: Remove autoloads, add require.
* lisp/mail/rmailedit.el,lisp/mail/rmailkwd.el,
  lisp/mail/rmailmm.el,lisp/mail/rmailmsc.el,
  lisp/mail/rmailsort.el,lisp/mail/rmailsum.el,
  lisp/mail/undigest.el: Update file-local.
* test/lisp/mail/rmail-tests.el:
2015-12-17 20:42:15 +00:00
Phillip Lord
88492253bf Add autoload-force target.
* lisp/Makefile.in (autoload-force): New target.
2015-12-17 20:42:15 +00:00
Phillip Lord
0eb57910ab ps-print generate autoloads to non versioned file.
* lisp/Makefile.in: Add ps-print-loaddefs.el to autogen list.
* lisp/ps-print.el: Remove autoloads.
* lisp/ps-mule.el: Update file-local.
* test/lisp/ps-print-tests.el: Test autoload functionality.
2015-12-17 20:42:15 +00:00
Phillip Lord
a2e6ed34b6 reftex generate autoloads to non versioned file.
* lisp/Makefile.in: Add reftex-loaddefs to autogen files
* lisp/textmodes/reftex.el: Remove autoloads.
* lisp/textmodes/reftex-auc.el,lisp/textmodes/reftex-cite.el,
  lisp/textmodes/reftex-dcr.el,lisp/textmodes/reftex-global.el,
  lisp/textmodes/reftex-index.el,lisp/textmodes/reftex-parse.el,
  lisp/textmodes/reftex-ref.el,lisp/textmodes/reftex-sel.el,
  lisp/textmodes/reftex-toc.el: Update autoload file-local.
* test/lisp/textmodes/reftex-tests.el: Add test of an autoloaded
  function.
2015-12-17 20:42:14 +00:00
Stefan Monnier
36b3f1b61f * lisp/loadup.el: Set max-lisp-eval-depth here
* lisp/Makefile.in (BIG_STACK_DEPTH, BIG_STACK_OPTS): Remove.
(BYTE_COMPILE_FLAGS): Adjust accordingly.
2015-11-18 11:42:29 -05:00
Paul Eggert
29dfca2355 Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-10 18:11:27 -07:00
Paul Eggert
309d39b832 A few more minor quoting fixes in a script and a text file 2015-09-16 16:09:31 -07:00
Glenn Morris
5f9e4b2e11 * leim/Makefile.in, lisp/Makefile.in: Add missing EXEEXT definition. 2015-06-30 16:20:39 -04:00
Glenn Morris
290acafd7e * lisp/Makefile.in (MH_E_SRC, TRAMP_SRC, CAL_SRC):
Replace hard-coded lists with wildcard + filter-out.
2015-06-30 15:23:07 -04:00
Glenn Morris
18942259ce * lisp/Makefile.in (SUBDIRS): Rename from SUBDIRS_ABS.
(SUBDIRS_REL): Derive from SUBDIRS.
2015-06-05 16:12:44 -04:00
Glenn Morris
1805ce763e Tweak some build messages.
* lisp/Makefile.in ($(lisp)/loaddefs.el):
* lisp/cus-dep.el (custom-make-dependencies):
* lisp/finder.el (finder-compile-keywords): Say what we are doing.
* lisp/international/titdic-cnv.el (batch-titdic-convert):
Don't say how to compile.
2015-06-05 16:10:18 -04:00
Glenn Morris
8fb6253c00 * lisp/Makefile.in (AM_V_at): Add missing definition. 2015-06-04 21:19:22 -04:00
Glenn Morris
76f896dd1b * lisp/Makefile.in: Quieten output a bit.
($(lisp)/cus-load.el, $(lisp)/finder-inf.el):
Don't echo directories, since the commands we invoke print them.
2015-06-04 21:16:23 -04:00
Glenn Morris
0382a93465 * lisp/Makefile.in: Replace shell fragments in variables with $(shell).
(SUBDIRS_REL, SUBDIRS_ABS, SUBDIRS_ALMOST, SUBDIRS_FINDER)
(SUBDIRS_SUBDIRS): New variables.
(setwins, setwins_almost, setwins_finder, setwins_for_subdirs):
Remove.
($(lisp)/cus-load.el, $(lisp)/finder-inf.el, $(lisp)/loaddefs.el)
(update-subdirs, compile-main, compile-clean):
Replace "setwins" usage with new "SUBDIRS" variables.
2015-06-04 21:02:26 -04:00
Glenn Morris
cc88cb8ac4 * lisp/Makefile.in (check-defun-dups): Also skip ldefs-boot. 2015-06-04 19:26:32 -04:00
Paul Eggert
6b62d26589 Use ${EXEEXT} more uniformly in makefiles
When porting Emacs to run on NaCl, we need to make sure that we always
call it with the proper extension (.nexe in this case) during the build.
* leim/Makefile.in, lib-src/Makefile.in, lisp/Makefile.in (EMACS):
Append ${EXEEXT}.
(tiny change)
2015-02-23 10:10:24 -08:00
Paul Eggert
5c20aa7486 Port to platforms lacking test -a and -o
* configure.ac (HAVE_LIBXML2):
* lisp/Makefile.in (compile-clean):
* lisp/net/tramp-sh.el (tramp-find-executable):
Prefer '&&' and '||' to 'test -a' and 'test -o'.
2015-02-08 16:00:58 -08:00
Paul Eggert
d703a4dce5 Have 'make' output better GEN names
* lisp/Makefile.in (PHONY_EXTRAS): New macro.
(.PHONY): Depend on it, and on $(lisp)/loaddefs.el, so that the
relevant files' time stamps are ignored.
(custom-deps, $(lisp)/cus-load.el, finder-data)
($(lisp)/finder-inf.el): Use PHONY_EXTRAS.
(custom-deps, $(lisp)/cus-load.el, finder-data)
($(lisp)/finder-inf.el, autoloads, $(lisp)/loaddefs.el)
($(lisp)/subdirs.el, update-subdirs):
Output more-accurate destination names with GEN.
* src/Makefile.in (gl-stamp, globals.h): Simplify by putting the new
contents of globals.h into gl-stamp.  This lets us use AM_V_GEN
more naturally so that 'make' can output more-accurate names.
2015-01-11 18:20:08 -08:00
Paul Eggert
c2774f3733 Say "ELC foo.elc" instead of "GEN foo.elc"
* admin/unidata/Makefile.in, lisp/Makefile.in (AM_V_ELC)
(am__v_ELC_, am__v_ELC_0, am__v_ELC_1): New macros.
* admin/unidata/Makefile.in (%.elc):
* lisp/Makefile.in ($(THEFILE)c, .el.elc): Use them.
2015-01-11 17:42:43 -08:00
Paul Eggert
ccb2d93859 Less 'make' chatter for lisp dir
* lisp/Makefile.in (THEFILE): Define to be 'no-such-file' by default,
to make it clearer that the caller must specify it.
(compile-onefile): Remove, replacing by ...
($(THEFILE)c): ... new rule.  This lets us use AM_V_GEN here.
($(THEFILE)c, .el.elc, $(MH_E_DIR)/mh-loaddefs.el)
($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el):
Use AM_V_GEN to lessen 'make' chatter.
(.el.elc): Omit duplicate comment.
* src/Makefile.in (%.elc): Adjust to compile-onefile change in
../lisp/Makefile.in.
2015-01-03 18:54:34 -08:00
Paul Eggert
7e09ef09a4 Update copyright year to 2015
Run admin/update-copyright.
2015-01-01 14:26:41 -08:00
Paul Eggert
7e3507cfc4 Less 'make' chatter for doc and lisp
[doc/emacs/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/emacs.info, emacs.html):
Use them.
[doc/lispintro/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/eintr.info, emacs-lisp-intro.html):
Use them.
[doc/lispref/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/elisp.info, elisp.html):
Use them.
[doc/misc/ChangeLog]
Less 'make' chatter for Emacs doc
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in.
(ENVADD, $(buildinfodir)/%.info, %.html, ${buildinfodir}/ccmode.info)
(${buildinfodir}/efaq%.info, efaq%.html):
Use them.
[lisp/ChangeLog]
Less 'make' chatter in lisp directory
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1): New macros, from ../src/Makefile.in.
(custom-deps, finder-data, autoloads, update-subdirs): Use them.
2014-12-31 11:59:41 -08:00
Paul Eggert
6654a4ce49 * Makefile.in (semantic): Simplify. 2014-12-30 23:50:54 -08:00
Stefan Monnier
b76bea4c26 Various minor details accumulated over time
* lisp/info.el (Info-mode-map): Remove left-over binding.
* lisp/net/tramp.el (tramp-handle-make-symbolic-link): Mark unused arg.
* lisp/obsolete/gulp.el (gulp-create-m-p-alist): Remove unused var `mnt-tm'.
* lisp/progmodes/gud.el (gud-gdb-completions): Remove unused var `start'.
* lisp/url/url-http.el (url-http-activate-callback): Make debug more verbose.
* src/process.c: Whitespace and line-break nitpicks.
2014-12-08 15:02:26 -05:00
Glenn Morris
d5d8ca30e5 Merge from emacs-24; up to 117656 2014-11-01 11:05:30 -07:00
Eli Zaretskii
b8ff3a9f98 Minor fixes in the changes in preparation for git migration.
src/Makefile.in (repo-update): Fix a typo and slightly reword
 commentary.

 admin/notes/repo (Notes): Reword the stylistic guidance for commit log
 messages so that they are in line with Emacs development practices
 and style guidance.
2014-10-31 11:32:11 +02:00
Eric S. Raymond
cac77f92e3 Backport changes in preparation for git migration from trunk.
admin: Changes in several documents.
 autogen.sh: Neutralize language specific to a repository type.

 doc/misc/efaq-w32.texi: Neutralized language specific to a repository type.

 doc/misc/gnus-coding.txt: Neutralized language specific to a repository type.

 lisp/Makefile.in: Change some production names so they're neutral
 about the repository type.
2014-10-31 11:03:23 +02:00
Eric S. Raymond
88a297f3a2 Neutralize names specific to a repository type. 2014-10-25 14:55:59 -04:00
Stefan Monnier
3e7807011b * lisp/Makefile.in (AUTOGEN_VCS): Remove emulation/tpu-edt.el. [Backport] 2014-10-20 18:21:56 -04:00
Stefan Monnier
71785ae78c * lisp/icomplete.el: Move Iswitchb autoload here. Much simpler.
* lisp/Makefile.in (obsolete-autoloads): Remove.
(AUTOGENEL): Remove obsolete/loaddefs.el.
* lisp/loadup.el: Don't load obsolete/loaddefs.el.
* lisp/obsolete/iswitchb.el (iswitchb-mode): Use normal autoload cookie.
Remove redundant obsolescence thingy.
2014-10-06 10:12:56 -04:00
Glenn Morris
87666a0567 * lisp/Makefile.in (obsolete-autoloads): Write to a separate file,
to workaround autoloads bug. 
(AUTOGENEL): Add obsolete/loaddefs.el.

* lisp/loadup.el: Load obsolete/loaddefs.el if present.

* lisp/subr.el (do-after-load-evaluation):
Don't warn about obsolete/loaddefs.el.

Fixes: debbugs:17407
2014-10-06 00:00:33 -07:00
Stefan Monnier
4700363363 CC-mode: Set open-paren-in-column-0-is-defun-start to nil;
plus misc cleanup.
* lisp/progmodes/cc-mode.el (c-basic-common-init):
Set open-paren-in-column-0-is-defun-start.
(adaptive-fill-first-line-regexp, font-lock-syntactic-keywords):
Remove declarations, unused.
(run-mode-hooks): Remove declaration.
(font-lock-defaults): Use plain `defvar' to declare.
(c-run-mode-hooks): Test existence of run-mode-hooks with fboundp.
* lisp/progmodes/cc-langs.el (c-filter-ops): Avoid `setq'.
(c-make-mode-syntax-table): Don't micro-optimize.
(c-keywords, c-keyword-member-alist): Simplify.
(c-kwds-lang-consts): Don't eval at compile-time.
(c-primary-expr-regexp): Comment out unused vars.
* lisp/progmodes/cc-fonts.el (c-font-lock-context): Declare at top-level.
(c-font-byte-compile): New var.
(c--compile): New function.  Use it instead of `byte-compile'.
(c-cpp-matchers): Quote the value returned by
`c-make-syntactic-matcher' in case it's not self-evaluating.
(c-basic-matchers-before): Avoid a plain MATCHER as keyword, wrap it in
parentheses instead (in case MATCHER happens to be a list).
(c-font-lock-enum-tail): Remove unused var `start'.
(c-font-lock-objc-methods): Silence byte-compiler warnings.
* lisp/progmodes/cc-engine.el (c-syntactic-re-search-forward): Sink an `if'
test into an argument.
* lisp/progmodes/cc-defs.el (c-point, c-major-mode-is, c-put-char-property)
(c-get-char-property): Don't use `eval' just to unquote a constant.
(c-use-extents): Remove.  Use (featurep 'xemacs), compiled
more efficiently.
(c-put-char-property-fun): Don't call `byte-compile' by hand.
(c-clear-char-property, c-clear-char-properties): Check that `property'
is a quoted constant.
(c-emacs-features): Remove `infodock', `syntax-properties', and
`pps-extended-state' (never used), `8-bit' and `1-bit' (use (featurep
'xemacs) instead).  Use `with-temp-buffer' and let-bind vars after
changing buffer, so we don't have to setq them again afterwards.
(c-lang-const): Remove redundant symbolp assertions.
(c-find-assignment-for-mode): Use `or'.
* lisp/Makefile.in (compile-one-process): Remove cc-mode dependency.
2014-09-10 12:32:36 -04:00
Stefan Monnier
8fe73251b1 * lisp/progmodes/cc-awk.el: Remove unneeded cc-bytecomp use.
Change doc comments into docstrings.
* lisp/Makefile.in: Remove cc-awk dependency.
2014-09-09 11:08:08 -04:00
Paul Eggert
3bcff29cea Add dependencies to fix loaddefs race during parallel builds.
Without this, for example, 'make -j bootstrap' can fail and report
"Opening input file: no such file or directory,
.../lisp/calendar/diary-loaddefs.el ... recipe for target
'calendar/hol-loaddefs.el' failed", where the hol-loaddefs.el rule
got confused because diary-loaddefs.el was being built in parallel.
* Makefile.in ($(CAL_DIR)/diary-loaddefs.el):
Depend on $(CAL_DIR)/cal-loaddefs.el.
($(CAL_DIR)/hol-loaddefs.el): Depend on $(CAL_DIR)/diary-loaddefs.el.
2014-08-16 09:50:32 -07:00
Glenn Morris
0224bf74b2 Get rid of the AUTOGEN_VCS variable in lisp/Makefile
* lisp/emacs-lisp/autoload.el (autoload-ensure-writable): New variable.
(autoload-ensure-default-file): Maybe make existing output writable.

* lisp/Makefile.in (AUTOGEN_VCS): Remove.
(autoloads): Use autoload-ensure-writable rather than AUTOGEN_VCS.
2014-06-30 14:26:34 -04:00
Glenn Morris
f9bae01ee8 * update_autogen: Find loaddefs targets rather than parsing lisp/Makefile.in
* lisp/Makefile.in: Comment.
2014-06-29 17:01:51 -07:00
Glenn Morris
2c4e2e6fd3 * lisp/Makefile.in (doit): Remove force rule.
(custom-deps, finder-data, autoloads, update-subdirs)
(compile-one-process): PHONY targets do not need force rules.
2014-06-27 21:26:09 -04:00
Glenn Morris
bca0df810d lisp/Makefile tiny simplification
* lisp/Makefile.in (compile-main, compile, compile-always):
No need to explicitly pass variables to ourself in recursive calls.
2014-06-27 21:16:23 -04:00
Glenn Morris
f7c66653fe * lisp/Makefile.in (update-authors): Update for moved authors.el. 2014-06-26 17:51:25 -04:00
Glenn Morris
d3033d007b lisp/Makefile: Remove cc-*.el dependencies on non-cc files
* lisp/Makefile.in ($(lisp)/progmodes/cc-defs.elc)
($(lisp)/progmodes/cc-fonts.elc, $(lisp)/progmodes/cc-langs.elc)
($(lisp)/progmodes/cc-vars.elc): Drop hand-written deps on non-cc files.
They are not relevant to the original issue (bug#1004),
and cause unnecessary recompilation (bug#2151).
2014-06-25 19:51:10 -04:00