Revert last change -- duplicated.

diff --git a/src/ChangeLog b/src/ChangeLog
index cc88f58198ac5c40f11b5a06cf2f11e8f14fef96..6b3a8846c9ff79fd092bdd43cf8db031004c5616 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-31  Dave Love  <fx@gnu.org>
+
+       * textprop.c: Revert last change -- duplicated.
+
 2000-05-31  Gerd Moellmann  <gerd@gnu.org>
 
        * dispnew.c (find_glyph_row_slice, swap_glyphs_in_rows): Put

diff --git a/src/textprop.c b/src/textprop.c
index 141c3a5317de91de383e6222f7f7f17cb99599fc..e53d77825ffd26e9bacb9a71db8ab5405b6dae1b 100644 (file)
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1,5 +1,5 @@
 /* Interface code for dealing with text properties.
-   Copyright (C) 1993, 1994, 1995, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1997, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -54,7 +54,6 @@ Lisp_Object Qpoint_left;
 Lisp_Object Qpoint_entered;
 Lisp_Object Qcategory;
 Lisp_Object Qlocal_map;
-Lisp_Object Qkeymap;
 
 /* Visual properties text (including strings) may have.  */
 Lisp_Object Qforeground, Qbackground, Qfont, Qunderline, Qstipple;
@@ -1870,8 +1869,6 @@ rear-nonsticky properties of the character overrides NONSTICKINESS.");
   Qcategory = intern ("category");
   staticpro (&Qlocal_map);
   Qlocal_map = intern ("local-map");
-  staticpro (&Qkeymap);
-  Qkeymap = intern ("keymap");
   staticpro (&Qfront_sticky);
   Qfront_sticky = intern ("front-sticky");
   staticpro (&Qrear_nonsticky);