Mercurial > emacs

changeset 11039:c9e2537da847

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(other-frame): Don't try to unfocus in a termcap frame. (frame-notice-user-settings): Skip menu-bar code in a termcap frame.
author Karl Heuer <kwzh@gnu.org>
date Thu, 16 Mar 1995 21:25:52 +0000
parents f93c3156e05a
children 2ea19d4d0b4b
files lisp/frame.el
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/frame.el	Thu Mar 16 20:23:22 1995 +0000
+++ b/lisp/frame.el	Thu Mar 16 21:25:52 1995 +0000
@@ -203,12 +203,13 @@
 (defun frame-notice-user-settings ()
 
   ;; Make menu-bar-mode and default-frame-alist consistent.
-  (let ((default (assq 'menu-bar-lines default-frame-alist)))
-    (if default
-	(setq menu-bar-mode (not (eq (cdr default) 0)))
-      (setq default-frame-alist
-	    (cons (cons 'menu-bar-lines (if menu-bar-mode 1 0))
-		  default-frame-alist))))
+  (if (boundp 'menu-bar-mode)
+      (let ((default (assq 'menu-bar-lines default-frame-alist)))
+	(if default
+	    (setq menu-bar-mode (not (eq (cdr default) 0)))
+	  (setq default-frame-alist
+		(cons (cons 'menu-bar-lines (if menu-bar-mode 1 0))
+		      default-frame-alist)))))
 
   ;; Creating and deleting frames may shift the selected frame around,
   ;; and thus the current buffer.  Protect against that.  We don't
@@ -495,7 +496,8 @@
     (raise-frame frame)
     (select-frame frame)
     (set-mouse-position (selected-frame) (1- (frame-width)) 0)
-    (unfocus-frame)))
+    (if (fboundp 'unfocus-frame)
+	(unfocus-frame))))
 
 ;;;; Frame configurations