Commits

Anonymous committed 569337d

supercite - info file to reflect mailing list change e to reflect mailing list change (Steve T) use functions from mail-extr (James LewisMoss <jimdres@mindspring.com>)lookup - Add mule-base to requires (me)edit-utils - detached-minibuf.el: Create a separator correctly for 21.2. (Vin)

Comments (0)

Files changed (2)

+2001-01-13  Vin Shelton  <acs@xemacs.org>
+
+	* detached-minibuf.el: Create a separator correctly for 21.2.
+
 2000-11-16  Martin Buchholz  <martin@xemacs.org>
 
 	* func-menu.el (fume-bomb-proof): 

detached-minibuf.el

 ;;; detached-minibuf.el -- Support a detached minibuffer for XEmacs.
 
-;; Copyright (C) 1997 Alvin C. Shelton
+;; Copyright (C) 2001 Vin Shelton
 
-;; Author: Alvin Shelton <acs@acm.org>
+;; Author: Vin Shelton <acs@xemacs.org>
 ;; Keywords: extensions
 
 ;; This file is part of XEmacs.
 	  ;; This frame does not have a minibuffer, so add one
 	  (set-frame-property (selected-frame) 'minibuffer t)))
 
-      (add-menu-button '("Options" "Frame Appearance")
-		       ["------" nil nil]
-		       nil)
-      (add-menu-button '("Options" "Frame Appearance")
-		       ["Toggle minibuffer"
-			(toggle-minibuf)
-			:style toggle
-			:active (not (equal (selected-frame)
-					    default-minibuffer-frame))
-			:selected (equal
-				   (frame-property (selected-frame) 'minibuffer)
-				   t)]
-		       nil)
-      (add-menu-button '("Options" "Frame Appearance")
-		       ["Default minibuffer here"
-			(setq default-minibuffer-frame (selected-frame))
-			:style toggle
-			:active (let ((mbf (frame-property
-					    (selected-frame) 'minibuffer)))
-				  (or (equal mbf (selected-frame))
-				      (equal mbf t)))
-			:selected (equal (selected-frame)
-					 default-minibuffer-frame)]
-		       nil)
-      (add-menu-button '("Options" "Frame Appearance")
-		       ["Make a detached minibuffer"
-			(make-detached-minibuf)
-			:style nil]
-		       nil)))
+      ;; The menu structure is different before XEmacs 21.2.
+      ;; Under 21.1 and previous, add menu items to
+      ;; Options/Frame Appearance.  Under 21.2+, add the
+      ;; menu items to Options/Display.
+      (let ((entry-name (if (fboundp 'purecopy-menubar)
+			    '("Options" "Frame Appearance")
+			  '("Options" "Display"))))
+	(add-menu-button entry-name
+			 "------"
+			 nil)
+	(add-menu-button entry-name
+			 ["Toggle minibuffer"
+			  (toggle-minibuf)
+			  :style toggle
+			  :active (not (equal (selected-frame)
+					      default-minibuffer-frame))
+			  :selected (equal
+				     (frame-property (selected-frame) 'minibuffer)
+				     t)]
+			 nil)
+	(add-menu-button entry-name
+			 ["Default minibuffer here"
+			  (setq default-minibuffer-frame (selected-frame))
+			  :style toggle
+			  :active (let ((mbf (frame-property
+					      (selected-frame) 'minibuffer)))
+				    (or (equal mbf (selected-frame))
+					(equal mbf t)))
+			  :selected (equal (selected-frame)
+					   default-minibuffer-frame)]
+			 nil)
+	(add-menu-button entry-name
+			 ["Make a detached minibuffer"
+			  (make-detached-minibuf)
+			  :style nil]
+			 nil))))
 
 ;;
 ;; Create a minibuffer-only frame.