summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2019Paul Eggert2019-01-011-1/+1
| | | | Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
| | | | Run admin/update-copyright.
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-1/+1
| | | | | | | | | | | | | Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
* Update .gitignore for Valgrind and no AutomakePaul Eggert2017-07-231-1/+1
| | | | | * .gitignore: Remove .deps/ since we no longer use Automake. Add vgcore.*[0-9], for debugging Emacs with Valgrind+GDB.
* emacs-module.h: Create emacs_env_26Philipp Stephani2017-06-171-0/+1
| | | | | | | | | | | | This was part of the original design of the module API (https://lists.gnu.org/archive/html/emacs-devel/2015-02/msg00960.html), but I didn't take it into account when adding the should_quit function. Instead of duplicating the environment fields or using the C preprocessor, use configure to build emacs-module.h. * configure.ac: Expand emacs-module.h template.
* Use Autoconf to generate the test module MakefilePhilipp Stephani2017-06-121-1/+0
| | | | | | | | | | | | | This makes it easier to pass compilation flags around. * configure.ac: Also build test module Makefile. * test/data/emacs-module/Makefile.in: New makefile template. * test/Makefile.in ($(test_module)): No longer necessary to pass @MODULES_SUFFIX@ around. * .gitignore: Test module Makefile can now be ignored.
* Minor .gitignore fixesPaul Eggert2017-05-191-4/+4
| | | | | | | | * .gitignore: modules/mod-test/Makefile was renamed to test/data/emacs-module/Makefile. Omit [0-9]*.core, subsumed by *.core. test/indent/*.new was renamed to test/manual/indent/*.new. Add *.swp, for Vim.
* Merge from gnulib (Bug#26398)Paul Eggert2017-04-091-0/+1
| | | | | | | | | | | | | | | This incorporates: 2017-04-08 getopt: prefer - to _ in new file names 2017-04-08 getopt: port recent getopt changes to macOS * .gitignore: Add lib/getopt-cdefs.h. * lib/getopt-cdefs.in.h: Rename from lib/getopt_cdefs.in.h. * lib/getopt-core.h: Rename from lib/getopt_core.h. * lib/getopt-ext.h: Rename from lib/getopt_ext.h. * lib/getopt-pfx-core.h: Rename from lib/getopt_pfx_core.h. * lib/getopt-pfx-ext.h: Rename from lib/getopt_pfx_ext.h. * lib/getopt.in.h, lib/unistd.in.h, m4/getopt.m4: Copy from Gnulib. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* Simplify test dependency generationPaul Eggert2017-04-011-1/+0
| | | | | | | | | | | | | | Generate default dependencies by using GNU extensions to ‘make’ rather than via a hacky auxiliary program and script. * .gitignore: Remove test/make-test-deps.mk. * test/Makefile.in (ELFILES, LOGFILES, TESTS): Use :=, not =, to avoid multiple redundant invocations of ‘find’. (test_template): Infer dependency directly instead of via make-test-deps.mk. (check-doit): Prepend ‘@’ to avoid excessively long ‘make’ output. (clean): No need to clean make-test-deps.mk. (make-test-deps.mk): Remove rule. * test/make-test-deps.emacs-lisp: Remove.
* Fixups for GNU Make switchoverPaul Eggert2017-03-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes some minor problems introduced in the recent switch to GNU Make, discovered by further testing. Without some of these changes 'make -j' would sometimes have race conditions caused by missing dependencies. (Bug#26100) * .gitignore: Remove src/stamp-h.in, src/stamp-h1. * Makefile.in ($(MAKEFILE_NAME)): Depend on configure, not src/config.in, since the former's timestamp now represents the latter's. ($(srcdir)/configure): Use plain ./autogen.sh, for consistency with other autogen.sh invocations. ($(srcdir)/src/stamp-h.in): Remove rule, as this file is no longer created. * Makefile.in (top_distclean): * src/Makefile.in (bootstrap-clean): No need to remove stamp-h1, as that was an Automake byproduct and Automake is no longer in use. * lib/Makefile.in, src/Makefile.in: (AUTOCONF_INPUTS, $(top_srcdir)/configure): Remove. (../config.status, Makefile): Simplify by limiting dependencies to files we care about and files in the repository, and by using just one file to represent the timestamps on multiple targets updated by the same rule. * autogen.sh: Do not create or use src/stamp-h.in. Instead, have 'find' test the two output files directly.
* Switch from Automake to GNU MakePaul Eggert2017-03-171-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emacs assumes GNU Make, and GNU Make has much of the functionality of Automake built-in. The Emacs build process uses Automake primarily because Emacs uses some Gnulib code and Gnulib formerly required Automake. Now that Gnulib no longer requires Automake, Emacs can stop using Automake and this should simplify Emacs maintenance in the future (Bug#26100). Although this patch may look long, most of it is generated automatically: the changes to build-aux/config.guess, build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are all done by admin/merge-gnulib. * .gitignore: Remove build-aux/ar-lib, build-aux/compile, build-aux/config.guess, build-aux/config.sub, build-aux/depcomp, build-aux/install-sh, build-aux/missing, and lib/Makefile.in, as they are no longer built by autogen.sh. Add lib/gnulib.mk, as it is now built by 'configure'. Remove nt/gnulib.mk, as it is no longer built by 'make'. * INSTALL.REPO, README, admin/make-tarball.txt: Remove mention of Automake. * Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib) (AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS) ($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS) ($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh): Remove. ($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in. ($(srcdir)/configure, $(srcdir)/src/stamp-h.in) ($(srcdir)/src/config.in): Use autogen.sh instead of doing it by hand. * admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)): New vars, to simplify processing of avoided modules. (GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES. Add --gnu-make, and change makefile name to gnulib.mk.in. Copy config.guess, config.sub, and install-sh too, since Automake no longer does that for us. * admin/notes/copyright: * admin/update_autogen (genfiles): Update list of files. Remove hack for nt/gnulib.mk, a file that is no longer needed. * autogen.sh (progs): Remove Automake. (automake_min): Remove. Build aclocal.m4 so that autoreconf need not use aclocal. * build-aux/config.guess, build-aux/config.sub: * build-aux/install-sh: New files, copied from Gnulib. These are now updated by admin/merge-gnulib instead by autogen.sh. * configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL): Remove. (AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call. (AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O. (BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed. (--disable-silent-rules): New option, since Automake no longer does this for us. (AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother with AM_SUBST_NOTMAKE. (AC_PROG_INSTALL): Add call. (MAKEINFO): Do not bother with the 'missing' program. (MAKEINFO, SYSTEM_TYPE): AC_SUBST. (AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk. (SUBDIR_MAKEFILES): Remove duplication. * lib/Makefile.am: Remove, replacing with: * lib/Makefile.in: New file, with the old Makefile.am contents and with the following changes: (AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST) (MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES) (AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD) (EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS): Remove. (VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR) (AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE) (libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean) (mostlyclean, distclean, bootstrap-clean, maintainer-clean): New macros and rules, since Automake no longer does them. Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt, instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT. Include dependency files if AUTO_DEPEND. (ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS): New macros. (bootstrap-clean): Depend on distclean, not maintainer-clean, and remove gnulib.mk. (AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile): New macros and rules, copied from ../Makefile.in. ($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES. (.c.o, e-%.o): New generic rules. * lib/gnulib.mk: Remove. * lib/gnulib.mk.in: New file, which is built by autogen.sh and contains much of what used to be in lib/gnulib.mk. * m4/gnulib-common.m4: Copy from gnulib. * make-dist: Do not distribute build-aux/compile, build-aux/depcomp, build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk, nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in, lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead. * nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0) (am__v_GEN_1, ${srcdir}/gnulib.mk): Remove. * nt/gnulib-cfg.mk: New file, which supersedes ... * nt/gnulib-modules-to-delete.cfg: ... this file, which is removed. * src/Makefile.in (ACLOCAL_INPUTS): Remove. (AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it. ($(top_srcdir)/configure, ../config.status, config.in Makefile): Defer to parent Makefile.
* Merge from gnulibPaul Eggert2017-03-141-4/+1
| | | | | | | | | | | | | | | | | | | | This incorporates: 2017-03-14 snippets: move unadjusted snippet sources to lib 2017-03-14 gnulib-tool: fix typo in comment output 2017-03-14 snippets: work around GNU Make 3.82 VPATH 2017-03-13 gnulib-tool: minor --gnu-make fixups 2017-03-12 gnulib-tool: new option --gnu-make * .gitignore: Remove lib/arg-nonnull.h, lib/c++defs.h, lib/warn-on-use.h. Change exception from build-aux/snippet/_Noreturn.h to lib/_Noreturn.h. * admin/authors.el (authors-renamed-files-regexps): * admin/notes/copyright, make-dist: The snippet files moved from build-aux/snippet to lib. * lib/_Noreturn.h: Rename from build-aux/snippet/_Noreturn.h. * lib/arg-nonnull.h: Rename from build-aux/snippet/arg-nonnull.h. * lib/c++defs.h: Rename from build-aux/snippet/c++defs.h. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/warn-on-use.h: Rename from build-aux/snippet/warn-on-use.h.
* Generate nt/gnulib.mk from lib/gnulib.mkEli Zaretskii2017-01-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This was proposed by Paul Eggert <eggert@cs.ucla.edu>, with the purpose of avoiding manual maintenance of nt/gnulib.mk. * nt/gnulib-modules-to-delete.cfg: New file. * nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0) (am__v_GEN_1): New variables. (${srcdir}/gnulib.mk): Rules to generate gnulib.mk from lib/gnulib.mk and list of modules in gnulib-modules-to-delete.cfg. * make-dist (nt): Add gnulib-modules-to-delete.cfg to the list of files to link. * configure.ac (GNULIB_MK): Compute the value according to $opsys. * autogen.sh: Create nt/gnulib.mk if it doesn't exist, before running autoreconf. * Makefile.in (gnulib_mk): New variable. ($(srcdir)/nt/gnulib.mk): Rule to produce it. (AUTOMAKE_INPUTS): Use $(gnulib_mk) instead of a literal file name. * .gitignore: Add nt/gnulib.mk. * src/w32.c (acl_errno_valid): Implement it here, as we no longer build the acl-permissions module from Gnulib.
* Merge from origin/emacs-25Paul Eggert2017-01-011-1/+1
|\ | | | | | | | | 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
| * Update copyright year to 2017Paul Eggert2016-12-311-1/+1
| | | | | | | | Run admin/update-copyright.
| * Update copyright year to 2016Paul Eggert2016-01-011-1/+1
| | | | | | | | Run admin/update-copyright.
* | Merge from gnulibPaul Eggert2016-12-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This incorporates: 2016-12-14 xalloc-oversized: check for PTRDIFF_MAX too 2016-12-12 fpending: port to native Windows with MSVC * .gitignore: Do not ignore lib/stdio-impl.h. * lib/fpending.c, lib/xalloc-oversized.h, m4/fpending.m4: Copy from gnulib. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/stdio-impl.h: New file, copied from gnulib. * nt/gnulib.mk (EXTRA_DIST): Add stdio-impl.h.
* | Update from gnulibPaul Eggert2016-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This incorporates: 2016-09-15 stdint: support new _WIDTH macros 2016-09-15 limits-h: new module 2016-09-15 sys_types: avoid glibc 2.25 warnings about major() 2016-09-15 extensions: port to more ISO C TSes 2016-09-13 intprops: new macro TYPE_WIDTH 2016-09-13 extensions: port to recent ISO C TRs * .gitignore: Add lib/limits.h. * doc/misc/texinfo.tex, lib/ftoastr.h, lib/intprops.h: * lib/stdint.in.h, m4/extensions.m4, m4/stdint.m4, m4/stdio_h.m4: * m4/sys_types_h.m4: Copy from gnulib. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/limits.in.h, m4/limits-h.m4: New files, copie from gnulib. * nt/gnulib.mk: Merge changes from lib/gnulib.mk.
* | Tweak .gitignorePaul Eggert2016-05-011-5/+3
| | | | | | | | | | | | * .gitignore: Remove leim/changed.misc, leim/changed.tit, as these files are no longer created. Add gmon.out, for -pg profiling. Sort.
* | Fix fallout from merging emacs-25 branch in test/Eli Zaretskii2016-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | * .gitignore: Update for the new place of biditest.txt. * test/automated/: Directory removed. All files moved to their proper places. * test/etags/: Directory removed. All files moved to their proper places. * test/automated/url-parse-tests.el: File removed; it was an exact copy of the same file in test/lisp/url/. * test/automated/url-expand-tests.el: Moved to test/lisp/url/.
* | ; * .gitignore: Add lisp/mh-e/mh-autoloads.el.Bill Wohler2016-01-031-1/+2
| |
* | Merge emacs-25 into master (using imerge)John Wiegley2015-12-291-0/+4
|\ \ | |/
| * * .gitignore: Add "*.dll".Eli Zaretskii2015-11-191-0/+1
| |
| * Migrate modules/.gitignore into .gitignorePaul Eggert2015-11-191-0/+3
| | | | | | | | | | * .gitignore: Add former contents of modules/.gitignore. * modules/.gitignore: Remove.
* | Tests now depend on source filesPhillip Lord2015-11-301-0/+2
| | | | | | | | | | | | * test/Makefile.in: Include dependences from tests to source files. * test/make-test-deps.emacs-lisp: New file * .gitignore: Ignore generated make include file
* | * .gitignore: Adjust to changes in 'test' directory structure.Eli Zaretskii2015-11-281-4/+4
| |
* | Restore delete Makefiles and fix .gitignore.Phillip Lord2015-11-241-4/+4
|/ | | | | | | | * .gitignore: Update Makefiles to changed locations * test/lisp/progmodes/flymake-resources/Makefile, test/manual/etags/Makefile, test/manual/etags/make-src/Makefile, test/manual/indent/Makefile: Restored and moved to new location.
* * lisp/files.el (dir-locals-file): Allow wildcardsArtur Malabarba2015-11-101-0/+1
| | | | | | | | | | | | (dir-locals-find-file, dir-locals-collect-variables) (dir-locals-read-from-file): Update accordingly. (hack-dir-local-variables): Rename a local variable. * lisp/files-x.el (modify-dir-local-variable): Update accordingly * lisp/help-fns.el (describe-variable): Update accordingly * .gitignore: Add .dir-locals?.el
* * .gitignore: Add build-aux/ar-lib.Juanma Barranquero2015-10-141-0/+1
|
* Generate char-script-table from Unicode source. (Bug#20789)Glenn Morris2015-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | * admin/unidata/Makefile.in (AWK): New, set by configure. (all): Add charscript.el. (blocks): New variable. (charscript.el, ${unidir}/charscript.el): New targets. (extraclean): Also remove generated charscript.el. * admin/unidata/blocks.awk: New script. * admin/unidata/Blocks.txt: New data file, from unicode.org. * lisp/international/characters.el: Load charscript. * src/Makefile.in (charscript): New variable. (${charscript}): New target. (${lispintdir}/characters.elc): Depend on charscript.elc. (temacs$(EXEEXT)): Depend on charscript. ; * admin/unidata/README: Mention Blocks.txt. ; * .gitignore: Add lisp/international/charscript.el.
* * .gitignore: Also ignore doc/*/*/*.html and .ps.Paul Eggert2015-06-021-0/+2
|
* * .gitignore: Remove !test/etags/html-src/*.html.Paul Eggert2015-06-021-3/+2
| | | | It's no longer needed, since *.html was removed. Sort.
* Minor tweaks for .gitignoreEli Zaretskii2015-06-021-3/+3
| | | | | | * .gitignore: Don't ignore versioned *.html and *.ps files. Don't ignore admin/notes/tags that might be ignored as TAGS on case-insensitive filesystems. (Bug#20710)
* .gitignore tweaksPaul Eggert2015-05-241-4/+5
| | | | | | * .gitignore: Ignore all *.stamp files. Sort. Ignore [0-9]*.txt (commonly used name for git patches) and /vc-dwim-log-* (vc-dwim temporary).
* Remove charset map files from repository, generate in first bootstrapGlenn Morris2015-05-231-2/+5
| | | | | | | | | | | | | | | * admin/charsets/Makefile.in (${srcdir}/charsets.stamp): New. (all): Create the stamp file. (extraclean): Delete the stamp file. * src/Makefile.in (lispintdir, charsets): New variables. (${lispintdir}/cp51932.el, ${lispintdir}/eucjp-ms.el, ${charsets}): New rules. (emacs$(EXEEXT), temacs$(EXEEXT)): Depend on $charsets. * lisp/international/cp51932.el, lisp/international/eucjp-ms.el: * etc/charsets/*.map: Remove from repository. ; * admin/charsets/mapconv: Fix typo in output comment. ; * etc/charsets/README: Small update. ; * .gitignore: Update for charset changes.
* Generate admin/charsets Makefile via configure, and make more portable.Glenn Morris2015-05-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac (SUBDIR_MAKEFILES): Add admin/charsets/Makefile. (admin/charsets/Makefile): Generate it. * admin/charsets/Makefile.in: Rename from Makefile. (AWK, srcdir, top_srcdir, AM_DEFAULT_VERBOSITY): New variables, set by configure. (charsetdir, lispintdir, mapfiledir, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0) (am__v_at_1, LOCAL, mapconv, run_mapconv, big5, compact, cp51932) (cp932, eucjp_ms, gb180302, gb180304, kuten): New variables. (TRANS_TABLE, CHARSETS): Add directory prefix to value. (all): Declare PHONY. (local): New PHONY target. (map_template): New template. Use to define short PHONY aliases. (*.map): Add directory prefixes to targets and prerequisites. Respect make verbosity. (JISC6226.map): Replace non-portable sed append without newline. (install): Remove rule. (clean): Only delete temporary sedscript. (bootstrap-clean, distclean, maintainer-clean, extraclean) (totalclean): New PHONY rules. * admin/charsets/mapconv (BASE): Replace basename with expr. (FILE): Add "mapfiles" subdirectory. (AWK): New variable. Use throughout in place of "awk". (main): Use "gunzip -c" in place of "zcat". Don't leave whitespace before "p", for older sed. * admin/charsets/mapfiles/PTCP154: Add final newline, to make older sed versions happy. ; * .gitignore: Ignore admin/charsets/Makefile.
* * src/lisp.mk: Remove from repository and generate at build-time.Glenn Morris2015-05-161-0/+1
| | | | | | | | | | * src/Makefile.in (lisp.mk): New rule to generate from loadup.el. (shortlisp_filter): New variable. (emacs$(EXEEXT), $(etc)/DOC): Depend on lisp.mk. (distclean): Remove lisp.mk. * Makefile.in ($(MAKEFILE_NAME)): No longer depend on src/lisp.mk. * lisp/loadup.el: Tweak layout to make it easier to parse. * make-dist: Do not distribute src/lisp.mk.
* Add a test suite for etagsEli Zaretskii2015-05-121-1/+9
| | | | | | * test/etags/: New test suite, adapted from http://fly.isti.cnr.it/pub/software/unix/etags-regression-test.tar.bz2, whose original author is Francesco Potortì <pot@gnu.org>.
* * .gitignore: Ignore doc temps and outputs.Paul Eggert2015-04-111-1/+3
|
* Generate a ChangeLog file from commit logsPaul Eggert2015-04-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .gitignore: Add 'ChangeLog'. * build-aux/gitlog-to-changelog: New file, from Gnulib. * build-aux/gitlog-to-emacslog: New file. * CONTRIBUTE: Document the revised workflow. * Makefile.in (clean): Remove *.tmp and etc/*.tmp* instead of just special cases. (CHANGELOG_HISTORY_INDEX_MAX, CHANGELOG_N, gen_origin): New vars. (ChangeLog, unchanged-history-files, change-history) (change-history-commit): New rules. * admin/admin.el (make-manuals-dist--1): Don't worry about doc/ChangeLog. * admin/authors.el: Add a FIXME. * admin/make-tarball.txt: * lisp/calendar/icalendar.el: * lisp/gnus/deuglify.el: * lisp/obsolete/gulp.el: * lwlib/README: Adjust to renamed ChangeLog history files. * admin/merge-gnulib (GNULIB_MODULES): Add gitlog-to-changelog. * admin/notes/repo: Call it 'master' a la Git, not 'trunk' a la Bzr. Remove obsolete discussion of merging ChangeLog files. New section "Maintaining ChangeLog history". * build-aux/git-hooks/pre-commit: Reject attempts to commit files named 'ChangeLog'. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * make-dist: Make and distribute top-level ChangeLog if there's a .git directory. Distribute the new ChangeLog history files instead of scattered ChangeLog files. Distribute the new files gitlog-to-changelog and gitlog-to-emacslog. Fixes: bug#19113
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
| | | | Run admin/update-copyright.
* Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-271-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2616307 * net/tramp-sh.el (tramp-send-command-and-read): New optional arg MARKER. (tramp-get-remote-path): Use it. c773edc * net/tramp-gw.el (tramp-gw-open-connection): Suppress traces in wrong debug buffer. (tramp-gw-open-connection): Set process coding system 'binary. (tramp-gw-open-network-stream): Handle HTTP error 403. 8032fc1 * .gitignore: Ignore /conftest*. fb420e7 * lisp/subr.el (sit-for): Tweak docstring. 061db13 Fix vc-git-dir-status-files WRT up-to-date vs edited bb57c94 Consider electric-pair-mode in tex-mode. 7b94572 * test/automated/flymake/warnpred/test.pl: Tweak earlier change. 59c218f ChangeLog fix db2a768 * test/automated/flymake/warnpred/test.pl: Tweak format d9005dd src/gnutls.c (gnutls_init): Fix deprecation warning from GCC. Conflicts: ChangeLog lisp/ChangeLog src/ChangeLog test/ChangeLog
| * * .gitignore: Ignore /conftest*.Paul Eggert2014-12-161-0/+1
| |
| * * .gitignore: Add !lib/std*.in.h, so as to not ignore the .in.h files.Paul Eggert2014-12-111-0/+1
| |
| * Git ignore lib/std*.hPaul Eggert2014-12-111-4/+1
| | | | | | | | | | * .gitignore: Add lib/std*.h, to ignore stdarg.h, stdbool.h, and stddef.h. Remove subsumed entries.
| * * .gitignore: Ignore autosave files.Stefan Monnier2014-12-051-0/+1
| |
* | Move flymake test data to more standard locationGlenn Morris2014-12-151-1/+1
| | | | | | | | | | | | | | * test/automated/flymake-tests.el (flymake-tests-data-directory): Change from flymake/warnpred to more standard data/flymake. * .gitignore: Update for relocated flymake test data.
* | Merge from origin/emacs-24Ted Zlatanov2014-12-121-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd6c441 * simple.el (password-word-equivalents): Add "passcode", used for numeric secrets like PINs or RSA tokens. 16d4c1c A better fix for bug#19346 82ec808 * .gitignore: Add !lib/std*.in.h, so as to not ignore the .in.h files. 3cf7629 Git ignore lib/std*.h 301a401 Always define `gnutls-available-p' even if GnuTLS is not available. d76b9b2 Don't break example string between 2 lines (bug#19257) 75b4857 Port commit-msg to mawk 9ac0332 Improve commit-msg messages and autosquash 0c2f254 Support overflow-newline-into-fringe together with word-wrap (bug#19300) 935ee05 * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in order to determine `tramp-own-remote-path'. c2db939 python.el: Support interpreter paths with spaces d83f329 ChangeLog fix 0f9fbb9 Port commit-message checking to FreeBSD 9. 3db1ada admin/MAINTAINERS: Update my interests and responsibilities. 6382f24 * .gitignore: Ignore autosave files. Conflicts: ChangeLog lisp/progmodes/python.el src/gnutls.c
* | Merge from emacs-24Stefan Monnier2014-12-051-5/+7
|\ \ | |/
| * * .gitignore: Avoid "**", as it requires Git 1.8.2 or later.Paul Eggert2014-12-011-2/+7
| |
View Lorry Controller Status