diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2013-07-07 15:35:54 -0400 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2013-07-07 15:35:54 -0400 |
| commit | f1e6674bb32058c7ef683d5f8f8ac67f99e96dd2 (patch) | |
| tree | 6cc51c44045bdbbd5ec28d52f4d212cb52ebaa49 /lisp/faces.el | |
| parent | 1d44267275efdcee3c3584eaa79baccad54266b3 (diff) | |
| download | emacs-f1e6674bb32058c7ef683d5f8f8ac67f99e96dd2.tar.gz | |
* faces.el (tty-run-terminal-initialization): function changed (Stefan
Monnier's patch).
* viper.el (viper-emacs-state-mode-list): add egg-status-buffer-mode.
(viper-version): version update.
(viper-go-away,viper-setup-hooks): function changed (Stefan Monnier's
patch).
(viper--lookup-key,viper-catch-tty-ESC,viper-uncatch-tty-ESC,
viper-setup-ESC-to-escape): new functions (Stefan Monnier's
patch).
* viper-cmd.el: (viper-del-forward-char-in-insert): new function.
(viper-save-kill-buffer): check if buffer is modified.
(viper-envelop-ESC-key): function deleted (Stefan Monnier's patch).
(viper-intercept-ESC-key): function changed (Stefan Monnier's patch).
* viper-keym.el (viper-ESC-key): constant changed (Stefan Monnier's
patch).
* ediff.el (ediff-files-command,ediff3-files-command): new functions.
(ediff-merge-command,ediff-merge-with-ancestor-command): new functions.
(ediff-directories-command,ediff-directories3-command): new functions.
(ediff-merge-directories-command): new function.
(ediff-merge-directories-with-ancestor-command): new function.
All the above are command-line interfaces to ediff: facilitate calling
Emacs with the appropriate ediff functions invoked.
(ediff-version): version update.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 0a3f0551325..0e776cad781 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2122,7 +2122,8 @@ terminal type to a different value." type) (when (fboundp term-init-func) (funcall term-init-func)) - (set-terminal-parameter frame 'terminal-initted term-init-func))))) + (set-terminal-parameter frame 'terminal-initted term-init-func) + (run-hooks 'tty-setup-hook))))) ;; Called from C function init_display to initialize faces of the ;; dumped terminal frame on startup. |