Commit graph

165 commits

Author SHA1 Message Date
Paul Eggert f15c858319 Merge from origin/emacs-24
ec26c23 authors.el: Add missing ignored and renamed files
e589765 A more thorough fix for bug#19307
4e8d586 Fix last commit
d6fee01 Tramp: Don't use a tempfile for ControlPath.
27e11c0 Fix display of overlay strings with faces after ellipsis  (Bug#19307)
e9a7e10 Fix redrawing of mode lines when exposed  (Bug#19721)
50f3811 net/tramp.el (tramp-ssh-controlmaster-options): Use "%C"

Conflicts:
	lisp/ChangeLog
	src/ChangeLog
	src/xdisp.c
2015-03-03 14:29:22 -08:00
Glenn Morris 5a92f20310 * admin/authors.el (authors-aliases): Add an entry to ignore. 2015-01-07 20:58:09 -08:00
Paul Eggert 7e09ef09a4 Update copyright year to 2015
Run admin/update-copyright.
2015-01-01 14:26:41 -08:00
Glenn Morris 8f1b3e5bf1 authors.el updates
* admin/authors.el (authors-obsolete-files-regexps)
(authors-ignored-files, authors-valid-file-names)
(authors-renamed-files-alist, authors-renamed-files-regexps):
Additions.
2014-12-24 15:19:52 -08:00
Glenn Morris 49daed6051 Remove lib-src/grep-changelog
Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00145.html

* lib-src/grep-changelog: Remove file.

* lib-src/Makefile.in (INSTALLABLE_SCRIPTS): Remove.
(all, install, uninstall): Remove INSTALLABLE_SCRIPTS.

* doc/man/grep-changelog.1: Remove file.

* make-dist: No more lib-src/grep-changelog.

* INSTALL: No longer mention grep-changelog.

* admin/quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove, and all uses.

* admin/authors.el (authors-valid-file-names): Add grep-changelog.

* etc/NEWS: Mention this.
2014-12-13 18:38:21 -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
Glenn Morris 2cae8632b7 Merge from emacs-24; up to 2014-07-27T01:00:26Z!fgallina@gnu.org 2014-10-13 16:55:41 -04:00
Glenn Morris 8d035a6936 * admin/authors.el (authors-renamed-files-alist): Add package-x-test.el 2014-10-04 12:07:05 -07:00
Eli Zaretskii 4051f5379c admin/authors.el (authors): Fix last change so it works for MS-Windows as well. 2014-08-30 12:22:53 +03:00
Michael Albinus f894b23d7f * authors.el (authors): Use LOCALE argument of `string-collate-lessp'. 2014-08-29 20:10:15 +02:00
Glenn Morris 6d26235315 Merge from emacs-24; up to 2014-07-02T00:57:53Z!juri@jurta.org 2014-08-27 18:59:29 -07:00
Glenn Morris aaae978c32 authors.el updates and sorting change
* admin/authors.el (authors-ignored-files, authors-valid-file-names)
(authors-renamed-files-alist): Additions.
(authors-renamed-files-alist): Revert 2014-08-09 change.
(authors): Sort authors in utf-8 order.

Fixes: debbugs:2263
2014-08-26 13:58:06 -04:00
Reuben Thomas dcf7e861ab Remove support for DJGPP < 2.02
This also removes some specially-licensed files and lots of accompanying
explanation.
2014-08-09 17:12:33 +01:00
Glenn Morris 9ac6d28ab8 Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.org 2014-06-25 23:55:15 -07:00
Glenn Morris 515b1c5f79 Move lisp/emacs-lisp/authors.el to admin/
It is not useful for anything other than maintaining Emacs.
2014-06-25 23:24:56 -07:00
Renamed from lisp/emacs-lisp/authors.el (Browse further)