1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-03 22:20:52 -08:00
Commit graph

2354 commits

Author SHA1 Message Date
Lars Magne Ingebrigtsen
dce46a7484 * .gitignore: Ignore loaddefs directly under lisp, and in sub-sub-directories 2014-12-01 17:11:50 +01:00
Glenn Morris
70723e5107 ChangeLog fix. 2014-11-29 16:51:13 -08:00
Glenn Morris
aa1459ae2a Fix up merged ChangeLog entries (dates, duplication, etc) 2014-11-29 13:25:50 -08:00
Paul Eggert
0cce3623b1 Merge branch 'emacs-24'. 2014-11-28 23:07:16 -08:00
Glenn Morris
9875d23d86 * configure.ac: Simplify gnutls tests.
Ref: http://debbugs.gnu.org/19168#21
2014-11-28 19:00:15 -08:00
Stefan Monnier
91191bd4b5 * .gitignore: Add entries for emacsvers files. 2014-11-28 18:18:57 -05:00
Ted Zlatanov
ba4502fe14 Merge branch 'emacs-24'
Conflicts:
	nt/addsection.c
	nt/inc/ms-w32.h
	src/w32.c
2014-11-26 21:31:11 -05:00
Dani Moncayo
c9cb3d535b configure.ac [MINGW]: Fix the way of getting the right host platform.
* configure.ac [MINGW]: Fix the way of getting the right host
platform.
2014-11-26 20:59:07 +01:00
Glenn Morris
7dbd10d530 * configure.ac: Fix yesterday's use of uninitialised $version. 2014-11-25 08:43:52 -08:00
Oscar Fuentes
70d7aa8a28 configure.ac [mingw]: Set $canonical default value
... 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.
2014-11-25 03:29:43 +01:00
Paul Eggert
f24c8f98ec Fix white-space problems in ChangeLogs. 2014-11-24 17:16:27 -08:00
Glenn Morris
409e4c82dc * configure.ac [HAVE_W32]: Generate nt/*.rc files when HAVE_W32. 2014-11-24 09:07:45 -08:00
Glenn Morris
84e2f13cd5 Further reduce number of versioned files storing Emacs version number.
* 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.
2014-11-22 14:07:48 -08:00
Paul Eggert
d24e558f77 Add more of the old .bzrignore to .gitignore.
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.
2014-11-21 09:18:08 -08:00
Eli Zaretskii
30c94ebea1 Add src/_gdbinit to .gitignore.
.gitignore: Add back src/_gdbinit, which is a temporary file
 created by the MS-DOS build.
2014-11-21 10:56:15 +02:00
Paul Eggert
54a29f4a7c Add a.out to .gitignore.
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.
2014-11-20 12:41:10 -08:00
Dani Moncayo
f5d77aafa9 build-aux/msys-to-w32: Simplify implementation and docstring.
* build-aux/msys-to-w32: Simplify implementation and docstring;
Paths starting with '%emacs_dir%' are just considered relative.
2014-11-19 21:15:32 +01:00
Eli Zaretskii
ff953bc93b .gitignore: Resurrect Windows-specific ignorables lost in last changes. 2014-11-19 21:13:34 +02:00
Paul Eggert
f773d35aa2 * .gitignore: Add /emacs-[1-9]*/, and sort better. 2014-11-19 10:32:08 -08:00
Ivan Andrus
fe1b545d77 * .gitignore: Add some nextstep/mac ignorables. 2014-11-18 00:21:37 -07:00
Paul Eggert
342bc0e04b .gitignore cleanup.
* .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.
2014-11-17 17:58:28 -08:00
Paul Eggert
2e00757195 Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.
* .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
2014-11-16 19:43:46 -08:00
Paul Eggert
790c690572 Simplify and fix doc-related .gitignore files.
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.
2014-11-16 17:32:01 -08:00
Paul Eggert
2444ac6de8 Fix ChangeLog typos. 2014-11-15 23:23:07 -08:00
Stefan Monnier
9075fcc193 Merge from emacs-24 2014-11-16 00:22:20 -05:00
Christoph Scholtes
b6cd03a825 Ignore generated file lib/stdalign.h. 2014-11-15 14:13:59 -07:00
Andreas Schwab
a6a43d654a Don't rerun configure if lisp/version.el changes
lisp/version.el is no longer the authority for emacs-version.

