Mercurial > emacs

changeset 96901:f802294e840d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(UP, BC, PC): Undo previous change.
author Dan Nicolaescu <dann@ics.uci.edu>
date Tue, 22 Jul 2008 17:57:36 +0000
parents d3f5f5665a50
children 411f914a7823
files src/ChangeLog src/terminfo.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Jul 22 17:43:36 2008 +0000
+++ b/src/ChangeLog	Tue Jul 22 17:57:36 2008 +0000
@@ -1,5 +1,7 @@
 2008-07-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* terminfo.c (UP, BC, PC): Undo previous change.
+	
 	* nsfns.m: Rename ns prefixed functions/variables to the
 	corresponding x versions.  Update references.
 
--- a/src/terminfo.c	Tue Jul 22 17:43:36 2008 +0000
+++ b/src/terminfo.c	Tue Jul 22 17:57:36 2008 +0000
@@ -24,10 +24,7 @@
    so that we do not need to conditionalize the places in Emacs
    that set them.  */
 
-/* Causes a conflict on OS X 10.3 .*/
-#ifndef NS_IMPL_COCOA
 char *UP, *BC, PC;
-#endif
 
 /* Interface to curses/terminfo library.
    Turns out that all of the terminfo-level routines look