From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 13 May 2006 18:32:00 +0000 (+0000)
Subject: (x_set_border_width): Fix error message to say "frame", not "window".
X-Git-Tag: emacs-pretest-22.0.90~2571
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dac85f4b38ae8722b01dfab956b7a5b97955763e;p=emacs.git

(x_set_border_width): Fix error message to say "frame", not "window".
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5cfd400906d..87805b2b4f0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-13  Eli Zaretskii  <eliz@gnu.org>
 
+	* frame.c (x_set_border_width): Fix error message to say "frame",
+	not "window".
+
 	* Makefile.in (SOME_MACHINE_LISP): Add fringe.elc.
 
 2006-05-12  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/src/frame.c b/src/frame.c
index c08d5a6f84d..1c3a30c9e1c 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3141,7 +3141,7 @@ x_set_border_width (f, arg, oldval)
 
 #ifndef MAC_OS
   if (FRAME_X_WINDOW (f) != 0)
-    error ("Cannot change the border width of a window");
+    error ("Cannot change the border width of a frame");
 #endif /* MAC_TODO */
 
   f->border_width = XINT (arg);