aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2005-10-21 07:56:50 +0000
committerRomain Francoise2005-10-21 07:56:50 +0000
commitb71cef5c989dfe33f71afec7f183821e797e33df (patch)
tree11704cebe24362865183a2d4cb8833333ebaaf16
parent1712cca561f20620cfdbf5603a96f2d00d1283b1 (diff)
downloademacs-b71cef5c989dfe33f71afec7f183821e797e33df.tar.gz
emacs-b71cef5c989dfe33f71afec7f183821e797e33df.zip
Now part of GNU Emacs. Update FSF's address.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/rcirc.el10
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c777941fbba..fbd8b74ec3c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-10-21 Romain Francoise <romain@orebokech.com>
2
3 * net/rcirc.el: Now part of GNU Emacs. Update FSF's address.
4
12005-10-21 Stefan Monnier <monnier@iro.umontreal.ca> 52005-10-21 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * progmodes/sh-script.el (sh-font-lock-syntactic-keywords): Make $@ 7 * progmodes/sh-script.el (sh-font-lock-syntactic-keywords): Make $@
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 28d6e9c89fa..7684494eb60 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -6,7 +6,7 @@
6;; URL: http://www.nongnu.org/rcirc 6;; URL: http://www.nongnu.org/rcirc
7;; Keywords: comm 7;; Keywords: comm
8 8
9;; This file is not currently part of GNU Emacs. 9;; This file is part of GNU Emacs.
10 10
11;; This file is free software; you can redistribute it and/or modify 11;; This file is free software; you can redistribute it and/or modify
12;; it under the terms of the GNU General Public License as published by 12;; it under the terms of the GNU General Public License as published by
@@ -19,9 +19,9 @@
19;; GNU General Public License for more details. 19;; GNU General Public License for more details.
20 20
21;; You should have received a copy of the GNU General Public License 21;; You should have received a copy of the GNU General Public License
22;; along with GNU Emacs; see the file COPYING. If not, write to 22;; along with GNU Emacs; see the file COPYING. If not, write to the
23;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 23;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
24;; Boston, MA 02111-1307, USA. 24;; Boston, MA 02110-1301, USA.
25 25
26;;; Commentary: 26;;; Commentary:
27 27
@@ -167,7 +167,7 @@ use `rcirc-update-prompt' after changing this variable.")
167 "Return rcirc version string. 167 "Return rcirc version string.
168If optional argument HERE is non-nil, insert string at point." 168If optional argument HERE is non-nil, insert string at point."
169 (interactive "P") 169 (interactive "P")
170 (let ((version "rcirc.el 0.9 $Revision: 1.3 $")) 170 (let ((version "rcirc.el 0.9 $Revision: 1.4 $"))
171 (if here 171 (if here
172 (insert version) 172 (insert version)
173 (if (interactive-p) 173 (if (interactive-p)