diff options
| author | Vibhav Pant | 2020-08-21 14:04:35 +0530 |
|---|---|---|
| committer | Vibhav Pant | 2020-08-21 14:04:35 +0530 |
| commit | f0f8d7b82492e741950c363a03b886965c91b1b0 (patch) | |
| tree | 19b716830b1ebabc0d7d75949c4e6800c0f104ad /lisp/term | |
| parent | 9e64a087c4d167e7ec1c4e22bea3e6af53b563de (diff) | |
| parent | c818c29771d3cb51875643b2f6c894073e429dd2 (diff) | |
| download | emacs-feature/native-comp-macos-fixes.tar.gz emacs-feature/native-comp-macos-fixes.zip | |
Merge branch 'feature/native-comp' into feature/native-comp-macos-fixesfeature/native-comp-macos-fixes
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/w32-win.el | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 6b9716ca307..f15337818b0 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el | |||
| @@ -78,12 +78,8 @@ | |||
| 78 | (require 'dnd) | 78 | (require 'dnd) |
| 79 | (require 'w32-vars) | 79 | (require 'w32-vars) |
| 80 | 80 | ||
| 81 | ;; Keep an obsolete alias for w32-focus-frame and w32-select-font in case | ||
| 82 | ;; they are used by code outside Emacs. | ||
| 83 | (define-obsolete-function-alias 'w32-focus-frame 'x-focus-frame "23.1") | ||
| 84 | (declare-function x-select-font "w32font.c" | 81 | (declare-function x-select-font "w32font.c" |
| 85 | (&optional frame exclude-proportional)) | 82 | (&optional frame exclude-proportional)) |
| 86 | (define-obsolete-function-alias 'w32-select-font 'x-select-font "23.1") | ||
| 87 | 83 | ||
| 88 | (defvar w32-color-map) ;; defined in w32fns.c | 84 | (defvar w32-color-map) ;; defined in w32fns.c |
| 89 | (make-obsolete 'w32-default-color-map nil "24.1") | 85 | (make-obsolete 'w32-default-color-map nil "24.1") |