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
8d9cc0b7ea
Merge multi-tty branch
...
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-866
2007-08-29 05:28:10 +00:00
Miles Bader
62fb5e25f4
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 857-862)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-38
2007-08-27 09:21:49 +00:00
Glenn Morris
ed1cc5a75f
Further simplification pending merge to trunk.
2007-08-27 07:51:44 +00:00
Miles Bader
7f22a76506
Merge from emacs--rel--22
...
Patches applied:
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-860
2007-08-27 04:00:19 +00:00
Glenn Morris
05aec97508
Simplify log ready for merge into trunk. On merge, date to be
...
replaced with merge date.
2007-08-26 01:56:56 +00:00
Glenn Morris
29bda95905
(sys/stat.h, errno.h): Remove duplicate includes.
2007-08-26 00:56:36 +00:00
Eli Zaretskii
ca4ea90fa9
(rcs2log, rcs-checkin, grep-changelog, vcdiff): Prepend "-" to the command,
...
in case srcdir=. and file is copied into itself.
2007-08-25 10:59:32 +00:00
Miles Bader
aa251046dd
Import changelog info from arch logs into ChangeLog.multi-tty files
...
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-34
2007-08-22 11:46:14 +00:00
Miles Bader
aaf34461ff
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
2007-08-13 13:51:08 +00:00
Miles Bader
37cc095b6a
Merge from emacs--rel--22
...
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Glenn Morris
79f94cd0ab
Replace `iff' in comments.
2007-08-08 07:12:39 +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
8f069875eb
Update some .arch-inventory files
...
Revision: emacs@sv.gnu.org/emacs--rel--22--patch-77
Creator: Michael Olson <mwolson@gnu.org>
2007-07-30 05:36:46 +00:00
Miles Bader
5ef05ae3b2
Update some .arch-inventory files
...
* lib-src/.arch-inventory: Don't track the blessmail binary.
* lisp/emacs-lisp/cl-loaddefs.el: Don't track this. It is autogenerated.
* lisp/emacs-lisp/.arch-inventory: Don't track cl-loaddefs.el.
* lisp/ps-print.el: Check in trivial changes to the autoloads section
caused by the build process. These autoloads really ought to be placed
in a separate file, methinks.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-833
Creator: Michael Olson <mwolson@gnu.org>
2007-07-30 05:33:47 +00:00
Miles Bader
9aecacd08a
Merge from emacs--rel--22
...
Patches applied:
* emacs--rel--22 (patch 70-73)
- Update from CVS
2007-07-25 Glenn Morris <rgm@gnu.org>
* Relicense all FSF files to GPLv3 or later.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Miles Bader
6eabc4c2f7
Merge from emacs--rel--22
...
Patches applied:
* emacs--rel--22 (patch 70-73)
- Update from CVS
2007-07-25 Glenn Morris <rgm@gnu.org>
* lib-src/COPYING: Switch to GPLv3.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:24:01 +00:00
Glenn Morris
cacc7b5131
Switch license to GPLv3 or later.
2007-07-25 07:11:02 +00:00
Glenn Morris
5c65bae26d
Change to GPLv3.
2007-07-25 07:00:38 +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
Francesco Potortì
172aa4c11b
* etags.c (C_entries): Reset the fvdef machine when out of function.
...
(PRINT_UNDOCUMENTED_OPTIONS_HELP): #define as FALSE if undefined.
(print_help): Use it in if() rather than #if.
(print_help): Conditionally print help about --no-line-directive.
2007-07-17 15:13:24 +00:00
Francesco Potortì
21b2cdc7de
*** empty log message ***
2007-07-17 15:03:54 +00:00
Francesco Potortì
180f5b99a7
*** empty log message ***
2007-07-17 14:55:40 +00:00
Eli Zaretskii
9724908a55
(clean): Don't delete *~.
2007-07-16 22:41:49 +00:00
Miles Bader
67f3ad67ee
Merge from emacs--devo--0
...
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
2007-06-11 01:00:07 +00:00
Miles Bader
0114082988
Merge from emacs--rel--22
...
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-790
2007-06-09 03:19:04 +00:00
Glenn Morris
5ee63e320f
Fix typo in previous change.
2007-06-07 07:47:00 +00:00
Glenn Morris
d16c1140f4
(print_version): Add `emacs_copyright' string, for easier automatic
...
updating.
2007-06-07 07:25:14 +00:00
Glenn Morris
5cf9ca93e5
(main): Use `emacs-copyright' in --version output.
2007-06-07 07:23:36 +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
7dfc4cda5d
Version 22.1 released.
2007-06-02 11:07:00 +00:00
Dan Nicolaescu
30790a37ef
* emacsclient.c (main): Avoid having a declaration after a
...
statement.
* sysdep.c: Comment out text after #endif.
2007-05-26 17:28:45 +00:00
Juanma Barranquero
f9263a779a
*** empty log message ***
2007-05-21 12:16:07 +00:00
Juanma Barranquero
c0f342ab43
(print_help_and_exit): Restore and adapt trunk change from 2006-11-23 which was
...
lost in the merge.
2007-05-21 12:15:52 +00:00
Miles Bader
7be1c21aed
Merged from emacs--devo--0
...
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-744
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-745
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-746
Merge from emacs--rel--22
* emacs@sv.gnu.org/emacs--devo--0--patch-747
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-748
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-749
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-750
Merge from emacs--rel--22
* emacs@sv.gnu.org/emacs--devo--0--patch-751
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-752
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-753
Merge from emacs--rel--22
* emacs@sv.gnu.org/emacs--devo--0--patch-754
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-755
Merge from emacs--rel--22
* emacs@sv.gnu.org/emacs--devo--0--patch-756
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-757
Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change.
* emacs@sv.gnu.org/emacs--devo--0--patch-758
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-759
Merge from emacs--rel--22
* emacs@sv.gnu.org/emacs--devo--0--patch-760
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-761
Update from CVS
* emacs@sv.gnu.org/emacs--rel--22--patch-14
Update from CVS
* emacs@sv.gnu.org/emacs--rel--22--patch-15
Update from CVS
* emacs@sv.gnu.org/emacs--rel--22--patch-16
Update from CVS: src/xterm.c (XTread_socket): Revert last change.
* emacs@sv.gnu.org/emacs--rel--22--patch-17
Update from CVS
* emacs@sv.gnu.org/emacs--rel--22--patch-18
Update from CVS
* emacs@sv.gnu.org/emacs--rel--22--patch-19
Update from CVS
* emacs@sv.gnu.org/emacs--rel--22--patch-20
Update from CVS
* emacs@sv.gnu.org/emacs--rel--22--patch-21
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-221
Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-12
Creator: Karoly Lorentey <karoly@lorentey.hu>
2007-05-20 23:29:14 +00:00
Dan Nicolaescu
caf49fb043
* loadup.el: Load mac-win on a Mac. Avoid loading both x-win and
...
mac-win.
* term/mac-win.el:
(mac-initialize-window-system): New function. Move global setup
here.
* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
(SYSTEM_PURESIZE_EXTRA): Only define on Carbon.
* emacsclient.c (decode_options): Don't use a tty on mac carbon.
2007-05-19 23:12:46 +00:00
Francesco Potortì
cabfc1bcd6
etags.c updates.
2007-05-18 08:45:29 +00:00
Francesco Potortì
eac5078589
Extern definitions of some more pointer functions for
...
standalone compilation, especially important for 64bit platforms.
(main, print_help): --members is now the default for etags.
(C_entries): Parse start of C comment as a space == end of token.
This is not necessary for C++ comment, already parsed as newline.
2007-05-18 08:43:54 +00:00
Chong Yidong
ab43d1e484
Bump version to 22.0.990
2007-05-17 18:55:36 +00:00
Dan Nicolaescu
90843190c5
* emacsclient.c (handle_sigtstp): Use the new name for the
...
socket variable.
2007-05-17 00:17:06 +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
Jason Rumney
4335dfda32
*** empty log message ***
2007-05-16 21:35:20 +00:00
Jason Rumney
486ba65f34
(emacs_socket): Rename from s.
...
Move definition below includes it depends on.
(SEND_STRING, SEND_QUOTED): Remove obfuscation macros.
(quote_argument, set_tcp_socket, handle_sigcont, handle_sigtstp):
(main): Expand removed macros inline.
2007-05-16 21:35:06 +00:00
Jason Rumney
4b7b77f679
(emacs_socket): Rename from s.
...
Move definition below includes it depends on.
2007-05-16 21:06:28 +00:00
Dan Nicolaescu
105faa8427
* emacsclient.c (s): Restore.
...
(main): Don't define s here.
(w32_execvp): Move definition before use.
2007-05-16 16:14:26 +00:00
Miles Bader
a9683a703b
Add arch tagline
2007-05-16 02:51:49 +00:00