mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00
Code Issues Releases Activity
120,578 Commits 225 Branches 189 Tags 518 MiB
31ecbf8d51
Commit Graph

60 Commits

Author SHA1 Message Date
Paul Eggert
7e09ef09a4 Update copyright year to 2015 
Run admin/update-copyright.
 2015-01-01 14:26:41 -08:00
Fabián Ezequiel Gallina
3a12f2ed99 Merge from origin/emacs-24 
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
 2014-12-27 13:15:55 -03:00
Paul Eggert
8032fc16db * .gitignore: Ignore /conftest*. 2014-12-16 18:43:27 -08:00
Glenn Morris
e2aec9bee3 Move flymake test data to more standard location 
* 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.
 2014-12-15 20:41:03 -05:00
Ted Zlatanov
28e0d0c95d Merge from origin/emacs-24 
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
 2014-12-12 19:23:19 -05:00
Paul Eggert
82ec808f0a * .gitignore: Add !lib/std*.in.h, so as to not ignore the .in.h files. 2014-12-11 18:25:00 -08:00
Paul Eggert
3cf7629f98 Git ignore lib/std*.h 
* .gitignore: Add lib/std*.h, to ignore stdarg.h, stdbool.h, and
stddef.h.  Remove subsumed entries.
 2014-12-11 18:12:13 -08:00
Stefan Monnier
6382f2411e * .gitignore: Ignore autosave files. 2014-12-05 15:31:28 -05:00
Stefan Monnier
4fda400e58 Merge from emacs-24 2014-12-05 15:30:09 -05:00
Eli Zaretskii
933107f290 .gitignore: Ignore test/biditest.txt. 2014-12-05 13:19:14 +02:00
Paul Eggert
11b65bc080 * .gitignore: Avoid "**", as it requires Git 1.8.2 or later. 2014-12-01 09:16:56 -08:00
Paul Eggert
d83f0618d4 * .gitignore: Remove redundant pattern (subsumed by _*). 2014-12-01 09:16:56 -08:00
Lars Magne Ingebrigtsen
dce46a7484 * .gitignore: Ignore loaddefs directly under lisp, and in sub-sub-directories 2014-12-01 17:11:50 +01:00
Paul Eggert
0cce3623b1 Merge branch 'emacs-24'. 2014-11-28 23:07:16 -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
Glenn Morris
116be2828b * .gitignore: Add emacs.rc and emacsclient.rc in nt/. 2014-11-22 15:02:57 -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
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
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
Stefan Monnier
9075fcc193 Merge from emacs-24 2014-11-16 00:22:20 -05:00
Andreas Schwab
4f4cf9c855 Don't ignore .gitattributes 
Local attributes belong to .git/info/attributes.
 2014-11-16 00:51:01 +01:00
Christoph Scholtes
b6cd03a825 Ignore generated file lib/stdalign.h. 2014-11-15 14:13:59 -07:00
Teemu Likonen
d5a1d3607b .gitignore: Add lib-src/blessmail 2014-11-15 09:10:59 +02:00
Stefan Monnier
4cd0f2dc6f * .gitignore: Add a few more missing entries. 2014-11-15 00:44:14 -05:00
Lars Magne Ingebrigtsen
6a079d59b7 Ignore all built versions of Emacs (and .gitattributes) 2014-11-14 14:57:16 +01: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
Eli Zaretskii
41d384fa99 Ignore test/biditest.txt. 2014-10-12 21:19:41 +03:00
Andreas Schwab
647d367f3b Ignore info/dir 2013-12-22 12:33:28 +01:00
Rüdiger Sonderfeld
4094a7725a Update .gitignore. 
It should probably be kept better in sync with .bzrignore.

* .gitignore: Ignore refcard temporaries and info/*.info files.
 2013-12-19 19:00:05 +01:00
Andreas Schwab
e831ed3d05 Add TAGS and leim/ja-dic to .gitignore 2013-06-12 12:31:24 +02:00
Andreas Schwab
f9e771e246 .gitignore: Add compile, config.guess, config.sub, depcomp, 
install-sh, missing.
 2011-03-25 15:06:41 +01:00
Andreas Schwab
90346de2b2 .gitignore: Add aclocal.m4, configure, lib/Makefile.in, src/config.in. 2011-03-22 10:37:37 +01:00
Juanma Barranquero
2294431987 * .bzrignore, .gitignore: Ignore README.W32 on the root directory. 2010-07-24 15:43:48 +02:00
Andreas Schwab
63494d1b9d Ignore all backup files. 2009-08-28 09:50:05 +00:00
Juanma Barranquero
9b2c84d645 Add .gitignore rules for in-place builds. 2009-03-03 15:47:54 +00:00
Miles Bader
6c3f620a86 Add .gitignore 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1565
 2009-03-03 10:25:32 +00:00
Eli Zaretskii
1ab1b30c20 Ignore _dir-locals.el and _dir-loc.el, for the sake of MS-DOS filesystems. 2008-12-26 15:05:11 +00:00
Glenn Morris
5e4b2828d9 Revert re-ordering and removal of .DS_Store that occurred in unicode merge. 2008-06-25 07:46:42 +00:00
Andreas Schwab
2e81bdd76c Remove configure. 2008-04-05 10:01:41 +00:00
Juanma Barranquero
b65d710f07 Add data and site-lisp. 2007-06-12 08:25:00 +00:00
Miles Bader
a0451a715e Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 523-544)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 168-171)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-150
 2006-12-07 04:14:14 +00:00
Juanma Barranquero
9a69ec4b63 Add `lock'. 2005-08-02 22:59:02 +00:00