Mercurial > emacs
annotate src/widgetprv.h @ 42602:633233bf2bbf
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Tue, 08 Jan 2002 04:36:01 +0000 |
parents | ee40177f6c68 |
children | 23a1cea22d13 |
rev | line source |
---|---|
5628 | 1 /* The emacs frame widget private header file. |
2 Copyright (C) 1993 Free Software Foundation, Inc. | |
3 | |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
8 the Free Software Foundation; either version 2, or (at your option) | |
9 any later version. | |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
5628
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
5628
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
5628 | 20 |
21 /* Emacs 19 face widget ported by Fred Pierresteguy */ | |
22 | |
23 #ifndef _EmacsFrameP_h | |
24 #define _EmacsFrameP_h | |
25 | |
26 #include <X11/IntrinsicP.h> | |
27 #include <X11/CoreP.h> | |
28 #include "widget.h" | |
29 | |
30 typedef struct { | |
31 struct frame* frame; /* the *emacs* frame object */ | |
32 | |
33 /* Resources that can't be done from lisp. | |
34 */ | |
35 char* geometry; /* geometry spec of this frame */ | |
36 Boolean iconic; /* whether this frame is iconic */ | |
37 | |
38 /* The rest of this is crap and should be deleted. | |
39 */ | |
40 int minibuffer; /* 0: normal frames with minibuffers. | |
41 * 1: frames without minibuffers | |
42 * 2: minibuffer only. */ | |
43 Boolean unsplittable; /* frame can only have one window */ | |
44 | |
45 int internal_border_width; /* internal borders */ | |
46 int interline; /* skips between lines */ | |
47 | |
48 XFontStruct* font; /* font */ | |
49 Pixel foreground_pixel; /* foreground */ | |
50 | |
51 Pixel cursor_color; /* text cursor color */ | |
52 Boolean bar_cursor; /* 1 if bar, 0 if block */ | |
53 | |
54 Boolean visual_bell; /* flash instead of beep */ | |
55 int bell_volume; /* how loud is beep */ | |
56 | |
57 /* private state */ | |
58 | |
59 } EmacsFramePart; | |
60 | |
61 typedef struct _EmacsFrameRec { /* full instance record */ | |
62 CorePart core; | |
63 EmacsFramePart emacs_frame; | |
64 } EmacsFrameRec; | |
65 | |
66 typedef struct { /* new fields for EmacsFrame class */ | |
67 int dummy; | |
68 } EmacsFrameClassPart; | |
69 | |
70 typedef struct _EmacsFrameClassRec { /* full class record declaration */ | |
71 CoreClassPart core_class; | |
72 EmacsFrameClassPart emacs_frame_class; | |
73 } EmacsFrameClassRec; | |
74 | |
75 extern EmacsFrameClassRec emacsFrameClassRec; /* class pointer */ | |
76 | |
77 | |
78 | |
79 #endif /* _EmacsFrameP_h */ |