aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1996-09-23 04:28:20 +0000
committerRichard M. Stallman1996-09-23 04:28:20 +0000
commit2e311f55f2409871aa7e2589cff9d2067779d01a (patch)
tree0e98b3b8341e1d0461acf3a59e3b2520d4e9a7cd
parent3b841abc54006a635da628cafb4974cf34e95bb1 (diff)
downloademacs-2e311f55f2409871aa7e2589cff9d2067779d01a.tar.gz
emacs-2e311f55f2409871aa7e2589cff9d2067779d01a.zip
(add-timeout): Duplicate definition deleted.
(screenw-width, screen-height): Likewise. (disable-timeout, keymap-parent, set-keymap-parent): Likewise.
-rw-r--r--lisp/emacs-lisp/lucid.el21
1 files changed, 0 insertions, 21 deletions
diff --git a/lisp/emacs-lisp/lucid.el b/lisp/emacs-lisp/lucid.el
index 0e94124f6b7..5ae9e31a8ee 100644
--- a/lisp/emacs-lisp/lucid.el
+++ b/lisp/emacs-lisp/lucid.el
@@ -21,12 +21,6 @@
21 21
22;;; Code: 22;;; Code:
23 23
24(defun add-timeout (secs function object &optional resignal)
25 (run-at-time secs resignal function object))
26
27(defun disable-timeout (timeout)
28 (cancel-timer timeout))
29
30(defun copy-tree (tree) 24(defun copy-tree (tree)
31 (if (consp tree) 25 (if (consp tree)
32 (cons (copy-tree (car tree)) 26 (cons (copy-tree (car tree))
@@ -42,19 +36,6 @@
42 36
43(defalias 'current-time-seconds 'current-time) 37(defalias 'current-time-seconds 'current-time)
44 38
45(defun keymap-parent (keymap)
46 (let ((tail (cdr keymap)))
47 (while (and tail (not (eq (car tail) 'keymap)))
48 (setq tail (cdr tail)))
49 tail))
50
51(defun set-keymap-parent (keymap new-parent)
52 (let ((tail keymap))
53 (while (and tail (cdr tail) (not (eq (car (cdr tail)) 'keymap)))
54 (setq tail (cdr tail)))
55 (if tail
56 (setcdr tail new-parent))))
57
58(defun remprop (symbol prop) 39(defun remprop (symbol prop)
59 (let ((plist (symbol-plist symbol))) 40 (let ((plist (symbol-plist symbol)))
60 (while (eq (car plist) prop) 41 (while (eq (car plist) prop)
@@ -210,7 +191,6 @@ bottom of the buffer stack."
210;; (defalias 'screen-char-width 'frame-char-width) 191;; (defalias 'screen-char-width 'frame-char-width)
211;; (defalias 'screen-configuration-to-register 'frame-configuration-to-register) 192;; (defalias 'screen-configuration-to-register 'frame-configuration-to-register)
212;; (defalias 'screen-focus 'frame-focus) 193;; (defalias 'screen-focus 'frame-focus)
213(defalias 'screen-height 'frame-height)
214(defalias 'screen-list 'frame-list) 194(defalias 'screen-list 'frame-list)
215;; (defalias 'screen-live-p 'frame-live-p) 195;; (defalias 'screen-live-p 'frame-live-p)
216(defalias 'screen-parameters 'frame-parameters) 196(defalias 'screen-parameters 'frame-parameters)
@@ -221,7 +201,6 @@ bottom of the buffer stack."
221(defalias 'lower-screen 'lower-frame) 201(defalias 'lower-screen 'lower-frame)
222(defalias 'raise-screen 'raise-frame) 202(defalias 'raise-screen 'raise-frame)
223(defalias 'screen-visible-p 'frame-visible-p) 203(defalias 'screen-visible-p 'frame-visible-p)
224(defalias 'screen-width 'frame-width)
225(defalias 'screenp 'framep) 204(defalias 'screenp 'framep)
226(defalias 'select-screen 'select-frame) 205(defalias 'select-screen 'select-frame)
227(defalias 'selected-screen 'selected-frame) 206(defalias 'selected-screen 'selected-frame)