[Emacs-diffs] emacs-25 6d109c0: ; Cleanup of change log. Removed obsolete email addresses.

[Anders Lindgren]

branch: emacs-25
commit 6d109c051c482bbd5b01f8ed19ed78069efaee42
Author: Anders Lindgren <address@hidden>
Commit: Anders Lindgren <address@hidden>

    ; Cleanup of change log. Removed obsolete email addresses.
---
 ChangeLog.2             |   14 +-------------
 lisp/autorevert.el      |    2 +-
 lisp/follow.el          |    4 ++--
 lisp/font-lock.el       |    2 +-
 lisp/generic-x.el       |    2 +-
 lisp/progmodes/cwarn.el |    3 +--
 lisp/scroll-all.el      |    2 +-
 src/ChangeLog.13        |    2 +-
 8 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/ChangeLog.2 b/ChangeLog.2
index 3636e38..945f787 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -785,14 +785,6 @@
        * lisp/net/tramp-compat.el (tramp-compat-delete-dups): New defun.
        * lisp/net/tramp-smb.el (tramp-smb-handle-directory-files): Use it.
 
-2015-10-28  Anders Lindgren  <address@hidden>
-
-       Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh
-
-       Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs
-
-       Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh
-
 2015-10-28  Michael Albinus  <address@hidden>
 
        * lisp/net/tramp-smb.el (tramp-smb-handle-directory-files):
@@ -812,10 +804,6 @@
        * nsterm.m (ns_constrain_all_frames, ns_init_term): Block input.
        * nsterm.m (ns_send_appdefined, EmacsApp): Trace output.
 
-2015-10-28  Anders Lindgren  <address@hidden>
-
-       Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs
-
 2015-10-28  Artur Malabarba  <address@hidden>
 
        * src/process.c (Fget_buffer_process): Improve docstring.
@@ -1764,7 +1752,7 @@
 
 2015-10-23  Anders Lindgren  <address@hidden>
 
-       NextSten maximization and NSTRACE rewrite
+       NextStep maximization and NSTRACE rewrite
 
        Full-height, full-width, and maximized windows now cover the
        entire screen (except the menu bar), including the part where the
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 18b8161..17fa43a 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1997-1999, 2001-2015 Free Software Foundation, Inc.
 
-;; Author: Anders Lindgren <address@hidden>
+;; Author: Anders Lindgren
 ;; Keywords: convenience
 ;; Created: 1997-06-01
 ;; Date: 1999-11-30
diff --git a/lisp/follow.el b/lisp/follow.el
index 938c59e..57ba2f6 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -3,8 +3,8 @@
 ;; Copyright (C) 1995-1997, 1999, 2001-2015 Free Software Foundation,
 ;; Inc.
 
-;; Author: Anders Lindgren <address@hidden>
-;; Maintainer: address@hidden (Anders' email bounces, Sep 2005)
+;; Author: Anders Lindgren
+;; Maintainer: address@hidden
 ;; Created: 1995-05-25
 ;; Keywords: display, window, minor-mode, convenience
 
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 21cf3ae..762720d 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -763,7 +763,7 @@ see the variables `c-font-lock-extra-types', 
`c++-font-lock-extra-types',
              (setq font-lock-removed-keywords-alist
                    (delq cell font-lock-removed-keywords-alist)))))))
 
-;; Written by Anders Lindgren <address@hidden>.
+;; Written by Anders Lindgren
 ;;
 ;; Case study:
 ;; (I)  The keywords are removed from a major mode.
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 56e1761..38160fc 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -62,7 +62,7 @@
 ;; Folding mode should use invisible text properties instead.  -- Dave
 ;; Love]
 ;;
-;; From Anders Lindgren <address@hidden>
+;; From Anders Lindgren
 ;;
 ;; Problem summary: Wayne Adams has found a problem when using folding
 ;; mode in conjunction with font-lock for a mode defined in
diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index 2f501f2..eae96f0 100644
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -2,9 +2,8 @@
 
 ;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
 
-;; Author: Anders Lindgren <address@hidden>
+;; Author: Anders Lindgren
 ;; Keywords: c, languages, faces
-;; X-Url: http://www.andersl.com/emacs
 ;; Version: 1.3.1
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index 9c2d1fb..a8f75d3 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -33,7 +33,7 @@
 
 ;; Suggestions/ideas from:
 ;;    Rick Macdonald <address@hidden>
-;;    Anders Lindgren <address@hidden>
+;;    Anders Lindgren
 
 ;;; Code:
 
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index ac21628..4643a47 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -8339,7 +8339,7 @@
        * emacs.c (main): Initialize daemon_pipe[1] here ...
        (syms_of_emacs): ... instead of here.
 
-2014-02-16  Anders Lindgern  <address@hidden>
+2014-02-16  Anders Lindgren  <address@hidden>
 
        * nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask
        is set (Bug#16505).