Mercurial > hg > xemacs-beta

view nt/x11.patch @ 2146:e4307a6b9ebb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-06-21 18:26:18 by adrian] [R21.4] [PATCH] xemacs-21.5: Fix false cvs conflict in lisp/package-ui.el -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2004-06-21 Adrian Aichner <adrian@xemacs.org> * package-ui.el (pui-help-echo): Fix false cvs conflict by avoiding line solely composed of equal signs.
author adrian
date Mon, 21 Jun 2004 18:26:18 +0000
parents 15872534500d
children
line wrap: on
line source

*** X11.def.old	Thu Apr 10 07:29:27 1997
--- X11.def	Wed Jul 02 22:20:16 1997
***************
*** 5,15 ****
  VERSION 6.1
  EXPORTS
   _Xdebug_p=_Xdebug CONSTANT
-  _XCreateMutex_fn_p=_XCreateMutex_fn CONSTANT
-  _XFreeMutex_fn_p=_XFreeMutex_fn CONSTANT
-  _XLockMutex_fn_p=_XLockMutex_fn CONSTANT
-  _XUnlockMutex_fn_p=_XUnlockMutex_fn CONSTANT
-  _Xglobal_lock_p=_Xglobal_lock CONSTANT
   XActivateScreenSaver
   XAddConnectionWatch
   XAddExtension
--- 5,10 ----
***************
*** 623,630 ****
   _XUnregisterFilter
   _XUnregisterInternalConnection
   _XVIDtoVisual
-  _Xthread_init
-  _Xthread_waiter
   XkbIgnoreExtension
   XkbOpenDisplay
   XkbQueryExtension
--- 618,623 ----