diff options
| author | Glenn Morris | 2014-03-22 16:47:20 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-03-22 16:47:20 -0700 |
| commit | 00156f954984c1084180ca87832fcd32f05aa327 (patch) | |
| tree | 60f0551f404a59fe881a698248a874b298b6c632 /src | |
| parent | 10211d43fa7eddfd644f8f95650a691989611e8c (diff) | |
| download | emacs-00156f954984c1084180ca87832fcd32f05aa327.tar.gz emacs-00156f954984c1084180ca87832fcd32f05aa327.zip | |
Make some files in etc obsolete
These are old copies of online information that is not Emacs-specific.
* etc/CENSORSHIP, etc/GNU, etc/LINUX-GNU, etc/THE-GNU-PROJECT, etc/WHY-FREE:
Replace contents with pointers to www.gnu.org or emacs.info, mark obsolete.
* src/callproc.c (init_callproc): In etc, look for NEWS rather than GNU.
* lisp/startup.el (fancy-startup-text):
* lisp/help.el (describe-gnu-project): Visit online info about GNU project.
* doc/emacs/help.texi (Help Files): Update C-h g description.
* doc/misc/efaq.texi (Informational files for Emacs): Do not mention etc/GNU.
* admin/notes/copyright: Remove references to these files.
* etc/MACHINES, etc/NEWS.19: Replace references to these files.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/callproc.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 94b48f64de3..efb96ce8494 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,8 +1,11 @@ | |||
| 1 | 2014-03-22 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * callproc.c (init_callproc): In etc, look for NEWS rather than GNU. | ||
| 4 | |||
| 1 | 2014-03-22 Daniel Colascione <dancol@dancol.org> | 5 | 2014-03-22 Daniel Colascione <dancol@dancol.org> |
| 2 | 6 | ||
| 3 | * process.c (conv_sockaddr_to_lisp): When extracting the string | 7 | * process.c (conv_sockaddr_to_lisp): When extracting the string |
| 4 | names of AF_LOCAL sockets, stop before reading uninitialized | 8 | names of AF_LOCAL sockets, stop before reading uninitialized memory. |
| 5 | memory. | ||
| 6 | 9 | ||
| 7 | 2014-03-21 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 10 | 2014-03-21 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 8 | 11 | ||
diff --git a/src/callproc.c b/src/callproc.c index 2ce4a7dcc0d..0831291b0dd 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -1617,13 +1617,13 @@ init_callproc (void) | |||
| 1617 | 1617 | ||
| 1618 | srcdir = Fexpand_file_name (build_string ("../src/"), lispdir); | 1618 | srcdir = Fexpand_file_name (build_string ("../src/"), lispdir); |
| 1619 | 1619 | ||
| 1620 | tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory); | 1620 | tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory); |
| 1621 | tem1 = Ffile_exists_p (tem); | 1621 | tem1 = Ffile_exists_p (tem); |
| 1622 | if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1)) | 1622 | if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1)) |
| 1623 | { | 1623 | { |
| 1624 | Lisp_Object newdir; | 1624 | Lisp_Object newdir; |
| 1625 | newdir = Fexpand_file_name (build_string ("../etc/"), lispdir); | 1625 | newdir = Fexpand_file_name (build_string ("../etc/"), lispdir); |
| 1626 | tem = Fexpand_file_name (build_string ("GNU"), newdir); | 1626 | tem = Fexpand_file_name (build_string ("NEWS"), newdir); |
| 1627 | tem1 = Ffile_exists_p (tem); | 1627 | tem1 = Ffile_exists_p (tem); |
| 1628 | if (!NILP (tem1)) | 1628 | if (!NILP (tem1)) |
| 1629 | Vdata_directory = newdir; | 1629 | Vdata_directory = newdir; |