(Fx_own_selection_internal): Follow error conventions.

(Fx_get_selection_internal, Fx_selection_owner_p)
(Fx_selection_exists_p): Doc fixes.  (syms_of_macselect)
<selection-converter-alist>: Likewise.

2 files changed, 42 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 97b29b8cb6a..1a08ec8c81e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,39 @@
+2005-07-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * mac.c: Don't include stdlib.h or string.h.
+        (Fdo_applescript, Fmac_file_name_to_posix)
+        (Fmac_file_name_to_posix): Doc fixes.
+        [TARGET_API_MAC_CARBON] (Fmac_get_preference)
+        (Fmac_code_convert_string): Likewise.
+        [MAC_OSX] (init_mac_osx_environment): Fall back on terminal mode
+        if the executable is not contained in a bundle.
+
+        * macfns.c: Don't include stdlib.h or string.h.  Include atimer.h.
+        (gray_width, gray_height): Remove defines.
+        (gray_bits, gray_bitmap_width, gray_bitmap_height)
+        (gray_bitmap_bits): Remove variables.
+        (lispy_function_keys): Remove extern.
+        (free_frame_menubar): Add extern.
+        (x_window_to_frame): Remove function.
+        (unwind_create_tip_frame): Add declaration.
+        (x_set_name_internal): New function.
+        (x_set_name, x_set_title): Use it.
+        (Fx_create_frame, Fx_display_grayscale_p, Fx_display_pixel_width)
+        (Fx_display_pixel_height, Fx_display_planes)
+        (Fx_display_color_cells, Fx_server_max_request_size)
+        (Fx_server_vendor, Fx_server_version, Fx_display_screens)
+        (Fx_display_mm_height, Fx_display_mm_width)
+        (Fx_display_backing_store, Fx_display_visual_class)
+        (Fx_display_save_under, Fx_synchronize, Fx_show_tip): Doc fixes.
+
+        * macmenu.c (Fx_popup_menu, Fx_popup_dialog): Doc fixes.
+
+        * macselect.c (Fx_own_selection_internal): Follow error
+        conventions.
+        (Fx_get_selection_internal, Fx_selection_owner_p)
+        (Fx_selection_exists_p): Doc fixes.
+        (syms_of_macselect) <selection-converter-alist>: Likewise.
+
 2005-07-21  Juanma Barranquero  <lekktu@gmail.com>
 
         * buffer.c (syms_of_buffer) <cursor-type>: Doc fix.
diff --git a/src/macselect.c b/src/macselect.c
index 94fe591a206..63221ba3a90 100644
--- a/src/macselect.c
+++ b/src/macselect.c
@@ -712,7 +712,7 @@ anything that the functions on `selection-converter-alist' know about.  */)
 {
   check_mac ();
   CHECK_SYMBOL (selection_name);
-  if (NILP (selection_value)) error ("selection-value may not be nil");
+  if (NILP (selection_value)) error ("SELECTION-VALUE may not be nil");
   x_own_selection (selection_name, selection_value);
   return selection_value;
 }
@@ -724,11 +724,11 @@ anything that the functions on `selection-converter-alist' know about.  */)
 
 DEFUN ("x-get-selection-internal", Fx_get_selection_internal,
        Sx_get_selection_internal, 2, 3, 0,
-       doc: /* Return text selected from some Mac window.
+       doc: /* Return text selected from some Mac application.
 SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 TYPE is the type of data desired, typically `STRING'.
 TIME_STAMP is ignored on Mac.  */)
-  (selection_symbol, target_type, time_stamp)
+     (selection_symbol, target_type, time_stamp)
      Lisp_Object selection_symbol, target_type, time_stamp;
 {
   Lisp_Object val = Qnil;
@@ -821,7 +821,7 @@ Disowning it means there is no such selection.  */)
 
 DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p,
        0, 1, 0,
-       doc: /* Whether the current Emacs process owns the given Selection.
+       doc: /* Whether the current Emacs process owns the given SELECTION.
 The arg should be the name of the selection in question, typically one of
 the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 For convenience, the symbol nil is the same as `PRIMARY',
@@ -866,7 +866,7 @@ and t is the same as `SECONDARY'.  */)
 
 DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
        0, 1, 0,
-       doc: /* Whether there is an owner for the given Selection.
+       doc: /* Whether there is an owner for the given SELECTION.
 The arg should be the name of the selection in question, typically one of
 the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 For convenience, the symbol nil is the same as `PRIMARY',
@@ -1077,7 +1077,7 @@ a desired type to which the selection should be converted;
 and the local selection value (whatever was given to `x-own-selection').
 
 The function should return the value to send to the Scrap Manager
-\(a string).  A return value of nil
+\(must be a string).  A return value of nil
 means that the conversion could not be done.
 A return value which is the symbol `NULL'
 means that a side-effect was executed,