Commit 2e311f55 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(add-timeout): Duplicate definition deleted.

(screenw-width, screen-height): Likewise.
(disable-timeout, keymap-parent, set-keymap-parent): Likewise.
parent 3b841abc
......@@ -21,12 +21,6 @@
;;; Code:
(defun add-timeout (secs function object &optional resignal)
(run-at-time secs resignal function object))
(defun disable-timeout (timeout)
(cancel-timer timeout))
(defun copy-tree (tree)
(if (consp tree)
(cons (copy-tree (car tree))
......@@ -42,19 +36,6 @@
(defalias 'current-time-seconds 'current-time)
(defun keymap-parent (keymap)
(let ((tail (cdr keymap)))
(while (and tail (not (eq (car tail) 'keymap)))
(setq tail (cdr tail)))
tail))
(defun set-keymap-parent (keymap new-parent)
(let ((tail keymap))
(while (and tail (cdr tail) (not (eq (car (cdr tail)) 'keymap)))
(setq tail (cdr tail)))
(if tail
(setcdr tail new-parent))))
(defun remprop (symbol prop)
(let ((plist (symbol-plist symbol)))
(while (eq (car plist) prop)
......@@ -210,7 +191,6 @@ bottom of the buffer stack."
;; (defalias 'screen-char-width 'frame-char-width)
;; (defalias 'screen-configuration-to-register 'frame-configuration-to-register)
;; (defalias 'screen-focus 'frame-focus)
(defalias 'screen-height 'frame-height)
(defalias 'screen-list 'frame-list)
;; (defalias 'screen-live-p 'frame-live-p)
(defalias 'screen-parameters 'frame-parameters)
......@@ -221,7 +201,6 @@ bottom of the buffer stack."
(defalias 'lower-screen 'lower-frame)
(defalias 'raise-screen 'raise-frame)
(defalias 'screen-visible-p 'frame-visible-p)
(defalias 'screen-width 'frame-width)
(defalias 'screenp 'framep)
(defalias 'select-screen 'select-frame)
(defalias 'selected-screen 'selected-frame)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment