xemacs-beta: lisp/w3/w3-menu.el comparison

comparison lisp/w3/w3-menu.el @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2

author	cvs
date	Mon, 13 Aug 2007 08:46:35 +0200
parents	376386a54a3c
children	9ee227acff29

comparison

equal deleted inserted replaced

-:c0c6a60d29db
+:ac2d302a0011
-;;; $RCSFile: w3-menu.el,v $ --- menu functions for emacs-w3
+;;; w3-menu.el --- Menu functions for emacs-w3
 ;; Author: wmperry
-;; Created: 1996/06/03 17:35:14
+;; Created: 1996/07/21 18:29:01
-;; Version: 1.28
+;; Version: 1.7
 ;; Keywords: menu, hypermedia
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Copyright (c) 1996 by William M. Perry (wmperry@spry.com)
+;;; Copyright (c) 1996 by William M. Perry (wmperry@cs.indiana.edu)
 ;;;
 ;;; This file is part of GNU Emacs.
 ;;;
 ;;; GNU Emacs is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
 (defun w3-toggle-menubar ()
 (interactive)
 (cond
 ;; XEmacs style
-((and w3-running-xemacs (w3-menubar-active))
-;; Turn the menubar off
-(setq current-menubar nil))
 (w3-running-xemacs
-;; Turn the menubar on
+(set-specifier menubar-visible-p (cons (current-buffer)
-(w3-menu-install-menus))
+					   (not (specifier-instance
+						 menubar-visible-p)))))
 ;; Emacs 19 style
 (t
 (menu-bar-mode (if (w3-menubar-active) -1 1)))))
 (defun w3-location-active ()
 (specifier-instance has-modeline-p (selected-window))
 t))
 (defun w3-menubar-active ()
 (if w3-running-xemacs
-(and (featurep 'menubar) current-menubar)
+(and (featurep 'menubar) (specifier-instance menubar-visible-p))
 (and (boundp 'menu-bar-mode) menu-bar-mode)))
 (defun w3-menu-global-menubar ()
 (if w3-running-xemacs
 (default-value 'default-menubar)
 )
 "W3 menu bookmark list.")
 (defconst w3-menu-options-menu
 (list "Options"
+	["Edit Preferences" w3-preferences-edit t]
+	"---"
 	["Show Menubar" w3-toggle-menubar
 	 :style toggle :selected (w3-menubar-active)]
 	(if (and w3-running-xemacs (featurep 'toolbar))
 	    ["Show Toolbar" w3-toggle-toolbar
 	     :style toggle :selected (w3-toolbar-active)]
 	["Auto Load Images"
 	 (setq w3-delay-image-loads (not w3-delay-image-loads))
 	 :style toggle :selected (not w3-delay-image-loads)]
 	["Flush Image Cache" (setq w3-graphics-list nil) w3-graphics-list]
 	"----"
-	["Privacy Mode" (progn
-			  (setq url-privacy-level
-				(if (eq 'paranoid url-privacy-level)
-				    'none
-				  'paranoid))
-			  (url-setup-privacy-info))
-	 :style toggle :selected (not (eq url-privacy-level 'none))]
-	["Color Printing" (setq ps-print-color-p (not ps-print-color-p))
-	 :style toggle :selected (and (boundp 'ps-print-color-p)
-				      ps-print-color-p)]
-	["Honor Automatic Refreshes"
-	 (setq url-honor-refresh-requests (not url-honor-refresh-requests))
-	 :style toggle :selected (not (null url-honor-refresh-requests))]
-	"----"
 	["Download to disk" (setq w3-dump-to-disk (not w3-dump-to-disk))
 	 :style toggle :selected w3-dump-to-disk]
 	["Caching" (setq url-automatic-caching (not url-automatic-caching))
 	 :style toggle :selected url-automatic-caching]
 	["Use Cache Only"
 	 (setq url-standalone-mode (not url-standalone-mode))
 	 :style toggle :selected url-standalone-mode]
-	"----"
-	["Fancy Gopher"
-	 (setq url-use-hypertext-gopher (not url-use-hypertext-gopher))
-	 :style toggle :selected url-use-hypertext-gopher]
-	["Fancy Directory Listings"
-	 (setq url-use-hypertext-dired (not url-use-hypertext-dired))
-	 :style toggle :selected url-use-hypertext-dired]
 	"----"
 	["Save Options" w3-menu-save-options t]
 	)
 "W3 menu options list.")
 :style toggle :selected (and w3-honor-stylesheets
 				 w3-style-ie-compatibility)]
 ["Honor Color Requests" (setq w3-user-colors-take-precedence
 				 (not w3-user-colors-take-precedence))
 :style toggle :selected (not w3-user-colors-take-precedence)]
+"---"
+["Reload Stylesheets" w3-refresh-stylesheets t]
 )
 "W3 menu style list.")
 (defconst w3-menu-buffer-menu
 (if w3-running-xemacs
 (w3-menu-initialize-w3-mode-menu-map)
 (define-key w3-mode-map [menu-bar]
 (lookup-key w3-mode-menu-map [rootmenu])))))
 (defun w3-menu-install-menus ()
-(cond ((consp w3-use-menus)
+(cond ((= emacs-minor-version 28)	; Hey, get with the times people!!
+	 nil)
+	((consp w3-use-menus)
 	 (w3-menu-install-menubar))
 	((eq w3-use-menus 1)
 	 (w3-menu-install-menubar-item))
 	(t nil)))
 						   (not (listp val))))
 					  val
 					(list 'quote val))))))
 		   (if var (princ "\n"))))
 		'(
+		  ps-print-color-p
+		  url-automatic-caching
+		  url-be-asynchronous
+		  url-honor-refresh-requests
+		  url-privacy-level
+		  url-proxy-services
+		  url-standalone-mode
+		  url-use-hypertext-dired
+		  url-use-hypertext-gopher
+		  w3-color-filter
+		  w3-color-use-reducing
+		  w3-default-homepage
+		  w3-default-stylesheet
 		  w3-delay-image-loads
-		  w3-delay-mpeg-loads
+		  w3-do-incremental-display
-		  ps-print-color-p
-		  w3-color-use-reducing
-		  w3-color-filter
 		  w3-dump-to-disk
+		  w3-file-done-hook
+		  w3-file-prepare-hook
+		  w3-honor-stylesheets
+		  w3-image-mappings
+		  w3-load-hook
+		  w3-mode-hook
+		  w3-netscape-compatible-comments
+		  w3-preferences-cancel-hook
+		  w3-preferences-default-hook
+		  w3-preferences-ok-hook
+		  w3-preferences-setup-hook
+		  w3-source-file-hook
+		  w3-style-ie-compatibility
+		  w3-toolbar-orientation
+		  w3-toolbar-type
+		  w3-use-menus
 		  w3-user-colors-take-precedence
-		  w3-do-incremental-display
-		  url-automatic-caching
-		  url-standalone-mode
-		  url-use-hypertext-gopher
-		  url-use-hypertext-dired
-		  url-proxy-services
-		  url-be-asynchronous
-		  w3-default-homepage
-		  url-privacy-level
-		  w3-toolbar-orientation
 		  )
 		)
 	(princ ";; ==========================\n")
 	(princ ";; End of W3 Options Settings\n")))
 (set-marker output-marker nil)

Mercurial > hg > xemacs-beta

comparison lisp/w3/w3-menu.el @ 2:ac2d302a0011 r19-15b2