* Makefile.in (config.status): Don't depend on
${srcdir}/lisp/version.el.
2014-11-14 21:47:30 +01:00
Paul Eggert
dc7a3ba28b Merge from gnulib.
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.
2014-11-14 12:25:11 -08:00
Paul Eggert
5caf6c9358 build: port to GCC 4.6.4 + glibc 2.5
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.
2014-11-14 12:25:11 -08:00
David Reitter
c28ef9a466 Compress publicsuffix file to save space
* url-domsuf.el (url-domsuf-parse-file): Read compressed
publicsuffix file if available.
* Makefile.in (install-arch-indep): Compress publicsuffix.txt file.
2014-11-14 07:22:01 -05:00
Paul Eggert
f8c4f8d6a7 Backport fix for minor Bazaar leftovers.
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.
2014-11-13 12:30:02 -08:00
Eli Zaretskii
5cf2e27cf7 .gitignore: Add more ignorables. 2014-11-13 18:06:54 +02:00
Lars Magne Ingebrigtsen
3d08bc4e30 Backport .gitignore changes from master.
.gitignore: Copy over sufficient ignorable files from the old
 .bzrignore that a simple build doesn't list lots of unregistered
 files.
2014-11-13 17:58:07 +02:00
Lars Magne Ingebrigtsen
38fa4bcbd2 Add automaticall built files to .gitignore
* .gitignore: Copy over sufficient ignorable files from the old
.bzrignore that a simple build doesn't list lots of unregistered
files.
2014-11-13 15:25:48 +01:00
Eric S. Raymond
ac03795dc4 Git transition patch
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.
2014-11-11 13:28:05 -05:00
Eric S. Raymond
7148318abc Git transition patch
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.
2014-11-11 13:28:02 -05:00
Glenn Morris
be1f31616a Further reduce the number of versioned files storing the version number
* 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.
2014-11-09 18:01:56 -08:00
Glenn Morris
4e65e7e2b9 Stop keeping etc/refcards/emacsver.tex in the repository
* 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.
2014-11-09 16:57:01 -08:00
Glenn Morris
a16d6f90ee Stop keeping doc/emacs/emacsver.texi in the repository
* 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.
2014-11-09 16:17:17 -08:00
Dani Moncayo
1e1f2237cd Makefile.in (epaths-force-w32): Simplify.
* 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).
2014-11-08 16:18:06 +01:00
Dani Moncayo
7c86a2a7d8 build-aux/msys-to-w32: simplify the initial interface.
* build-aux/msys-to-w32: simplify the initial over-engineered
interface, and the implementation.
* Makefile.in (epaths-force-w32): Update for the above.
2014-11-08 15:55:09 +01:00
Glenn Morris
b6e66a5cc7 Merge from emacs-24; up to 117669 2014-11-04 21:08:57 -08:00
Glenn Morris
fdcbfeac69 * Makefile.in (install-info, uninstall): Use --no-print-directory.
(QUIET_SUBMAKE): Remove.

Fixes: debbugs:18908
2014-11-04 21:01:47 -08:00
Glenn Morris
58064b4da2 * Makefile.in (install-info, uninstall): Restore pre-2012-12-13 solution
Do not merge to trunk.

Fixes: debbugs:18908
2014-11-04 21:01:01 -08: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
2a7753ce3e Neutralize language specific to a repository type. 2014-10-25 14:53:20 -04:00
Paul Eggert
285ac87022 * Makefile.in (ACLOCAL_INPUTS): Omit unnecessary use of 'wildcard'. 2014-10-22 23:31:48 -07:00
Paul Eggert
e5dc30bfd3 * Makefile.in (${srcdir}/info/dir): Make sure info directory exists (backport) 2014-10-23 06:52:47 +01:00
Paul Eggert
78b215ffea Fix race in 'make info/dir', and speed it up.
* Makefile.in (AWK, srcdir_doc_info_dir_inputs, info_dir_inputs):
New macros.
(clean): Remove info-dir.*.
(info_dir_deps): Depend on make-info-dir too.
Fix bug with wildcards that weren't expanded.
(${srcdir}/info/dir): Make sure info directory exists.
Don't call pwd; just redirect make-info-dir's stdout to temp file.
* build-aux/make-info-dir: Send output to stdout.
Take input file names from args.
Fix a "FIXME inefficient looping" by using awk's associative arrays.
Basically, this rewrites the script from scratch, and speeds up
'make info/dir' from 2.6s to 0.07s on my platform.
2014-10-22 20:32:21 -07:00
Stefan Monnier
bdc9a8b5ac * configure.ac: Bump version to 24.4.51 to avoid ambiguity with the old
trunk's 24.4.50.
2014-10-22 09:10:41 -04:00