diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:21:26 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:21:26 -0800 |
| commit | 9792a944dcf08a246bf2618b2a5bee906a888069 (patch) | |
| tree | 495e6fbc120a10c383e5572b5e9b879f74cbb71e /admin | |
| parent | 8b990b89011d5b954c794e08549776b15e34fff1 (diff) | |
| parent | d3852a99c99f0785425a3a4c9d48d31e9aeec7c9 (diff) | |
| download | emacs-9792a944dcf08a246bf2618b2a5bee906a888069.tar.gz | |
Merge from origin/emacs-24
d3852a9 * admin/admin.el (manual-meta-string): Use bug-gnu-emacs.
d69e9f1 CC Mode: Stop Font Lock forcing fontification from BOL.
Conflicts:
admin/ChangeLog
lisp/ChangeLog
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rw-r--r-- | admin/admin.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index ec500569860..9a160446b35 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2015-03-03 Glenn Morris <rgm@gnu.org> + + * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address + rather than webmasters@gnu. + 2015-01-28 Glenn Morris <rgm@gnu.org> * update_autogen (commit): Prepend "# " to commit message. diff --git a/admin/admin.el b/admin/admin.el index 18ea4a40ccc..9bf503ef142 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -248,7 +248,7 @@ Optional argument TYPE is type of output (nil means all)." (defconst manual-meta-string "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\"> -<link rev=\"made\" href=\"mailto:webmasters@gnu.org\"> +<link rev=\"made\" href=\"mailto:bug-gnu-emacs@gnu.org\"> <link rel=\"icon\" type=\"image/png\" href=\"/graphics/gnu-head-mini.png\"> <meta name=\"ICBM\" content=\"42.256233,-71.006581\"> <meta name=\"DC.title\" content=\"gnu.org\">\n\n") |