aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2019-09-09 00:24:18 +0200
committerStefan Kangas2019-09-09 01:13:54 +0200
commitc86f91caf0645fabe10b056a68fb5a26654c0814 (patch)
tree619c22e04659f5f47b82e186787ec4e73c2242d8
parent69db930c7ecb821df7183204cef576557659e92f (diff)
downloademacs-c86f91caf0645fabe10b056a68fb5a26654c0814.tar.gz
emacs-c86f91caf0645fabe10b056a68fb5a26654c0814.zip
Remove final XEmacs compat code from dframe.el
* lisp/dframe.el (top-level): Doc fix. (dframe-frame-parameter): Redefine as an obsolete function alias for 'frame-parameter'.
-rw-r--r--lisp/dframe.el21
1 files changed, 8 insertions, 13 deletions
diff --git a/lisp/dframe.el b/lisp/dframe.el
index 72deb0c45e4..91f89e1705f 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -40,7 +40,7 @@
40;; * Frame/buffer killing hooks 40;; * Frame/buffer killing hooks
41;; * Mouse-3 position relative menu 41;; * Mouse-3 position relative menu
42;; * Mouse motion, help-echo hacks 42;; * Mouse motion, help-echo hacks
43;; * Mouse clicking, double clicking, & XEmacs image clicking hack 43;; * Mouse clicking & double clicking
44;; * Mode line hacking 44;; * Mode line hacking
45;; * Utilities for use in a program covering: 45;; * Utilities for use in a program covering:
46;; o keymap massage for some actions 46;; o keymap massage for some actions
@@ -56,7 +56,6 @@
56;; 1) (require 'dframe) 56;; 1) (require 'dframe)
57;; 2) Variable Setup: 57;; 2) Variable Setup:
58;; -frame-parameters -- Frame parameters for Emacs. 58;; -frame-parameters -- Frame parameters for Emacs.
59;; -frame-plist -- Frame parameters for XEmacs.
60;; -- Not on parameter lists: They can optionally include width 59;; -- Not on parameter lists: They can optionally include width
61;; and height. If width or height is not included, then it will 60;; and height. If width or height is not included, then it will
62;; be provided to match the originating frame. In general, 61;; be provided to match the originating frame. In general,
@@ -112,13 +111,9 @@
112 111
113;;; Code: 112;;; Code:
114 113
115;;; Compatibility functions 114
116;; 115(define-obsolete-function-alias 'dframe-frame-parameter
117(defalias 'dframe-frame-parameter 116 'frame-parameter "27.1")
118 (if (fboundp 'frame-parameter) 'frame-parameter
119 (lambda (frame parameter)
120 "Return FRAME's PARAMETER value."
121 (cdr (assoc parameter (frame-parameters frame))))))
122 117
123 118
124;;; Variables 119;;; Variables
@@ -322,8 +317,8 @@ CREATE-HOOK is a hook to run after creating a frame."
322 (if (frame-live-p (symbol-value frame-var)) 317 (if (frame-live-p (symbol-value frame-var))
323 (raise-frame (symbol-value frame-var)) 318 (raise-frame (symbol-value frame-var))
324 (set frame-var 319 (set frame-var
325 (let* ((mh (dframe-frame-parameter dframe-attached-frame 320 (let* ((mh (frame-parameter dframe-attached-frame
326 'menu-bar-lines)) 321 'menu-bar-lines))
327 (paramsa 322 (paramsa
328 ;; Only add a guessed height if one is not specified 323 ;; Only add a guessed height if one is not specified
329 ;; in the input parameters. 324 ;; in the input parameters.
@@ -377,8 +372,8 @@ a cons cell indicating a position of the form (LEFT . TOP)."
377 ;; Position dframe. 372 ;; Position dframe.
378 ;; Do no positioning if not on a windowing system, 373 ;; Do no positioning if not on a windowing system,
379 (unless (or (not window-system) (eq window-system 'pc)) 374 (unless (or (not window-system) (eq window-system 'pc))
380 (let* ((pfx (dframe-frame-parameter parent-frame 'left)) 375 (let* ((pfx (frame-parameter parent-frame 'left))
381 (pfy (dframe-frame-parameter parent-frame 'top)) 376 (pfy (frame-parameter parent-frame 'top))
382 (pfw (+ (tool-bar-pixel-width parent-frame) 377 (pfw (+ (tool-bar-pixel-width parent-frame)
383 (frame-pixel-width parent-frame))) 378 (frame-pixel-width parent-frame)))
384 (pfh (frame-pixel-height parent-frame)) 379 (pfh (frame-pixel-height parent-frame))