aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-02-10 14:15:54 -0800
committerPaul Eggert2014-02-10 14:15:54 -0800
commite41fe0d346d78ea5e352a04a943fadadb46231ac (patch)
tree19cafac4ea20dcf63fff294cd35856fb4b137593 /src
parentbacb3380374de28c8ed982994ebe55b06d43294a (diff)
downloademacs-e41fe0d346d78ea5e352a04a943fadadb46231ac.tar.gz
emacs-e41fe0d346d78ea5e352a04a943fadadb46231ac.zip
Avoid "." at end of error diagnostics.
* cmds.c (Fself_insert_command): Reword and avoid "." at end. * font.c (Ffont_at): * nsfns.m (ns_display_info_for_name): * nsselect.m (Fx_own_selection_internal): * nsterm.m (performDragOperation:): Remove "." from end of diagnostic.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog10
-rw-r--r--src/cmds.c3
-rw-r--r--src/font.c2
-rw-r--r--src/nsfns.m2
-rw-r--r--src/nsselect.m2
-rw-r--r--src/nsterm.m2
6 files changed, 15 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fef7cf0e47f..5583e1a7b69 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
12014-02-10 Paul Eggert <eggert@cs.ucla.edu>
2
3 Avoid "." at end of error diagnostics.
4 * cmds.c (Fself_insert_command): Reword and avoid "." at end.
5 * font.c (Ffont_at):
6 * nsfns.m (ns_display_info_for_name):
7 * nsselect.m (Fx_own_selection_internal):
8 * nsterm.m (performDragOperation:):
9 Remove "." from end of diagnostic.
10
12014-02-10 Lars Ingebrigtsen <larsi@gnus.org> 112014-02-10 Lars Ingebrigtsen <larsi@gnus.org>
2 12
3 * fns.c (Fmaphash): Say what `maphash' returns, since it may be 13 * fns.c (Fmaphash): Say what `maphash' returns, since it may be
diff --git a/src/cmds.c b/src/cmds.c
index 03ce54c8ee4..fdc3fcac281 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -280,8 +280,7 @@ At the end, it runs `post-self-insert-hook'. */)
280 CHECK_NUMBER (n); 280 CHECK_NUMBER (n);
281 281
282 if (XFASTINT (n) < 1) 282 if (XFASTINT (n) < 1)
283 error ("Repetition argument is %"pI"d, but must be higher than 0.", 283 error ("Nonpositive repetition argument %"pI"d", XFASTINT (n));
284 XFASTINT (n));
285 284
286 if (!EQ (Vthis_command, KVAR (current_kboard, Vlast_command))) 285 if (!EQ (Vthis_command, KVAR (current_kboard, Vlast_command)))
287 nonundocount = 0; 286 nonundocount = 0;
diff --git a/src/font.c b/src/font.c
index fa097c7d7e6..8027de81609 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4785,7 +4785,7 @@ character at index specified by POSITION. */)
4785 if (NILP (string)) 4785 if (NILP (string))
4786 { 4786 {
4787 if (XBUFFER (w->contents) != current_buffer) 4787 if (XBUFFER (w->contents) != current_buffer)
4788 error ("Specified window is not displaying the current buffer."); 4788 error ("Specified window is not displaying the current buffer");
4789 CHECK_NUMBER_COERCE_MARKER (position); 4789 CHECK_NUMBER_COERCE_MARKER (position);
4790 if (! (BEGV <= XINT (position) && XINT (position) < ZV)) 4790 if (! (BEGV <= XINT (position) && XINT (position) < ZV))
4791 args_out_of_range_3 (position, make_number (BEGV), make_number (ZV)); 4791 args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));
diff --git a/src/nsfns.m b/src/nsfns.m
index 90ca37ba956..1dad651c7ae 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -183,7 +183,7 @@ ns_display_info_for_name (Lisp_Object name)
183 if (!NILP (Fstring_equal (XCAR (dpyinfo->name_list_element), name))) 183 if (!NILP (Fstring_equal (XCAR (dpyinfo->name_list_element), name)))
184 return dpyinfo; 184 return dpyinfo;
185 185
186 error ("Emacs for OpenStep does not yet support multi-display."); 186 error ("Emacs for OpenStep does not yet support multi-display");
187 187
188 Fx_open_connection (name, Qnil, Qnil); 188 Fx_open_connection (name, Qnil, Qnil);
189 dpyinfo = x_display_list; 189 dpyinfo = x_display_list;
diff --git a/src/nsselect.m b/src/nsselect.m
index 4cf81ed4f69..f4713cb5e10 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -351,7 +351,7 @@ On Nextstep, FRAME is unused. */)
351 check_window_system (NULL); 351 check_window_system (NULL);
352 CHECK_SYMBOL (selection); 352 CHECK_SYMBOL (selection);
353 if (NILP (value)) 353 if (NILP (value))
354 error ("selection value may not be nil."); 354 error ("Selection value may not be nil");
355 pb = ns_symbol_to_pb (selection); 355 pb = ns_symbol_to_pb (selection);
356 if (pb == nil) return Qnil; 356 if (pb == nil) return Qnil;
357 357
diff --git a/src/nsterm.m b/src/nsterm.m
index 36f42ee179a..ff20ea35ebf 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6786,7 +6786,7 @@ if (cols > 0 && rows > 0)
6786 } 6786 }
6787 else 6787 else
6788 { 6788 {
6789 error ("Invalid data type in dragging pasteboard."); 6789 error ("Invalid data type in dragging pasteboard");
6790 return NO; 6790 return NO;
6791 } 6791 }
6792} 6792}