Mercurial > emacs
annotate lwlib/xrdb.c @ 31383:860d7ac182e3
(vc-rcs-show-log-entry): New function.
(vc-rcs-checkin, vc-rcs-checkout): Don't set all properties.
(vc-rcs-register): If there is no RCS subdir, ask the
user whether to create one.
(vc-rcs-state-heuristic): Use
file-ownership-preserved-p.
(vc-rcs-checkout): Remove the error-handling for missing-rcs.
(vc-rcs-state-heuristic): Don't use file-writable-p.
(vc-rcs-print-log): Insert in the current buffer.
(vc-rcs-diff): Insert in the current buffer and remove unused arg
CMP.
(vc-rcs-workfile-unchanged-p): Use vc-do-command
instead of vc-simple-command.
(vc-rcs-fetch-master-state): Removed check for unlocked-changes to
avoid doing a diff when opening a file.
(vc-rcs-state): Added check for unlocked-changes.
(vc-rcs-header): Escape Id.
(vc-rcs-workfile-unchanged-p): Remove optional arg VERSION.
(vc-rcs-state): Call vc-workfile-unchanged-p, not the RCS-specific
version.
(vc-rcs-state-heuristic): Use file-writable-p instead
of comparing userids.
(vc-rcs-fetch-master-state): Handle the case where rcs is missing.
Simplify the logic by eliminating unreachable code.
(vc-rcs-diff): Only pass `2' to vc-do-command if necessary and
just do a recursive call if we need to retry.
(vc-rcs-checkout): Handle the case where rcs is missing by making
the buffer read-write if requested and re-signalling the error.
(vc-rcs-find-most-recent-rev): New function. The code
derives from the old vc-parse-buffer but uses the revision number
rather than the date (much easier to compare robustly).
(vc-rcs-fetch-master-state): Use `with-temp-buffer'. Adapt to the
new vc-parse-buffer (and vc-rcs-find-most-recent-rev). Find the
locking-user more directly. Check strict locking and set
checkout-model appropriately.
(vc-rcs-parse-locks): Remove.
(vc-rcs-latest-on-branch-p): Use with-temp-buffer and adapt to the
new vc-parse-buffer (and vc-rcs-find-most-recent-rev).
(vc-rcs-system-release): Use with-current-buffer and
vc-parse-buffer.
(vc-rcs-register, vc-rcs-checkout): Use with-current-buffer.
Merge in code
from vc-rcs-hooks.el. Don't require 'vc anymore.
(vc-rcs-responsible-p): Use expand-file-name instead of concat and
file-directory-p instead of file-exists-p.
(vc-rcs-exists): Remove.
(vc-rcs-header): New var.
Update Copyright.
(vc-rcs-rename-file): New function.
(vc-rcs-diff): Remove unused `backend' variable.
(vc-rcs-clear-headers): New function; code moved here
from vc-clear-headers in vc.el.
(tail): Provide vc-rcs and remove vc-rcs-logentry-check.
(vc-rcs-register): Parse command output to find master
file name and workfile version.
(vc-rcs-checkout): Removed call to vc-file-clear-masterprops.
Require vc and vc-rcs-hooks.
(vc-rcs-trunk-p, vc-rcs-branch-part): Move to vc-rcs-hooks.
(vc-rcs-backend-release-p): Remove (use vc-rcs-release-p).
(vc-release-greater-or-equal-p): Move from vc.
(vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part,
vc-rcs-minor-part, vc-rcs-previous-version): Remove duplicates.
(vc-rcs-checkout): Add a missing `new-version' argument in the
call to vc-rcs-latest-on-branch-p. Hopefully that was the right
one.
(vc-rcs-steal-lock): Renamed from `vc-rcs-steal'.
Updated everything to use `vc-checkout-model'.
(vc-rcs-backend-release-p): function added. other
stuff updated to reference this function instead of the old
`vc-backend-release-p'.
(vc-rcs-logentry-check): Function added.
(vc-rcs-checkin, vc-rcs-previous-version)
(vc-rcs-checkout): Name space cleaned up. No more revision number
crunching function names that are not prefixed with vc-rcs.
(vc-rcs-checkout-model): Function added. References to
`vc-checkout-model' replaced.
(vc-rcs-admin): Added the query-only option as
required by the vc.el file.
(vc-rcs-exists): Function added.
(vc-*-checkout):
Use with-temp-file instead of /bin/sh. Merged from mainline
(vc-rcs-latest-on-branch-p): Moved to vc-rcs-hooks.el.
(vc-rcs-latest-on-branch-p, vc-rcs-trunk-p)
(vc-rcs-branch-p, vc-rcs-branch-part, vc-rcs-minor-part)
(vc-rcs-previous-version): Functions added.
(vc-rcs-diff): Function added.
(vc-rcs-checkout) Bug (typo) found and fixed.
(vc-rcs-register-switches) Variable `vc-rcs-register-switches' added.
Require vc when compiling.
(vc-rcs-print-log, vc-rcs-assign-name, vc-rcs-merge)
(vc-rcs-check-headers, vc-rcs-steal, vc-rcs-uncheck, vc-rcs-revert)
(vc-rcs-checkin): New functions (code from vc.el).
(vc-rcs-previous-version, vc-rcs-system-release, vc-rcs-checkout):
Doc fix.
(vc-rcs-release): Deleted. (Duplicated vc-rcs-system-release).
(vc-rcs-trunk-p, vc-rcs-branch-p, vc-rcs-branch-part)
(vc-rcs-minor-part, vc-rcs-previous-version, vc-rcs-release)
(vc-rcs-release-p, vc-rcs-admin, vc-rcs-checkout): New functions
from vc.el.
(vc-rcs-system-release):
Renamed from vc-rcs-backend-release.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 04 Sep 2000 19:47:43 +0000 |
parents | e0d966fb548f |
children |
rev | line source |
---|---|
25842 | 1 /* This file overrides the R4 or R5 mit/lib/Xt/Initialize.c, except that |
2 the functions lwlib_GetFileDatabase(), lwlib_CombineFileDatabase(), and | |
3 lwlib_xrdb_initialize() are called. By doing this silly cpp hack, we | |
4 avoid version skew problems. | |
5 */ | |
6 | |
26087
e0d966fb548f
Add support for large files, plus some locale improvements.
Paul Eggert <eggert@twinsun.com>
parents:
25842
diff
changeset
|
7 #ifdef HAVE_CONFIG_H |
e0d966fb548f
Add support for large files, plus some locale improvements.
Paul Eggert <eggert@twinsun.com>
parents:
25842
diff
changeset
|
8 #include <config.h> |
e0d966fb548f
Add support for large files, plus some locale improvements.
Paul Eggert <eggert@twinsun.com>
parents:
25842
diff
changeset
|
9 #endif |
e0d966fb548f
Add support for large files, plus some locale improvements.
Paul Eggert <eggert@twinsun.com>
parents:
25842
diff
changeset
|
10 |
25842 | 11 #include <X11/Xlib.h> |
12 #include <X11/cursorfont.h> | |
13 #include <X11/Xutil.h> | |
14 | |
15 #ifdef XlibSpecificationRelease | |
16 #if XlibSpecificationRelease >= 5 | |
17 #define HAVE_X11R5 | |
18 #endif | |
19 #endif | |
20 | |
21 extern struct _XrmHashBucketRec *lwlib_GetFileDatabase (); | |
22 extern void lwlib_xrdb_initialize (); | |
23 | |
24 /* Replace all calls to XrmGetFileDatabase() with lwlib_GetFileDatabase(), | |
25 calls to XrmCombineFileDatabase() with lwlib_CombineFileDatabase(), and | |
26 rename the defined _XtDisplayInitialize() function. | |
27 */ | |
28 #define XrmGetFileDatabase lwlib_GetFileDatabase | |
29 #define XrmCombineFileDatabase lwlib_CombineFileDatabase | |
30 #define _XtDisplayInitialize _orig_XtDisplayInitialize | |
31 | |
32 /* Suck in the original code. Don't change this: see comments in Imakefile. */ | |
33 #include "Initialize.c" | |
34 | |
35 #undef XrmGetFileDatabase | |
36 #undef XrmCombineFileDatabase | |
37 #undef _XtDisplayInitialize | |
38 | |
39 /* Now provide a definition of _XtDisplayInitialize() which invokes the | |
40 original code after calling our initialization hook. Note that the R4 | |
41 and R5 versions of _XtDisplayInitialize() take different arguments. | |
42 */ | |
43 | |
44 #ifndef HAVE_X11R5 | |
45 | |
46 void _XtDisplayInitialize(dpy, pd, name, class, urlist, num_urs, argc, argv) | |
47 Display *dpy; | |
48 XtPerDisplay pd; | |
49 String name, class; | |
50 XrmOptionDescRec *urlist; | |
51 Cardinal num_urs; | |
52 Cardinal *argc; | |
53 char *argv[]; | |
54 { | |
55 lwlib_xrdb_initialize(dpy); | |
56 _orig_XtDisplayInitialize(dpy, pd, name, class, urlist, num_urs, argc, argv); | |
57 } | |
58 | |
59 #else /* HAVE_X11R5 */ | |
60 | |
61 void _XtDisplayInitialize(dpy, pd, name, urlist, num_urs, argc, argv) | |
62 Display *dpy; | |
63 XtPerDisplay pd; | |
64 String name; | |
65 XrmOptionDescRec *urlist; | |
66 Cardinal num_urs; | |
67 int *argc; | |
68 char **argv; | |
69 { | |
70 lwlib_xrdb_initialize(dpy); | |
71 _orig_XtDisplayInitialize(dpy, pd, name, urlist, num_urs, argc, argv); | |
72 } | |
73 | |
74 #endif /* HAVE_X11R5 */ |