aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2005-06-23 16:20:05 +0000
committerJuanma Barranquero2005-06-23 16:20:05 +0000
commit253b22986e1746dbf91d233ee85883df5f2cef01 (patch)
treef28e798854fdeaead257614cddda9c03f475129b /src
parent2010ba8ca92545dfe870a758d8b14198f323c2dd (diff)
downloademacs-253b22986e1746dbf91d233ee85883df5f2cef01.tar.gz
emacs-253b22986e1746dbf91d233ee85883df5f2cef01.zip
(Fx_own_selection_internal): Follow error conventions.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog15
-rw-r--r--src/xselect.c2
2 files changed, 16 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ab6c74d8638..c1e40d59441 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,20 @@
12005-06-23 Juanma Barranquero <lekktu@gmail.com> 12005-06-23 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * abbrev.c (Funexpand_abbrev):
4 * category.c (Fmake_category_set):
5 * dispnew.c (Fsleep_for, Fsit_for):
6 * editfns.c (Fsubst_char_in_region):
7 * eval.c (Fdefvar, Fdefconst, Feval, Ffuncall):
8 * frame.c (make_frame_without_minibuffer):
9 * lread.c (read_vector):
10 * macfns.c (check_x_frame):
11 * process.c (Fstop_process, Fcontinue_process):
12 * search.c (Freplace_match):
13 * syntax.c (Fstring_to_syntax):
14 * w32fns.c (check_x_frame, check_x_display_info):
15 * xfaces.c (x_supports_face_attributes_p):
16 * xselect.c (Fx_own_selection_internal): Follow error conventions.
17
3 * image.c (fn_png_init_io): Don't define it. 18 * image.c (fn_png_init_io): Don't define it.
4 (init_png_functions) [HAVE_NTGUI]: Don't initialize fn_png_init_io. 19 (init_png_functions) [HAVE_NTGUI]: Don't initialize fn_png_init_io.
5 (png_read_from_file): New function, based on png_read_from_memory. 20 (png_read_from_file): New function, based on png_read_from_memory.
diff --git a/src/xselect.c b/src/xselect.c
index 6c722d9d02c..b0a2aee92ec 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2119,7 +2119,7 @@ anything that the functions on `selection-converter-alist' know about. */)
2119{ 2119{
2120 check_x (); 2120 check_x ();
2121 CHECK_SYMBOL (selection_name); 2121 CHECK_SYMBOL (selection_name);
2122 if (NILP (selection_value)) error ("selection-value may not be nil"); 2122 if (NILP (selection_value)) error ("SELECTION-VALUE may not be nil");
2123 x_own_selection (selection_name, selection_value); 2123 x_own_selection (selection_name, selection_value);
2124 return selection_value; 2124 return selection_value;
2125} 2125}