diff options
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/terminfo.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 804a71f6c5d..4fd6e1023b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/terminfo.c b/src/terminfo.c index 968d338279b..c1e1a36a833 100644 --- a/src/terminfo.c +++ b/src/terminfo.c @@ -24,10 +24,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 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 |