Mercurial > emacs
annotate src/lastfile.c @ 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 | 38b8a103975c |
children | 695cf19ef79e d7ddb3e565de |
rev | line source |
---|---|
484 | 1 /* Mark end of data space to dump as pure, for GNU Emacs. |
2 Copyright (C) 1985 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 | |
12244 | 8 the Free Software Foundation; either version 2, or (at your option) |
484 | 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:
12244
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:
12244
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
484 | 20 |
21 | |
22 /* How this works: | |
23 | |
24 Fdump_emacs dumps everything up to my_edata as text space (pure). | |
25 | |
26 The files of Emacs are written so as to have no initialized | |
27 data that can ever need to be altered except at the first startup. | |
28 This is so that those words can be dumped as sharable text. | |
29 | |
30 It is not possible to exercise such control over library files. | |
31 So it is necessary to refrain from making their data areas shared. | |
32 Therefore, this file is loaded following all the files of Emacs | |
33 but before library files. | |
34 As a result, the symbol my_edata indicates the point | |
35 in data space between data coming from Emacs and data | |
36 coming from libraries. | |
37 */ | |
38 | |
24099
38b8a103975c
Include config.h to pick up data layout pragmas.
Andrew Innes <andrewi@gnu.org>
parents:
21623
diff
changeset
|
39 #include <config.h> |
38b8a103975c
Include config.h to pick up data layout pragmas.
Andrew Innes <andrewi@gnu.org>
parents:
21623
diff
changeset
|
40 |
11077
e80116526bd6
(my_edata): Declare as char array, not int.
Richard M. Stallman <rms@gnu.org>
parents:
484
diff
changeset
|
41 char my_edata[] = "End of Emacs initialized data"; |
e80116526bd6
(my_edata): Declare as char array, not int.
Richard M. Stallman <rms@gnu.org>
parents:
484
diff
changeset
|
42 |
19726
e003f00f25ed
(my_endbss) [WINDOWSNT]: New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
43 #ifdef WINDOWSNT |
e003f00f25ed
(my_endbss) [WINDOWSNT]: New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
44 /* Help unexec locate the end of the .bss area used by Emacs (which |
e003f00f25ed
(my_endbss) [WINDOWSNT]: New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
45 isn't always a separate section in NT executables). */ |
e003f00f25ed
(my_endbss) [WINDOWSNT]: New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
46 char my_endbss[1]; |
24099
38b8a103975c
Include config.h to pick up data layout pragmas.
Andrew Innes <andrewi@gnu.org>
parents:
21623
diff
changeset
|
47 |
21623
6c7a46148dd4
* lastfile.c (_my_endbss, my_endbss_static): New variables.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19726
diff
changeset
|
48 /* The Alpha MSVC linker globally segregates all static and public bss |
6c7a46148dd4
* lastfile.c (_my_endbss, my_endbss_static): New variables.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19726
diff
changeset
|
49 data, so we must take both into account to determine the true extent |
6c7a46148dd4
* lastfile.c (_my_endbss, my_endbss_static): New variables.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19726
diff
changeset
|
50 of the bss area used by Emacs. */ |
6c7a46148dd4
* lastfile.c (_my_endbss, my_endbss_static): New variables.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19726
diff
changeset
|
51 static char _my_endbss[1]; |
6c7a46148dd4
* lastfile.c (_my_endbss, my_endbss_static): New variables.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19726
diff
changeset
|
52 char * my_endbss_static = _my_endbss; |
24099
38b8a103975c
Include config.h to pick up data layout pragmas.
Andrew Innes <andrewi@gnu.org>
parents:
21623
diff
changeset
|
53 #endif |