← Back to branch summary

~ubuntu-branches/ubuntu/vivid/vim/vivid

« back to all changes in this revision

Viewing changes to src/nbdebug.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2008-11-05 11:37:43 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20081105113743-9i4urcsm3n44mhqe
Tags: 2:7.2.025-2ubuntu1
* Merge from debian unstable, remaining changes:
  - runtime/syntax/debcontrol.vim:
    + Add "metapackages" to the list of valid sections.
  - runtime/syntax/debchangelog.vim:
    + Add "jaunty" to the list of valid suites.
  - Drop vim-lesstif package and lesstif2-dev build-dependency.
  - Enable Python interpreter on basic builds.
  - Create a .pot file for translations.
  - Disable autoindent, line-wrapping, and backup files by default.
  - runtime/syntax/debsources.vim:
    + Add "jaunty" to debsourcesDistrKeyword
  - runtime/syntax/grub.vim:
    + Add Ubuntu-specific 'quiet' keyword.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nbdebug.c
36
36
void             nbtrace(char *, ...);
37
37
 
38
38
static int       lookup(char *);
39
 
#ifndef FEAT_GUI_W32
 
39
#ifdef USE_NB_ERRORHANDLER
40
40
static int       errorHandler(Display *, XErrorEvent *);
41
41
#endif
42
42
 
92
92
                } else {
93
93
                        nb_dlevel = NB_TRACE;   /* default level */
94
94
                }
 
95
#ifdef USE_NB_ERRORHANDLER
 
96
                XSetErrorHandler(errorHandler);
 
97
#endif
95
98
        }
96
99
 
97
100
}    /* end nbdebug_log_init */
166
169
 
167
170
}    /* end lookup */
168
171
 
169
 
#ifndef FEAT_GUI_W32
 
172
#ifdef USE_NB_ERRORHANDLER
170
173
static int
171
174
errorHandler(
172
175
        Display         *dpy,