1. 22 May, 2015 1 commit
    • Glenn Morris's avatar
      Generate admin/charsets Makefile via configure, and make more portable. · e7bc85db
      Glenn Morris authored
      * 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 ...
      e7bc85db
  2. 17 May, 2015 1 commit
    • Glenn Morris's avatar
      * src/lisp.mk: Remove from repository and generate at build-time. · 46ea9379
      Glenn Morris authored
      * 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.
      46ea9379
  3. 12 May, 2015 1 commit
  4. 11 Apr, 2015 1 commit
  5. 07 Apr, 2015 1 commit
    • Paul Eggert's avatar
      Generate a ChangeLog file from commit logs · 23468561
      Paul Eggert authored
      * .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 f...
      23468561
  6. 01 Jan, 2015 2 commits
  7. 17 Dec, 2014 1 commit
  8. 16 Dec, 2014 1 commit
  9. 13 Dec, 2014 1 commit
    • Ted Zlatanov's avatar
      Merge from origin/emacs-24 · 28e0d0c9
      Ted Zlatanov authored
      bd6c4418 * simple.el (password-word-equivalents): Add "passcode", used for numeric secrets like PINs or RSA tokens.
      16d4c1cd A better fix for bug#19346
      82ec808f * .gitignore: Add !lib/std*.in.h, so as to not ignore the .in.h files.
      3cf7629f Git ignore lib/std*.h
      301a4014 Always define `gnutls-available-p' even if GnuTLS is not available.
      d76b9b2a Don't break example string between 2 lines (bug#19257)
      75b4857e Port commit-msg to mawk
      9ac03320 Improve commit-msg messages and autosquash
      0c2f254b Support overflow-newline-into-fringe together with word-wrap (bug#19300)
      935ee05f * net/tramp-sh.el (tramp-get-remote-path): Use a login shell in order to determine `tramp-own-remote-path'.
      c2db9393 python.el: Support interpreter paths with spaces
      d83f3299 ChangeLog fix
      0f9fbb92 Port commit-message checking to FreeBSD 9.
      3db1adac admin/MAINTAINERS: Update my interests and responsibilities.
      6382f241 * .gitignore: Ignore autosave files.
      
      Conflicts:
      	ChangeLog
      	lisp/progmodes/python.el
      	src/gnutls.c
      28e0d0c9
  10. 12 Dec, 2014 2 commits
  11. 05 Dec, 2014 2 commits
  12. 01 Dec, 2014 3 commits
  13. 28 Nov, 2014 1 commit
  14. 22 Nov, 2014 1 commit
  15. 21 Nov, 2014 2 commits
    • Paul Eggert's avatar
      Add more of the old .bzrignore to .gitignore. · d24e558f
      Paul Eggert authored
      Plus a few more .gitignore improvements.
      * .gitignore: Add copyright notice, since it's big enough.
      Put exceptions immediately after the patterns they're exceptions
      to, to make them easier to follow.
      Give four exceptions for the Makefile pattern.
      Ignore /confdefs.h, test/indent/*.new, TAGS, GPATH, GSYMS, GRTAGS,
      GTAGS, ID, *.exe, some nextstep-related files,
      jisx2131-filter, *.orig, *.rej, etc/emacs.tmpdesktop, *.in-h
      _* (except for build-aux/snippet/_Noreturn.h), /bin/, /BIN/,
      /data/, etc/icons/, lib/cxxdefs.h, lib/SYS/, /libexec/, /lock/,
      /README.W32, /share/, /site-lisp/, src/gdb.ini, /var/.
      Ignore /configure.lineno, since POSIX requires
      LINENO only with the User Portability Utilities option.
      Ignore *cust-load.el and *loaddefs.el only under lisp.
      Ignore core files of various flavors.
      Do not ignore etc/refcards/gnus-logo.pdf.
      d24e558f
    • Eli Zaretskii's avatar
      Add src/_gdbinit to .gitignore. · 30c94ebe
      Eli Zaretskii authored
       .gitignore: Add back src/_gdbinit, which is a temporary file
       created by the MS-DOS build.
      30c94ebe
  16. 20 Nov, 2014 1 commit
  17. 19 Nov, 2014 2 commits
  18. 18 Nov, 2014 2 commits
    • Ivan Andrus's avatar
      fe1b545d
    • Paul Eggert's avatar
      .gitignore cleanup. · 342bc0e0
      Paul Eggert authored
      * .gitignore: Merge contents of subsidiary files and organize the
      result so as to avoid duplication.  Remove no-longer needed entries.
      * admin/charsets/.gitignore, admin/unidata/.gitignore:
      * doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
      * leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
      * lisp/calc/.gitignore, lisp/calendar/.gitignore:
      * lisp/cedet/.gitignore, lisp/emulation/.gitignore:
      * lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
      * lisp/international/.gitignore, lisp/language/.gitignore:
      * lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
      * lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
      * lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
      * lisp/play/.gitignore, lisp/progmodes/.gitignore:
      * lisp/term/.gitignore, lisp/textmodes/.gitignore:
      * lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
      Remove; no longer needed.
      342bc0e0
  19. 17 Nov, 2014 1 commit
    • Paul Eggert's avatar
      Simplify and fix doc-related .gitignore files. · 790c6905
      Paul Eggert authored
      This fixes some unwanted 'git status' output after 'make docs'.
      * .gitignore: Add **/Makefile, **/makefile.
      Remove Makefile, makefile.
      Add doc/*/*.xxx rules for the usual kinds of documentation outputs
      and temporaries.  Add doc/misc/cc-mode.ss.
      * doc/emacs/.gitignore, doc/lispref/.gitignore, doc/misc/.gitignore:
      * lwlib/.gitignore, oldXMenu/.gitignore:
      Remove, as these .gitignore files are no longer needed.
      * doc/lispintro/.gitignore: Replace with list of exceptional PDF files.
      790c6905
  20. 15 Nov, 2014 4 commits
  21. 14 Nov, 2014 1 commit
  22. 13 Nov, 2014 3 commits
  23. 12 Oct, 2014 1 commit
  24. 22 Dec, 2013 1 commit
  25. 19 Dec, 2013 1 commit
    • Rüdiger Sonderfeld's avatar
      Update .gitignore. · 4094a772
      Rüdiger Sonderfeld authored
      It should probably be kept better in sync with .bzrignore.
      
      * .gitignore: Ignore refcard temporaries and info/*.info files.
      4094a772
  26. 12 Jun, 2013 1 commit
  27. 25 Mar, 2011 1 commit