changeset 732:b9b8621c2439

[xemacs-hg @ 2002-01-22 14:16:38 by youngs] 2002-01-14 Björn Torkelsson <torkel@pdc.kth.se> * menubar-items.el (default-menubar): Open URLs menubar entries moved to mail-lib 2002-01-16 John Paul Wallington <jpw@shootybangbang.com> * cus-start.el: customize the builtin variable 'modifier-keys-sticky-time'. 2002-01-09 John Paul Wallington <jpw@shootybangbang.com> * help.el (describe-mode): synched with FSF 19.34; handle nil minor mode indicators.
author youngs
date Tue, 22 Jan 2002 14:16:39 +0000
parents 46d76bae9921
children b1f74adcc1ff
files lisp/ChangeLog lisp/cus-start.el lisp/help.el lisp/menubar-items.el
diffstat 4 files changed, 24 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Jan 18 18:01:04 2002 +0000
+++ b/lisp/ChangeLog	Tue Jan 22 14:16:39 2002 +0000
@@ -1,3 +1,18 @@
+2002-01-14  Björn Torkelsson  <torkel@pdc.kth.se>
+
+	* menubar-items.el (default-menubar): Open URLs menubar entries
+	  moved to mail-lib
+
+2002-01-16  John Paul Wallington  <jpw@shootybangbang.com>
+
+	* cus-start.el: customize the builtin variable
+	'modifier-keys-sticky-time'.
+
+2002-01-09  John Paul Wallington  <jpw@shootybangbang.com>
+
+	* help.el (describe-mode): synched with FSF 19.34; handle nil
+	minor mode indicators.
+
 2001-12-04  Christoph Wedler  <Christoph.Wedler@sap.com>
 
 	* window.el (window-list): Deletia.  A function with the same name,
--- a/lisp/cus-start.el	Fri Jan 18 18:01:04 2002 +0000
+++ b/lisp/cus-start.el	Tue Jan 22 14:16:39 2002 +0000
@@ -114,6 +114,9 @@
 						    :value (nil)
 						    (symbol
 						     :tag "Condition"))))
+	     (modifier-keys-sticky-time keyboard
+					(choice (integer :tag "Milliseconds")
+						(const :tag "Unbounded" 'unbounded)))
 	     ;; buffer-local
 	     (case-fold-search matching boolean)
 	     (ctl-arrow display (choice (integer 160)
--- a/lisp/help.el	Fri Jan 18 18:01:04 2002 +0000
+++ b/lisp/help.el	Tue Jan 22 14:16:39 2002 +0000
@@ -538,8 +538,11 @@
 		   (setq indicator (cdr indicator)))
 		 (while (and indicator (symbolp indicator))
 		   (setq indicator (symbol-value indicator)))
-		 (princ (format "%s minor mode (indicator%s):\n"
-				pretty-minor-mode indicator))
+		 (princ (format "%s minor mode (%s):\n"
+				pretty-minor-mode
+				(if indicator
+				    (format "indicator%s" indicator)
+				  "no indicator")))
 		 (princ (documentation minor-mode))
 		 (princ "\n\n----\n\n"))))
 	 (setq minor-modes (cdr minor-modes)))))
--- a/lisp/menubar-items.el	Fri Jan 18 18:01:04 2002 +0000
+++ b/lisp/menubar-items.el	Tue Jan 22 14:16:39 2002 +0000
@@ -898,81 +898,7 @@
 	:style toggle
 	:selected (and (boundp 'smtpmail-debug-info) smtpmail-debug-info)
 	:active (and (boundp 'send-mail-function)
-		     (eq send-mail-function 'smtpmail-send-it))]
-       "---"
-       ("%_Open URLs With"
-	["%_Emacs-W3"
-	 (customize-set-variable 'browse-url-browser-function 'browse-url-w3)
-	 :style radio
-	 :selected (and (boundp 'browse-url-browser-function)
-			(eq browse-url-browser-function 'browse-url-w3))
-	 :active (and (boundp 'browse-url-browser-function)
-		      (fboundp 'browse-url-w3)
-		      (fboundp 'w3-fetch))]
-	["%_Netscape"
-	 (customize-set-variable 'browse-url-browser-function
-				 'browse-url-netscape)
-	 :style radio
-	 :selected (and (boundp 'browse-url-browser-function)
-			(eq browse-url-browser-function 'browse-url-netscape))
-	 :active (and (boundp 'browse-url-browser-function)
-		      (fboundp 'browse-url-netscape))]
-	["%_Mosaic"
-	 (customize-set-variable 'browse-url-browser-function
-				 'browse-url-mosaic)
-	 :style radio
-	 :selected (and (boundp 'browse-url-browser-function)
-			(eq browse-url-browser-function 'browse-url-mosaic))
-	 :active (and (boundp 'browse-url-browser-function)
-		      (fboundp 'browse-url-mosaic))]
-	["Mosaic (%_CCI)"
-	 (customize-set-variable 'browse-url-browser-function 'browse-url-cci)
-	 :style radio
-	 :selected (and (boundp 'browse-url-browser-function)
-			(eq browse-url-browser-function 'browse-url-cci))
-	 :active (and (boundp 'browse-url-browser-function)
-		      (fboundp 'browse-url-cci))]
-	["%_IXI Mosaic"
-	 (customize-set-variable 'browse-url-browser-function
-				 'browse-url-iximosaic)
-	 :style radio
-	 :selected (and (boundp 'browse-url-browser-function)
-			(eq browse-url-browser-function 'browse-url-iximosaic))
-	 :active (and (boundp 'browse-url-browser-function)
-		      (fboundp 'browse-url-iximosaic))]
-	["%_Lynx (xterm)"
-	 (customize-set-variable 'browse-url-browser-function
-				 'browse-url-lynx-xterm)
-	 :style radio
-	 :selected (and (boundp 'browse-url-browser-function)
-			(eq browse-url-browser-function 'browse-url-lynx-xterm))
-	 :active (and (boundp 'browse-url-browser-function)
-		      (fboundp 'browse-url-lynx-xterm))]
-	["L%_ynx (xemacs)"
-	 (customize-set-variable 'browse-url-browser-function
-				 'browse-url-lynx-emacs)
-	 :style radio
-	 :selected (and (boundp 'browse-url-browser-function)
-			(eq browse-url-browser-function 'browse-url-lynx-emacs))
-	 :active (and (boundp 'browse-url-browser-function)
-		      (fboundp 'browse-url-lynx-emacs))]
-	["%_Grail"
-	 (customize-set-variable 'browse-url-browser-function
-				 'browse-url-grail)
-	 :style radio
-	 :selected (and (boundp 'browse-url-browser-function)
-			(eq browse-url-browser-function 'browse-url-grail))
-	 :active (and (boundp 'browse-url-browser-function)
-		      (fboundp 'browse-url-grail))]
-	["%_Kfm"
-	 (customize-set-variable 'browse-url-browser-function
-				 'browse-url-kfm)
-	 :style radio
-	 :selected (and (boundp 'browse-url-browser-function)
-			(eq browse-url-browser-function 'browse-url-kfm))
-	 :active (and (boundp 'browse-url-browser-function)
-		      (fboundp 'browse-url-kfm))]
-	))
+		     (eq send-mail-function 'smtpmail-send-it))])
       ("%_Troubleshooting"
        ["%_Debug on Error"
 	(customize-set-variable 'debug-on-error (not debug-on-error))