[Emacs-diffs] /srv/bzr/emacs/trunk r109676: port new setting code to Sun C 5.8 2005/10/13

[Paul Eggert]

------------------------------------------------------------
revno: 109676
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2012-08-18 16:53:43 -0700
message:
  port new setting code to Sun C 5.8 2005/10/13
  
  * chartab.c, lisp.h (char_table_set, char_table_set_range):
  Return void, not Lisp_Object.  Otherwise, the compiler
  complains about (A?B:C) where B is void and C is Lisp_Object
  when compiling CHAR_TABLE_SET, due to the recent change to
  the API of sub_char_table_set_contents.
modified:
  src/ChangeLog
  src/chartab.c
  src/lisp.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-18 07:23:30 +0000
+++ b/src/ChangeLog     2012-08-18 23:53:43 +0000
@@ -1,3 +1,12 @@
+2012-08-18  Paul Eggert  <address@hidden>
+
+       port new setting code to Sun C 5.8 2005/10/13
+       * chartab.c, lisp.h (char_table_set, char_table_set_range):
+       Return void, not Lisp_Object.  Otherwise, the compiler
+       complains about (A?B:C) where B is void and C is Lisp_Object
+       when compiling CHAR_TABLE_SET, due to the recent change to
+       the API of sub_char_table_set_contents.
+
 2012-08-18  Chong Yidong  <address@hidden>
 
        * xdisp.c (handle_invisible_prop): Obey TEXT_PROP_MEANS_INVISIBLE

=== modified file 'src/chartab.c'
--- a/src/chartab.c     2012-08-17 17:08:30 +0000
+++ b/src/chartab.c     2012-08-18 23:53:43 +0000
@@ -411,7 +411,7 @@
     }
 }
 
-Lisp_Object
+void
 char_table_set (Lisp_Object table, int c, Lisp_Object val)
 {
   struct Lisp_Char_Table *tbl = XCHAR_TABLE (table);
@@ -434,7 +434,6 @@
       if (ASCII_CHAR_P (c))
        set_char_table_ascii (table, char_table_ascii (table));
     }
-  return val;
 }
 
 static void
@@ -476,7 +475,7 @@
 }
 
 
-Lisp_Object
+void
 char_table_set_range (Lisp_Object table, int from, int to, Lisp_Object val)
 {
   struct Lisp_Char_Table *tbl = XCHAR_TABLE (table);
@@ -510,7 +509,6 @@
       if (ASCII_CHAR_P (from))
        set_char_table_ascii (table, char_table_ascii (table));
     }
-  return val;
 }
 
 

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-08-17 21:12:11 +0000
+++ b/src/lisp.h        2012-08-18 23:53:43 +0000
@@ -2915,9 +2915,8 @@
 extern Lisp_Object char_table_ref (Lisp_Object, int);
 extern Lisp_Object char_table_ref_and_range (Lisp_Object, int,
                                              int *, int *);
-extern Lisp_Object char_table_set (Lisp_Object, int, Lisp_Object);
-extern Lisp_Object char_table_set_range (Lisp_Object, int, int,
-                                         Lisp_Object);
+extern void char_table_set (Lisp_Object, int, Lisp_Object);
+extern void char_table_set_range (Lisp_Object, int, int, Lisp_Object);
 extern int char_table_translate (Lisp_Object, int);
 extern void map_char_table (void (*) (Lisp_Object, Lisp_Object,
                             Lisp_Object),