1. 19 May, 2015 1 commit
  2. 17 May, 2015 1 commit
  3. 10 May, 2015 2 commits
  4. 09 May, 2015 5 commits
  5. 08 May, 2015 1 commit
  6. 07 May, 2015 2 commits
  7. 24 Apr, 2015 2 commits
  8. 21 Apr, 2015 1 commit
  9. 14 Apr, 2015 1 commit
    • Eli Zaretskii's avatar
      Improve the commit-msg Git hook for unibyte environments · 95cee7f6
      Eli Zaretskii authored
      * build-aux/git-hooks/commit-msg: Set LC_ALL=C, before running Awk
      in unibyte environments.  (Suggested by Paul Eggert
      <eggert@cs.ucla.edu>.)  Use a more accurate approximation to
      [:print:], based on UTF-8 sequences of the unprintable characters.
      95cee7f6
  10. 11 Apr, 2015 5 commits
  11. 09 Apr, 2015 2 commits
  12. 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 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
      23468561
  13. 29 Mar, 2015 2 commits
  14. 28 Jan, 2015 1 commit
    • Paul Eggert's avatar
      Merge from gnulib and try to repair bad merge · 39c2fa3f
      Paul Eggert authored
      This attempts to repair problems introduced by the bad merge
      5491fd10.  The easiest way for me
      to fix the badly-merged gnulib files was to run
      'admin/merge-gnulib', so I did that, which also imported the
      following changes:
      * build-aux/update-copyright, m4/gnulib.m4:
      Update from gnulib, incorporating:
      2015-01-15 time: port to MinGW32 3.21
      2015-01-15 update-copyright: apply to self
      2015-01-11 update-copyright: recognize groff's \(co marker
      39c2fa3f
  15. 01 Jan, 2015 3 commits
  16. 28 Dec, 2014 1 commit
  17. 15 Dec, 2014 1 commit
  18. 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
  19. 11 Dec, 2014 2 commits
  20. 08 Dec, 2014 1 commit
  21. 23 Nov, 2014 1 commit
  22. 19 Nov, 2014 1 commit
  23. 08 Nov, 2014 2 commits