summaryrefslogtreecommitdiff
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* Fix merge glitches in 2 ChangeLog files.Eli Zaretskii2014-12-081-1/+0
|
* * CONTRIBUTE: minor improvementsStephen Leake2014-12-061-2/+9
| | | | * ChangeLog: cleanup entries for my recent commits
* Improve CONTRIBUTE and related files.Stephen Leake2014-12-061-0/+9
| | | | | | | | | | | * CONTRIBUTE: improve; add explicit web references, move some info from admin/notes/* here. * INSTALL.REPO: You can't "just run make" after a clean checkout. * admin/notes/commits: deleted; merged into ./CONTRIBUTE * admin/notes/repo: move commit, branch info into ./CONTRIBUTE
* Merge from emacs-24Stefan Monnier2014-12-051-0/+6
|\
| * * .gitignore: Avoid "**", as it requires Git 1.8.2 or later.Paul Eggert2014-12-011-0/+1
| |
| * * .gitignore: Remove redundant pattern (subsumed by _*).Paul Eggert2014-12-011-0/+4
| |
* | .gitignore: Ignore test/biditest.txt.Eli Zaretskii2014-12-051-0/+4
| |
* | * .gitignore: Ignore loaddefs directly under lisp, and in sub-sub-directoriesLars Magne Ingebrigtsen2014-12-011-0/+5
| |
* | ChangeLog fix.Glenn Morris2014-11-291-5/+4
| |
* | Fix up merged ChangeLog entries (dates, duplication, etc)Glenn Morris2014-11-291-1/+1
| |
* | Merge branch 'emacs-24'.Paul Eggert2014-11-281-1/+68
|\ \ | |/
| * Fix white-space problems in ChangeLogs.Paul Eggert2014-11-241-1/+1
| |
| * Add more of the old .bzrignore to .gitignore.Paul Eggert2014-11-211-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Add src/_gdbinit to .gitignore.Eli Zaretskii2014-11-211-0/+5
| | | | | | | | | | .gitignore: Add back src/_gdbinit, which is a temporary file created by the MS-DOS build.
| * Add a.out to .gitignore.Paul Eggert2014-11-201-0/+9
| | | | | | | | | | | | | | | | Suggested by Lee Duhem in: http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01665.html * .gitignore: Add a.out. Move *.log next to *.tmp, since it's generic. Put *.exe before non-generics.
| * .gitignore: Resurrect Windows-specific ignorables lost in last changes.Eli Zaretskii2014-11-191-0/+5
| |
| * * .gitignore: Add /emacs-[1-9]*/, and sort better.Paul Eggert2014-11-191-0/+4
| |
| * * .gitignore: Add some nextstep/mac ignorables.Ivan Andrus2014-11-181-0/+4
| |
| * .gitignore cleanup.Paul Eggert2014-11-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .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.
* | * configure.ac: Simplify gnutls tests.Glenn Morris2014-11-281-0/+4
| | | | | | | | Ref: http://debbugs.gnu.org/19168#21
* | * .gitignore: Add entries for emacsvers files.Stefan Monnier2014-11-281-0/+4
| |
* | Merge branch 'emacs-24'Ted Zlatanov2014-11-261-0/+18
|\ \ | |/ | | | | | | | | | | Conflicts: nt/addsection.c nt/inc/ms-w32.h src/w32.c
| * Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.Paul Eggert2014-11-161-0/+5
| | | | | | | | | | | | * .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1"). See Glenn Morris in: http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01187.html
| * Simplify and fix doc-related .gitignore files.Paul Eggert2014-11-161-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | configure.ac [MINGW]: Fix the way of getting the right host platform.Dani Moncayo2014-11-261-0/+5
| | | | | | | | | | * configure.ac [MINGW]: Fix the way of getting the right host platform.
* | * configure.ac: Fix yesterday's use of uninitialised $version.Glenn Morris2014-11-251-0/+4
| |
* | configure.ac [mingw]: Set $canonical default valueOscar Fuentes2014-11-251-0/+5
| | | | | | | | | | | | | | | | | | | | ... as per the compiler's target. The value provided by MSYS2 `uname' is not correct when MSYS2 runs on one architecture (x86_64) and the user is building for another (i686). * configure.ac [mingw]: Set $canonical default value as per the compiler's target.
* | * configure.ac [HAVE_W32]: Generate nt/*.rc files when HAVE_W32.Glenn Morris2014-11-241-0/+5
| |
* | Further reduce number of versioned files storing Emacs version number.Glenn Morris2014-11-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac (comma_version, comma_space_version) [mingw32]: New output variables. (nt/emacs.rc, nt/emacsclient.rc) [mingw32]: New output files. * make-dist: Update nt/ for *.rc -> *.rc.in changes. * nt/emacs.rc.in, nt/emacsclient.rc.in: Rename from nt/emacs.rc, emacsclient.rc. Let configure generate the real files, and set the version numbers. * lib-src/Makefile.in (emacsclient.res): Update deps for nt/emacsclient.rc now being in the build directory, not the source directory. * nt/Makefile.in (distclean): Delete *.rc. (emacs.res): Update deps for nt/emacsclient.rc now being in the build directory, not the source directory. * admin/admin.el (set-version): No more need to update nt/*.rc. * admin/authors.el (authors-renamed-files-alist): Add .rc.in files.
* | build-aux/msys-to-w32: Simplify implementation and docstring.Dani Moncayo2014-11-191-0/+5
| | | | | | | | | | * build-aux/msys-to-w32: Simplify implementation and docstring; Paths starting with '%emacs_dir%' are just considered relative.
* | Fix ChangeLog typos.Paul Eggert2014-11-151-1/+1
| |
* | Merge from emacs-24Stefan Monnier2014-11-161-4/+15
|\ \ | |/
| * Ignore generated file lib/stdalign.h.Christoph Scholtes2014-11-151-0/+4
| |
| * Backport fix for minor Bazaar leftovers.Paul Eggert2014-11-131-0/+5
| | | | | | | | | | | | | | Reported by Perry E. Metzger in: http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg00745.html * .dir-locals.el: Remove reference to bzr commit --fixes debbugs. * etc/CONTRIBUTE: More git transition.
| * .gitignore: Add more ignorables.Eli Zaretskii2014-11-131-0/+4
| |
| * Backport .gitignore changes from master.Lars Magne Ingebrigtsen2014-11-131-0/+6
| | | | | | | | | | | | .gitignore: Copy over sufficient ignorable files from the old .bzrignore that a simple build doesn't list lots of unregistered files.
| * Git transition patchEric S. Raymond2014-11-111-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All bzr revision IDS, and all CVS revision IDs for which a commit could be identified, were changed to time-date!committer version stamps. All .cvsignore files in the history became .gitignore files. Fixes-bug annotations from bzr were copied into the corresponding commit comments. (The first .cvsignore commit was 1999-09-30T14:07:54Z!fx@gnu.org>. The last CVS commit was <2009-12-27T08:11:12Z!cyd@stupidchicken.com>) Committer/author email addresses are generally correct for the transition day, not necessarily when the commit was originally made.
* | Don't rerun configure if lisp/version.el changesAndreas Schwab2014-11-141-0/+5
| | | | | | | | | | | | | | lisp/version.el is no longer the authority for emacs-version. * Makefile.in (config.status): Don't depend on ${srcdir}/lisp/version.el.
* | Merge from gnulib.Paul Eggert2014-11-141-0/+7
| | | | | | | | | | | | | | | | 2014-11-14 extern-inline: update commentary about GCC bugs 2014-11-06 unistd: port to iOS 2014-11-04 update from texinfo * doc/misc/texinfo.tex, lib/unistd.in.h, m4/extern-inline.m4: Update from gnulib.
* | build: port to GCC 4.6.4 + glibc 2.5Paul Eggert2014-11-141-0/+11
| | | | | | | | | | | | | | | | | | | | On platforms this old, building with _FORTIFY_SOURCE equal to 2 results in duplicate definitions of standard library functions. Problem reported by Nelson H. F. Beebe. * configure.ac (_FORTIFY_SOURCE): Sort after GNULIB_PORTCHECK. By default, do not enable this unless GNULIB_PORTCHECK is defined. This better matches the original intent, which as I recall was to enable these extra checks only with --enable-gcc-warnings.
* | Compress publicsuffix file to save spaceDavid Reitter2014-11-141-0/+4
| | | | | | | | | | | | * url-domsuf.el (url-domsuf-parse-file): Read compressed publicsuffix file if available. * Makefile.in (install-arch-indep): Compress publicsuffix.txt file.
* | Add automaticall built files to .gitignoreLars Magne Ingebrigtsen2014-11-131-0/+6
| | | | | | | | | | | | * .gitignore: Copy over sufficient ignorable files from the old .bzrignore that a simple build doesn't list lots of unregistered files.
* | Git transition patchEric S. Raymond2014-11-111-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All bzr revision IDS, and all CVS revision IDs for which a commit could be identified, were changed to time-date!committer version stamps. All .cvsignore files in the history became .gitignore files. Fixes-bug annotations from bzr were copied into the corresponding commit comments. (The first .cvsignore commit was 1999-09-30T14:07:54Z!fx@gnu.org>. The last CVS commit was <2009-12-27T08:11:12Z!cyd@stupidchicken.com>) Committer/author email addresses are generally correct for the transition day, not necessarily when the commit was originally made.
* | Further reduce the number of versioned files storing the version numberGlenn Morris2014-11-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac (doc/man/emacs.1): Generate it. * Makefile.in (top_bootclean): Remove doc/man/emacs.1. * make-dist: Do not distribute doc/man/emacs.1. * admin/admin.el (set-version): No need to update doc/man/emacs.1. * doc/man/emacs.1.in: Rename from emacs.1. * .bzrignore: Add doc/man/emacs.1.
* | Stop keeping etc/refcards/emacsver.tex in the repositoryGlenn Morris2014-11-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac (etc/refcards/emacsver.tex): Generate it. * Makefile.in (etc-emacsver): New PHONY rule. (bootstrap-clean): Delete etc/refcards/emacsver.tex. * admin/admin.el (set-version): No need to update etc/refcards/emacsver.tex. (set-copyright): Update etc/refcards/emacsver.tex.in. * etc/refcards/emacsver.tex.in: Rename from emacsver.tex. * .bzrignore: Add etc/refcards/emacsver.tex.
* | Stop keeping doc/emacs/emacsver.texi in the repositoryGlenn Morris2014-11-091-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac (doc/emacs/emacsver.texi): Generate it. * make-dist (doc/emacs/emacsver.texi) [update]: No longer check it. * doc/emacs/Makefile.in (top_srcdir, version): New, set by configure. (doc-emacsver): New rule. (bootstrap-clean, maintainer-clean): Delete emacsver.texi. (emacsver.texi.in): Rename from emacsver.texi. * admin/admin.el (set-version): No need to update doc/emacs/emacsver.texi. (make-manuals-dist-output-variables): Add top_srcdir. (make-manuals-dist--1): Handle @version@ specially. * .bzrignore: Add doc/emacs/emacsver.texi.
* | Makefile.in (epaths-force-w32): Simplify.Dani Moncayo2014-11-081-1/+5
| | | | | | | | | | | | * Makefile.in (epaths-force-w32): Simplify, assuming that the shell is bash (as is the case in MSYS). (msys_w32prefix_subst, msys_sed_sh_escape): Remove (no longer used).
* | build-aux/msys-to-w32: simplify the initial interface.Dani Moncayo2014-11-081-0/+6
| | | | | | | | | | | | * build-aux/msys-to-w32: simplify the initial over-engineered interface, and the implementation. * Makefile.in (epaths-force-w32): Update for the above.
* | Merge from emacs-24; up to 117669Glenn Morris2014-11-041-1/+1
|\ \ | |/
| * * Makefile.in (install-info, uninstall): Restore pre-2012-12-13 solutionGlenn Morris2014-11-041-1/+6
| | | | | | | | | | | | Do not merge to trunk. Fixes: debbugs:18908