aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2004-08-22 16:54:33 +0000
committerRichard M. Stallman2004-08-22 16:54:33 +0000
commit9fa5bb32b2a7d7544e03553e7388857343651afa (patch)
treeddacba2ae866a60b0aeeec01139e37cad0ed3f30
parent7ea820e9850de8cf9d66bed4e7e2915a3937472e (diff)
downloademacs-9fa5bb32b2a7d7544e03553e7388857343651afa.tar.gz
emacs-9fa5bb32b2a7d7544e03553e7388857343651afa.zip
(display-mouse-p, display-selections-p): Use with-no-warnings.
-rw-r--r--lisp/frame.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index a364d7f491b..8d979cdaff4 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -987,7 +987,8 @@ frame's display)."
987 ((eq frame-type 'pc) 987 ((eq frame-type 'pc)
988 (msdos-mouse-p)) 988 (msdos-mouse-p))
989 ((eq system-type 'windows-nt) 989 ((eq system-type 'windows-nt)
990 (> w32-num-mouse-buttons 0)) 990 (with-no-warnings
991 (> w32-num-mouse-buttons 0)))
991 ((memq frame-type '(x mac)) 992 ((memq frame-type '(x mac))
992 t) ;; We assume X and Mac *always* have a pointing device 993 t) ;; We assume X and Mac *always* have a pointing device
993 (t 994 (t
@@ -1040,7 +1041,8 @@ frame's display)."
1040 ((eq frame-type 'pc) 1041 ((eq frame-type 'pc)
1041 ;; MS-DOG frames support selections when Emacs runs inside 1042 ;; MS-DOG frames support selections when Emacs runs inside
1042 ;; the Windows' DOS Box. 1043 ;; the Windows' DOS Box.
1043 (not (null dos-windows-version))) 1044 (with-no-warnings
1045 (not (null dos-windows-version))))
1044 ((memq frame-type '(x w32 mac)) 1046 ((memq frame-type '(x w32 mac))
1045 t) ;; FIXME? 1047 t) ;; FIXME?
1046 (t 1048 (t