Miles Bader
430d2ee291
Merge from emacs--devo--0
...
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
2008-01-09 01:21:15 +00:00
Miles Bader
59ce725a3b
Merge from emacs--rel--22
...
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
a5b68355b3
Add 2008 to copyright years.
2008-01-07 08:42:46 +00:00
Miles Bader
0bd5084171
Merge from emacs--devo--0
...
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
2007-12-06 09:51:45 +00:00
Jason Rumney
0dc7a8bc76
(VMS_SUPPORT): No longer byte-compiled.
2007-11-28 00:25:23 +00:00
Miles Bader
f23d76bdef
Merge from emacs--devo--0
...
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
2007-11-11 00:56:44 +00:00
Dan Nicolaescu
04a697fefe
* makefile.w32-in (obj): Remove sunfns.o.
...
* makefile.MPW (SOME_MACHINE_OBJECTS): Remove sunfns.o.
* Makefile.in: Remove references to sunfns.c and sunfns.o.
2007-11-01 07:16:11 +00:00
Juanma Barranquero
a2666217c2
(obj): Remove abbrev.o.
2007-10-28 14:37:51 +00:00
Jason Rumney
a40c6a08be
(TOOLTIP_SUPPORT, WINDOW_SUPPORT): New definitions.
...
(WINNT_SUPPORT): Add term/w32-win.elc.
(lisp1, lisp2): Sync with lisp in src/Makefile.in.
2007-10-20 23:39:07 +00:00
Jason Rumney
eccfc7828e
(obj): Sync with src/Makefile.in
2007-10-20 23:08:16 +00:00
Miles Bader
c73bd236f7
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
2007-10-11 16:24:58 +00:00
Miles Bader
1af74d06e5
Merge from emacs--rel--22
...
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
2007-10-09 08:52:57 +00:00
Jason Rumney
2e2d237718
(emacsclient, emacsclientw): Link to COMCTL32.
2007-09-27 22:08:19 +00:00
Glenn Morris
bfd9ce719f
Increase version to 23.0.50.
2007-08-29 08:12:34 +00:00
Glenn Morris
2239757784
(VERSION): Set back to 22.1.50 following inadvertent bump in multi-tty
...
merge.
2007-08-29 08:05:47 +00:00
Miles Bader
9899d01a0c
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 824-838)
- Update from CVS
- Merge from emacs--rel--22
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Fix void function definition error in cus-edit.el
- Restore lisp/emacs-lisp/cl-loaddefs.el
* emacs--rel--22 (patch 70-83)
- Update from CVS
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Indicate that emacs--devo--0--patch-834 does not need to be applied
- Merge from gnus--rel--5.10
- Restore lisp/emacs-lisp/cl-loaddefs.el
* gnus--rel--5.10 (patch 239-241)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
2007-07-31 05:50:45 +00:00
Miles Bader
e468b87f91
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 824-831)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 70-74)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
2007-07-27 10:52:18 +00:00
Glenn Morris
4a9f99bdfb
Switch license to GPLv3 or later.
2007-07-25 05:08:27 +00:00
Miles Bader
492d9f3e3c
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 814-823)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 59-69)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 237-238)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-26
2007-07-24 01:25:28 +00:00
Eli Zaretskii
effb3d94de
(clean): Don't delete *~.
2007-07-20 19:45:30 +00:00
Miles Bader
4dacf5c598
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 814-815)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-232
2007-07-18 22:15:15 +00:00
Eli Zaretskii
9724908a55
(clean): Don't delete *~.
2007-07-16 22:41:49 +00:00
Jason Rumney
4086608a37
(obj): Add font.o and w32font.o
2007-06-06 20:27:53 +00:00
Chong Yidong
6e04fc9856
Bump version number to 22.1.50.
2007-06-04 20:42:53 +00:00
Chong Yidong
3d5724d8f1
Increment version number to 22.1.
2007-06-02 11:11:48 +00:00
Chong Yidong
ab43d1e484
Bump version to 22.0.990
2007-05-17 18:55:36 +00:00
Dan Nicolaescu
1d00cfd429
* emacsclient.c (decode_options): Don't use a tty on windows.
...
* makefile.w32-in (VERSION): Update.
2007-05-16 23:16:53 +00:00
Miles Bader
c71cdfc123
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 711-712)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-199
2007-04-26 04:38:27 +00:00
Glenn Morris
5ba76e083b
Increase version to 22.1.50.
2007-04-26 03:32:48 +00:00
Miles Bader
991a760232
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 698-710)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 216)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
2007-04-24 21:56:25 +00:00
Chong Yidong
07ef6df709
Bump version to 22.0.99.
2007-04-24 02:28:19 +00:00
Chong Yidong
48742df4f4
Bump version to 22.0.98.
2007-04-17 01:38:44 +00:00
Miles Bader
57cb2e6f26
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 675-697)
- Update from CVS
- Merge from gnus--rel--5.10
- Release ERC 5.2.
* gnus--rel--5.10 (patch 211-215)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
2007-04-11 00:17:47 +00:00
Chong Yidong
85adab9a0a
Bump version to 22.0.97.
2007-04-04 00:42:38 +00:00
Miles Bader
d85d38392e
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
2007-03-21 13:33:07 +00:00
Chong Yidong
dd35811fe3
Bump version to 22.0.96.
2007-03-20 00:46:19 +00:00
Miles Bader
70fff7b100
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 653-661)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 203-206)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-180
2007-03-04 06:19:40 +00:00
Chong Yidong
c39706ff8b
Bump to 22.0.95.
2007-03-01 23:19:21 +00:00
Miles Bader
a73d7753f9
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 638-652)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 202)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-177
2007-02-26 23:03:45 +00:00
Chong Yidong
38008dcd92
Bump to version 22.0.94.
2007-02-23 17:37:28 +00:00
Miles Bader
c0466914ba
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
2007-01-26 06:16:11 +00:00
Chong Yidong
e6e2db62bc
Bump version to 22.0.93.
2007-01-23 00:47:29 +00:00
Glenn Morris
4e6835dbc4
Add 2007 to copyright years.
2007-01-21 04:57:37 +00:00
Miles Bader
4c34eeeee5
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 563-582)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 177-185)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
2007-01-01 03:21:06 +00:00
Eli Zaretskii
e313b518e8
(clean): Delete stamp_BLD.
2006-12-22 20:41:35 +00:00
Eli Zaretskii
1a8a626d02
(make-docfile, ctags, etags, ebrowse, hexl)
...
(movemail, fakemail, sorted-doc, digest-doc, emacsclient)
(test-distrib, $(DOC), all): depend on stamp_BLD instead of $(BLD).
($(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O))
($(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O))
($(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS))
($(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O))
($(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O)): Depend on stamp_BLD.
2006-12-22 18:43:11 +00:00
Chong Yidong
3efe9e568e
Bump version number to 22.0.92
2006-12-19 19:25:57 +00:00
Miles Bader
a0451a715e
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 523-544)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 168-171)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-150
2006-12-07 04:14:14 +00:00
Juanma Barranquero
c388769ece
($(BLD)/emacsclient.exe, $(BLD)/emacsclientw.exe): Use $(USER32)
...
for compatibility with Visual Studio .NET 2003.
2006-12-06 15:31:34 +00:00
Juanma Barranquero
4d91c8f904
(TRES): New macro (copied from nt/makefile.w32-in).
...
($(TRES)): New rule (copied from nt/makefile.w32-in).
($(BLD)/emacsclientw.exe): Add dependency.
2006-11-27 16:00:37 +00:00