Merge from emacs--rel--22

[gnu-emacs] / lisp / talk.el

diff --git a/lisp/talk.el b/lisp/talk.el
index 74ed9ba0bef971fef128c65b210e5fc8eea06206..cb4043ee1ac510f150a4932b3aa28532c0bb172c 100644 (file)
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -1,6 +1,9 @@
-;;; talk.el --- Allow several users to talk to each other through Emacs.
+;;; talk.el --- allow several users to talk to each other through Emacs
 
-;; Copyright (C) 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
+
+;; Maintainer: FSF
 ;; Keywords: comm, frames
 
 ;; This file is part of GNU Emacs.
@@ -16,13 +19,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
-;;; This is a multi-user talk package that runs in Emacs.
-;;; Use talk-connect to bring a new person into the conversation.
+;; This is a multi-user talk package that runs in Emacs.
+;; Use talk-connect to bring a new person into the conversation.
 
 ;;; Code:
 
@@ -96,4 +100,7 @@ Select the first of these windows, displaying the first of the buffers."
          (select-window (frame-first-window frame)))
       (select-frame old-frame))))
 
+(provide 'talk)
+
+;;; arch-tag: 7ab0ad88-1788-4886-a44c-ae685e6f8a1a
 ;;; talk.el ends here