aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/socks.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 77772d9a60d..3b4b72e31cc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-06-05 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/socks.el (top): Remove unnecessary copyright line.
4
12007-06-04 Chong Yidong <cyd@stupidchicken.com> 52007-06-04 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * longlines.el (longlines-auto-wrap): Handle argument correctly. 7 * longlines.el (longlines-auto-wrap): Handle argument correctly.
diff --git a/lisp/net/socks.el b/lisp/net/socks.el
index c85e3fd3cc3..ee2bc0c1d2d 100644
--- a/lisp/net/socks.el
+++ b/lisp/net/socks.el
@@ -1,6 +1,5 @@
1;;; socks.el --- A Socks v5 Client for Emacs 1;;; socks.el --- A Socks v5 Client for Emacs
2 2
3;; Copyright (C) 1996 - 1998 by William M. Perry <wmperry@cs.indiana.edu>
4;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 3;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002,
5;; 2007 Free Software Foundation, Inc. 4;; 2007 Free Software Foundation, Inc.
6 5