Mercurial > emacs
annotate nt/emacs.rc @ 83488:f47495b26508
Fix ediff problems. (Reported by Dan Nicolaescu.)
* lisp/subr.el (with-selected-frame): Make sure the current buffer is
restored as well.
* src/xfns.c (Fx_create_frame): Use `store_frame_param' to set
`window-system' frame parameter, and make sure it overrides any
user-supplied setting.
* src/xfns.c (x_icon): Disable redundant call to
`x_wm_set_window_state'. (Also applied in CVS.)
* lisp/faces.el (x-create-frame-with-faces): Don't make frame visible
until we are done setting up all its parameters.
* lisp/ediff-wind.el (ediff-setup-windows-automatic): New function.
(ediff-window-setup-function): Use it as default.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-528
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 12 Mar 2006 04:12:31 +0000 |
parents | 067115a6e738 |
children | 1c302a099242 |
rev | line source |
---|---|
67135
21ae671f6702
* emacs.rc: Use new icons.
Chong Yidong <cyd@stupidchicken.com>
parents:
65729
diff
changeset
|
1 Emacs ICON icons\emacs.ico |
49374
4d1d2489581e
2003-01-21 David Ponce <david@dponce.com>
Jason Rumney <jasonr@gnu.org>
parents:
47215
diff
changeset
|
2 32649 CURSOR icons\hand.cur |
22297
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
3 |
43397
212dbe6254e8
* emacs.rc: Define VS_VERSION_INFO if not already.
Jason Rumney <jasonr@gnu.org>
parents:
24855
diff
changeset
|
4 #ifndef VS_VERSION_INFO |
212dbe6254e8
* emacs.rc: Define VS_VERSION_INFO if not already.
Jason Rumney <jasonr@gnu.org>
parents:
24855
diff
changeset
|
5 #define VS_VERSION_INFO 1 |
212dbe6254e8
* emacs.rc: Define VS_VERSION_INFO if not already.
Jason Rumney <jasonr@gnu.org>
parents:
24855
diff
changeset
|
6 #endif |
212dbe6254e8
* emacs.rc: Define VS_VERSION_INFO if not already.
Jason Rumney <jasonr@gnu.org>
parents:
24855
diff
changeset
|
7 |
22297
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
8 VS_VERSION_INFO VERSIONINFO |
65729 | 9 FILEVERSION 22,0,50,0 |
10 PRODUCTVERSION 22,0,50,0 | |
22297
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
11 FILEFLAGSMASK 0x3FL |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
12 #ifdef EMACSDEBUG |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
13 FILEFLAGS 0x1L |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
14 #else |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
15 FILEFLAGS 0x0L |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
16 #endif |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
17 FILEOS 0x40004L |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
18 FILETYPE 0x1L |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
19 FILESUBTYPE 0x0L |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
20 BEGIN |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
21 BLOCK "StringFileInfo" |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
22 BEGIN |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
23 BLOCK "040904B0" |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
24 BEGIN |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
25 VALUE "CompanyName", "Free Software Foundation\0" |
43397
212dbe6254e8
* emacs.rc: Define VS_VERSION_INFO if not already.
Jason Rumney <jasonr@gnu.org>
parents:
24855
diff
changeset
|
26 VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" |
65729 | 27 VALUE "FileVersion", "22, 0, 50, 0\0" |
22297
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
28 VALUE "InternalName", "Emacs\0" |
68648
067115a6e738
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
67135
diff
changeset
|
29 VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005, 2006\0" |
22297
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
30 VALUE "OriginalFilename", "emacs.exe" |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
31 VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" |
65729 | 32 VALUE "ProductVersion", "22, 0, 50, 0\0" |
22297
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
33 VALUE "OLESelfRegister", "\0" |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
34 END |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
35 END |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
36 BLOCK "VarFileInfo" |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
37 BEGIN |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
38 VALUE "Translation", 0x409, 1200 |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
39 END |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
40 END |
2175b5131850
(VS_VERSION_INFO): Define.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11764
diff
changeset
|
41 |