diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2014-12-12 19:15:10 -0500 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2014-12-12 19:23:19 -0500 |
| commit | 28e0d0c95d8e17e18e94744e99ccd68c8c911703 (patch) | |
| tree | a45021bd7042b2008cf6084bd4019777b7575492 /.gitignore | |
| parent | b81a1837916a7f3f7abd953338302fa237a532f2 (diff) | |
| download | emacs-28e0d0c95d8e17e18e94744e99ccd68c8c911703.tar.gz | |
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
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 228deaaf8e5..188dd9f55d8 100644 --- a/.gitignore +++ b/.gitignore @@ -64,10 +64,8 @@ lib/getopt.h lib/inttypes.h lib/libgnu.a lib/signal.h -lib/stdalign.h -lib/stdint.h -lib/stdio.h -lib/stdlib.h +lib/std*.h +!lib/std*.in.h lib/string.h lib/sys/ lib/time.h @@ -237,6 +235,7 @@ info/dir *.rej *~ .#* +\#*\# [0-9]*.patch # Built by 'make install'. |