Mercurial > emacs
comparison lisp/startup.el @ 83513:966a40e7fb54
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-234
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-235
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-236
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-237
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-238
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-239
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-240
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-241
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-242
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-243
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-244
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-245
(Ffield_beginning, find_field): Undo change of 2006-04-23.
* emacs@sv.gnu.org/emacs--devo--0--patch-246
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-247
Rcirc patch from Ryan Yeske
* emacs@sv.gnu.org/emacs--devo--0--patch-248
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-249
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-250
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-251
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-87
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-88
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-89
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-90
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-91
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-92
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-93
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-94
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-95
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-553
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 28 Apr 2006 14:48:18 +0000 |
parents | 24cf4bf418dc 8b0a765eb64a |
children | d9f8d2a65d18 |
comparison
equal
deleted
inserted
replaced
83512:5d328dadd0f4 | 83513:966a40e7fb54 |
---|---|
1617 ;; Delay 2 seconds after an init file error message | 1617 ;; Delay 2 seconds after an init file error message |
1618 ;; was displayed, so user can read it. | 1618 ;; was displayed, so user can read it. |
1619 (when init-file-had-error | 1619 (when init-file-had-error |
1620 (sit-for 2)) | 1620 (sit-for 2)) |
1621 | 1621 |
1622 (when (and pure-space-overflow | |
1623 (not noninteractive)) | |
1624 (display-warning | |
1625 'initialization | |
1626 "Building Emacs overflowed pure space." | |
1627 ;; FIXME: Tell the user what kind of problems are possible and how to fix | |
1628 ;; the overflow. | |
1629 :warning)) | |
1630 | |
1622 (when command-line-args-left | 1631 (when command-line-args-left |
1623 ;; We have command args; process them. | 1632 ;; We have command args; process them. |
1624 (let ((dir command-line-default-directory) | 1633 (let ((dir command-line-default-directory) |
1625 (file-count 0) | 1634 (file-count 0) |
1626 first-file-buffer | 1635 first-file-buffer |