(Fload, load_unwind): Use make_save_value to unwind

[bpt/emacs.git] / src / disptab.h

diff --git a/src/disptab.h b/src/disptab.h
index 2edf6dc..30b2a7a 100644 (file)
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -15,8 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Access the slots of a display-table, according to their purpose.  */
 
@@ -33,16 +33,16 @@ Boston, MA 02111-1307, USA.  */
 #define DISP_INVIS_VECTOR(dp) ((dp)->extras[4])
 #define DISP_BORDER_GLYPH(dp) ((dp)->extras[5])
 
-extern Lisp_Object disp_char_vector ();
+extern Lisp_Object disp_char_vector P_ ((struct Lisp_Char_Table *, int));
 
 #define DISP_CHAR_VECTOR(dp, c) \
   (SINGLE_BYTE_CHAR_P(c) ? (dp)->contents[c] : disp_char_vector ((dp), (c)))
 
 /* Defined in window.c.  */
-extern struct Lisp_Char_Table *window_display_table ();
+extern struct Lisp_Char_Table *window_display_table P_ ((struct window *));
 
 /* Defined in indent.c.  */
-extern struct Lisp_Char_Table *buffer_display_table ();
+extern struct Lisp_Char_Table *buffer_display_table P_ ((void));
 
 /* Display table to use for vectors that don't specify their own.  */
 extern Lisp_Object Vstandard_display_table;
@@ -90,8 +90,8 @@ extern Lisp_Object Vglyph_table;
 /* Assuming that GLYPH_SIMPLE_P (BASE, LEN, G) is 0,
    return the length and the address of the character-sequence
    used for outputting GLYPH G.  */
-#define GLYPH_LENGTH(base,g)   XSTRING (base[g])->size
-#define GLYPH_STRING(base,g)   XSTRING (base[g])->data
+#define GLYPH_LENGTH(base,g)   SCHARS (base[g])
+#define GLYPH_STRING(base,g)   SDATA (base[g])
 
 /* GLYPH for a space character.  */
 
@@ -100,7 +100,5 @@ extern Lisp_Object Vglyph_table;
 
 #define GLYPH_FROM_CHAR(c) (c)
 
-extern int glyphlen ();
-extern void str_to_glyph_cpy ();
-extern void str_to_glyph_ncpy ();
-extern void glyph_to_str_cpy ();
+/* arch-tag: d7f792d2-f59c-4904-a91e-91522e3ab349
+   (do not change this comment) */