ChangeLog fixes

7 files changed, 49 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 3182c6c8ff0..0efa32aec55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,39 +28,6 @@
         Be less chatty when not verbose.
         ($(srcdir)/src/stamp-h.in): Simplify with '$@'.
 
-2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
-
-        system-name's returned value can vary
-        Also, the system-name variable is now obsolete.
-        Fixes Bug#19438.
-        * doc/lispref/os.texi (System Environment):
-        * etc/NEWS: Document this.
-        * doc/misc/efaq.texi:
-        (Displaying the current file name in the titlebar):
-        * lisp/desktop.el (desktop-save-frameset):
-        * lisp/dnd.el (dnd-get-local-file-uri):
-        * lisp/gnus/message.el (message-make-fqdn):
-        * lisp/gnus/nnvirtual.el (nnvirtual-retrieve-headers)
-        (nnvirtual-update-xref-header):
-        * lisp/nxml/rng-uri.el (rng-uri-file-name-1):
-        * lisp/org/org-clock.el (org-clock-save):
-        * src/filelock.c (current_lock_owner):
-        * src/xrdb.c (get_environ_db):
-        * src/xterm.c (same_x_server):
-        * src/xterm.c (x_term_init):
-        Prefer (system-name) to system-name, and avoid naming
-        locals 'system-name'.
-        * doc/misc/smtpmail.texi (Server workarounds): Fix grammar.
-        * lisp/startup.el (system-name): Now an obsolete variable.
-        * src/editfns.c (cached_system_name): New static var.
-        (init_and_cache_system_name): New function.
-        (init_editfns, Fsystem_name): Use it.
-        (syms_of_editfns): Initialize it and Vsystem_name to the same value.
-        * src/sysdep.c [HAVE_SOCKETS]: Don't include <sys/socket.h>, <netdb.h>.
-        (h_errno) [TRY_AGAIN && !HAVE_H_ERRNO]: Remove decl.
-        (init_system_name) [HAVE_SOCKETS]: Don't canonicalize the name.
-        Don't create a new string if the current value is already correct.
-
 2014-12-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         * build-aux/git-hooks/commit-msg: Allow tabs.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index ce97b4d1e9b..de1a760496b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -14,6 +14,10 @@
         `temp-buffer-resize-mode', `temp-buffer-max-height' and
         `temp-buffer-max-width'.
 
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * os.texi (System Environment): Update for system-name changes.
+
 2014-12-27  Glenn Morris  <rgm@gnu.org>
 
         * control.texi (Pattern matching case statement):
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 70c68f0ba0c..5057fb91f0b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -12,6 +12,16 @@
         (${buildinfodir}/efaq%.info, efaq%.html):
         Use them.
 
+2014-12-31  Filipp Gunbin  <fgunbin@fastmail.fm>
+
+        * info.texi (Create Info buffer): Mention info-display-manual prefix.
+
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * efaq.texi (Displaying the current file name in the titlebar):
+        Prefer (system-name) to system-name.
+        * smtpmail.texi (Server workarounds): Fix grammar.
+
 2014-12-18  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
         * gnus.texi (Gnus Registry Setup): Explain pruning changes. Mention
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d5416c5cea..4b413fb674d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -59,6 +59,12 @@
 
         * obsolete/pc-select.el (pc-selection-mode): Use system-type.
         This is instead of system-name, which is both wrong here and obsolete.
+        * desktop.el (desktop-save-frameset):
+        * dnd.el (dnd-get-local-file-uri):
+        * nxml/rng-uri.el (rng-uri-file-name-1):
+        Prefer (system-name) to system-name, and avoid naming
+        locals 'system-name'.
+        * startup.el (system-name): Now an obsolete variable.  (Bug#19438)
 
 2014-12-29  Dmitry Gutov  <dgutov@yandex.ru>
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 73fe41f01f2..73a0de76a1f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * message.el (message-make-fqdn):
+        * nnvirtual.el (nnvirtual-retrieve-headers)
+        (nnvirtual-update-xref-header): Prefer (system-name) to system-name,
+        and avoid naming locals 'system-name'.
+
 2014-12-29  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * mm-decode.el (mm-shr): Bind `shr-width' to `fill-column' so that
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 7b87933935c..081da5db73b 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * org-clock.el (org-clock-save): Prefer (system-name) to system-name.
+
 2014-10-29  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify use of current-time and friends.
diff --git a/src/ChangeLog b/src/ChangeLog
index 7b286ccb8bf..d204ccf822d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -21,6 +21,24 @@
         * sysdep.c [WINDOWSNT]: Include sys/socket.h, without which this
         file doesn't compile on MS-Windows.
 
+2014-12-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Allow return value of system-name to vary.  (Bug#19438)
+        * filelock.c (current_lock_owner):
+        * xrdb.c (get_environ_db):
+        * xterm.c (same_x_server):
+        * xterm.c (x_term_init):
+        Prefer (system-name) to system-name, and avoid naming
+        locals 'system-name'.
+        * editfns.c (cached_system_name): New static var.
+        (init_and_cache_system_name): New function.
+        (init_editfns, Fsystem_name): Use it.
+        (syms_of_editfns): Initialize it and Vsystem_name to the same value.
+        * sysdep.c [HAVE_SOCKETS]: Don't include <sys/socket.h>, <netdb.h>.
+        (h_errno) [TRY_AGAIN && !HAVE_H_ERRNO]: Remove decl.
+        (init_system_name) [HAVE_SOCKETS]: Don't canonicalize the name.
+        Don't create a new string if the current value is already correct.
+
 2014-12-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix produce_composite_width typo