Mercurial > emacs
comparison lisp/startup.el @ 91073:4bc33ffdda1a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 27 Oct 2007 09:12:07 +0000 |
| parents | a0e466c4d599 9f3a25157e4f |
| children | 2fcaae6177a5 |
comparison
equal
deleted
inserted
replaced
| 91072:74ab3ea909f9 | 91073:4bc33ffdda1a |
|---|---|
| 33 | 33 |
| 34 (setq top-level '(normal-top-level)) | 34 (setq top-level '(normal-top-level)) |
| 35 | 35 |
| 36 (defvar command-line-processed nil | 36 (defvar command-line-processed nil |
| 37 "Non-nil once command line has been processed.") | 37 "Non-nil once command line has been processed.") |
| 38 | |
| 39 (defvar window-system initial-window-system | |
| 40 "Name of window system the selected frame is displaying through. | |
| 41 The value is a symbol--for instance, `x' for X windows. | |
| 42 The value is nil if the selected frame is on a text-only-terminal.") | |
| 43 | |
| 44 (make-variable-frame-local 'window-system) | |
| 45 | 38 |
| 46 (defgroup initialization nil | 39 (defgroup initialization nil |
| 47 "Emacs start-up procedure." | 40 "Emacs start-up procedure." |
| 48 :group 'environment) | 41 :group 'environment) |
| 49 | 42 |