1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-18 17:01:01 -08:00
emacs/etc
Paul Eggert 923602fefb Merge from origin/emacs-24
0077b36 # NEWS copyedits
3ca2ff3 * lisp/erc/erc.el (erc-rename-buffers): Doc fix.  Add :version.
b85523f * lisp/textmodes/flyspell.el (flyspell-duplicate-distance):
decb48d Augment text-mode syntax table for a few special characters
8b3ba7a Improve docs of transient-mark-mode  (Bug#19841)
72fd047 NEWS: Add section to include ERC changes
a7254bb Improve string search in `flyspell-word-search-*`. (Bug#16800)

Conflicts:
	etc/ChangeLog
	etc/NEWS
	lisp/ChangeLog
	lisp/erc/ChangeLog
	src/ChangeLog
2015-03-03 14:38:53 -08:00
..
charsets Update copyright year to 2015 2015-01-01 14:26:41 -08:00
e Spelling fixes. 2011-11-26 20:43:11 -08:00
forms Update copyright year to 2015 2015-01-01 14:26:41 -08:00
gnus Spelling fixes. 2011-11-19 18:29:42 -08:00
images Splash images refurbished 2015-01-30 00:38:02 +01:00
nxml Nuke arch-tags. 2011-01-15 15:16:57 -08:00
org Update copyright year to 2015 2015-01-01 14:26:41 -08:00
refcards Merge from gnulib and try to repair bad merge 2015-01-27 22:24:47 -08:00
schema Update copyright year to 2015 2015-01-01 14:26:41 -08:00
srecode Update copyright year to 2015 2015-01-01 14:26:41 -08:00
themes Update copyright year to 2015 2015-01-01 14:26:41 -08:00
tutorials Use u+05f4 in TUTORIAL.he. 2015-01-17 15:06:55 +02:00
AUTHORS Bump version to 24.4.90 2015-02-04 02:07:13 +01:00
CALC-NEWS Update copyright year to 2015 2015-01-01 14:26:41 -08:00
CENSORSHIP Make some files in etc obsolete 2014-03-22 16:47:20 -07:00
ChangeLog Merge from origin/emacs-24 2015-03-03 14:38:53 -08:00
compilation.txt Update copyright year to 2015 2015-01-01 14:26:41 -08:00
COPYING
DEBUG Update copyright year to 2015 2015-01-01 14:26:41 -08:00
DEVEL.HUMOR PS: I re-read the manual of bzr to make sure I don't break anything. 2013-08-02 16:26:22 +02:00
DISTRIB Update copyright year to 2015 2015-01-01 14:26:41 -08:00
edt-user.el Update copyright year to 2015 2015-01-01 14:26:41 -08:00
emacs-buffer.gdb Update copyright year to 2015 2015-01-01 14:26:41 -08:00
emacs.appdata.xml Update copyright year to 2015 2015-01-01 14:26:41 -08:00
emacs.desktop * etc/emacs.desktop: Add "Keywords". 2014-10-30 21:10:19 -07:00
emacs.icon
enriched.txt Update copyright year to 2015 2015-01-01 14:26:41 -08:00
ERC-NEWS Update copyright year to 2015 2015-01-01 14:26:41 -08:00
ETAGS.EBNF Update copyright year to 2015 2015-01-01 14:26:41 -08:00
ETAGS.README Update copyright year to 2015 2015-01-01 14:26:41 -08:00
FTP Make etc/FTP and etc/ORDERS obsolete 2014-01-09 21:44:51 -05:00
future-bug Rename configure.in to configure.ac. 2012-07-08 21:52:49 -07:00
GNU Update copyright year to 2015 2015-01-01 09:18:06 -08:00
GNUS-NEWS etc/GNUS-NEWS: Nore X-GM-LABELS 2015-02-05 03:55:13 +00:00
gnus-tut.txt Update copyright year to 2015 2015-01-01 14:26:41 -08:00
grep.txt Update copyright year to 2015 2015-01-01 14:26:41 -08:00
HELLO Update copyright year to 2015 2015-01-01 14:26:41 -08:00
JOKES Spelling fixes. 2011-11-14 12:23:26 -08:00
LINUX-GNU Make some files in etc obsolete 2014-03-22 16:47:20 -07:00
MACHINES Update copyright year to 2015 2015-01-01 14:26:41 -08:00
MH-E-NEWS Update copyright year to 2015 2015-01-01 14:26:41 -08:00
MORE.STUFF * etc/MORE.STUFF: Replace contents with pointer to efaq.info. 2014-01-09 14:14:28 -05:00
NEWS Merge from origin/emacs-24 2015-03-03 14:38:53 -08:00
NEWS.1-17 Update copyright year to 2015 2015-01-01 14:26:41 -08:00
NEWS.18 Update copyright year to 2015 2015-01-01 14:26:41 -08:00
NEWS.19 Update copyright year to 2015 2015-01-01 14:26:41 -08:00
NEWS.20 Update copyright year to 2015 2015-01-01 14:26:41 -08:00
NEWS.21 Update copyright year to 2015 2015-01-01 14:26:41 -08:00
NEWS.22 Update copyright year to 2015 2015-01-01 14:26:41 -08:00
NEWS.23 Update copyright year to 2015 2015-01-01 14:26:41 -08:00
NEWS.24 Fixes: debbugs:19820 2015-02-09 12:31:20 -05:00
NEXTSTEP Update copyright year to 2015 2015-01-01 14:26:41 -08:00
NXML-NEWS Update copyright year to 2015 2015-01-01 14:26:41 -08:00
ORDERS Make etc/FTP and etc/ORDERS obsolete 2014-01-09 21:44:51 -05:00
ORG-NEWS Update copyright year to 2015 2015-01-01 14:26:41 -08:00
package-keyring.gpg * etc/package-keyring.gpg: New file. 2014-09-24 10:28:27 -04:00
PROBLEMS Update copyright year to 2015 2015-01-01 14:26:41 -08:00
ps-prin0.ps Update copyright year to 2015 2015-01-01 14:26:41 -08:00
ps-prin1.ps Update copyright year to 2015 2015-01-01 14:26:41 -08:00
publicsuffix.txt Update the etc/publicsuffix.txt file 2015-01-26 15:21:34 +11:00
README Update copyright year to 2015 2015-01-01 14:26:41 -08:00
rgb.txt
ses-example.ses Update copyright year to 2015 2015-01-01 14:26:41 -08:00
spook.lines * etc/spook.lines: Minor commentary update 2013-08-28 21:05:19 -04:00
TERMS Update copyright year to 2015 2015-01-01 14:26:41 -08:00
THE-GNU-PROJECT Make some files in etc obsolete 2014-03-22 16:47:20 -07:00
TODO # etc/TODO: More elpa additions 2015-02-20 20:38:43 -05:00
WHY-FREE Make some files in etc obsolete 2014-03-22 16:47:20 -07:00
yow.lines

This directory contains the architecture-independent files used by or
with Emacs.  This includes some text files of documentation for GNU
Emacs or of interest to Emacs users, and the file of dumped docstrings
for Emacs functions and variables.

`forms-d2.dat' is an example data file used by forms-d2.el.

COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES

File: emacs.icon
  Author: Sun Microsystems, Inc
  Copyright (C) 1999, 2001-2015 Free Software Foundation, Inc.
  License: GNU General Public License version 3 or later (see COPYING)