Mercurial > emacs
comparison lisp/startup.el @ 83429:ec395f552d45
Merged from miles@gnu.org--gnu-2005 (patch 681)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-681
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-469
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Thu, 29 Dec 2005 04:46:59 +0000 |
| parents | 4513d8dcdfd5 fe8ec3e744b3 |
| children | 76396de7f50a |
comparison
equal
deleted
inserted
replaced
| 83428:d0eee3282e6b | 83429:ec395f552d45 |
|---|---|
| 779 (custom-reevaluate-setting 'tooltip-mode) | 779 (custom-reevaluate-setting 'tooltip-mode) |
| 780 (custom-reevaluate-setting 'global-font-lock-mode) | 780 (custom-reevaluate-setting 'global-font-lock-mode) |
| 781 (custom-reevaluate-setting 'mouse-wheel-down-event) | 781 (custom-reevaluate-setting 'mouse-wheel-down-event) |
| 782 (custom-reevaluate-setting 'mouse-wheel-up-event) | 782 (custom-reevaluate-setting 'mouse-wheel-up-event) |
| 783 (custom-reevaluate-setting 'file-name-shadow-mode) | 783 (custom-reevaluate-setting 'file-name-shadow-mode) |
| 784 (custom-reevaluate-setting 'send-mail-function) | |
| 784 | 785 |
| 785 (normal-erase-is-backspace-setup-frame) | 786 (normal-erase-is-backspace-setup-frame) |
| 786 | 787 |
| 787 ;; Register default TTY colors for the case the terminal hasn't a | 788 ;; Register default TTY colors for the case the terminal hasn't a |
| 788 ;; terminal init file. We do this regardles of whether the terminal | 789 ;; terminal init file. We do this regardles of whether the terminal |