summaryrefslogtreecommitdiff
path: root/lisp/emulation
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-10-21 21:03:55 -0700
committerGlenn Morris <rgm@gnu.org>2010-10-21 21:03:55 -0700
commit9a0dd02d20468a86f29fc3467a8c14d1ba0c6c84 (patch)
tree75c6939f5431f5838b419f581a898fdb463144b4 /lisp/emulation
parent2f42e9a28671c675d74d70928525649953bb2144 (diff)
downloademacs-9a0dd02d20468a86f29fc3467a8c14d1ba0c6c84.tar.gz
Support for systems without floats was removed a decade ago.
* lisp/loadup.el: Unconditionally load float-sup. * lisp/paren.el (show-paren-delay): * lisp/emacs-lisp/float-sup.el: * lisp/emulation/cua-base.el (cua-prefix-override-inhibit-delay): * lisp/obsolete/lazy-lock.el (lazy-lock-defer-time, lazy-lock-stealth-nice) (lazy-lock-stealth-verbose): Assume float support. * lisp/ps-print.el: Assume float support on Emacs. * lisp/emacs-lisp/timer.el (timer-next-integral-multiple-of-time): Remove non-float branch. * lisp/obsolete/lazy-lock.el: Remove leading `*' from defcustom docs.
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/cua-base.el8
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index f088706afb0..bc64608a284 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1,7 +1,7 @@
;;; cua-base.el --- emulate CUA key bindings
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Kim F. Storm <storm@cua.dk>
;; Keywords: keyboard emulations convenience cua
@@ -300,8 +300,7 @@ is not turned on."
:type 'boolean
:group 'cua)
-(defcustom cua-prefix-override-inhibit-delay
- (if (featurep 'lisp-float-type) (/ (float 1) (float 5)) nil)
+(defcustom cua-prefix-override-inhibit-delay 0.2
"If non-nil, time in seconds to delay before overriding prefix key.
If there is additional input within this time, the prefix key is
used as a normal prefix key. So typing a key sequence quickly will
@@ -1637,5 +1636,4 @@ shifted movement key, set `cua-highlight-region-shift-only'."
(provide 'cua-base)
-;; arch-tag: 21fb6289-ba25-4fee-bfdc-f9fb351acf05
;;; cua-base.el ends here