Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 414-422)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 128-130)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108

1 files changed, 23 insertions, 10 deletions

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 609b5572a08..c31e319f798 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4255,19 +4255,31 @@ This function does not save the buffer."
 	(let ((spec (car-safe (get symbol 'theme-value)))
 	      (value (get symbol 'saved-value))
 	      (requests (get symbol 'custom-requests))
-	      (now (not (or (custom-variable-p symbol)
-			    (and (not (boundp symbol))
-				 (not (eq (get symbol 'force-value)
-					  'rogue))))))
+	      (now (and (not (custom-variable-p symbol))
+			(or (boundp symbol)
+			    (eq (get symbol 'force-value)
+				'rogue))))
 	      (comment (get symbol 'saved-variable-comment)))
-	  ;; Check `requests'.
+	  ;; Check REQUESTS for validity. 
 	  (dolist (request requests)
 	    (when (and (symbolp request) (not (featurep request)))
 	      (message "Unknown requested feature: %s" request)
 	      (setq requests (delq request requests))))
+	  ;; Is there anything customized about this variable?
 	  (when (or (and spec (eq (car spec) 'user))
 		    comment
 		    (and (null spec) (get symbol 'saved-value)))
+	    ;; Output an element for this variable.
+	    ;; It has the form (SYMBOL VALUE-FORM NOW REQUESTS COMMENT).
+	    ;; SYMBOL is the variable name.
+	    ;; VALUE-FORM is an expression to return the customized value.
+	    ;; NOW if non-nil means always set the variable immediately
+	    ;; when the customizations are reloaded.  This is used
+	    ;; for rogue variables
+	    ;; REQUESTS is a list of packages to load before setting the
+	    ;; variable.  Each element of it will be passed to `require'.
+	    ;; COMMENT is whatever comment the user has specified
+	    ;; with the customize facility.
 	    (unless (bolp)
 	      (princ "\n"))
 	    (princ " '(")
@@ -4383,7 +4395,8 @@ This function does not save the buffer."
   "Ignoring WIDGET, create a menu entry for customization group SYMBOL."
   `( ,(custom-unlispify-menu-entry symbol t)
      :filter (lambda (&rest junk)
-	       (let ((menu (custom-menu-create ',symbol)))
+	       (let* ((deactivate-mark nil)
+		      (menu (custom-menu-create ',symbol)))
 		 (if (consp menu) (cdr menu) menu)))))
 
 ;;;###autoload
@@ -4435,8 +4448,8 @@ The format is suitable for use with `easy-menu-define'."
   ;; Actually, this misfeature of dense keymaps was fixed on 2001-11-26.
   (let ((map (make-keymap)))
     (set-keymap-parent map widget-keymap)
-    (define-key map [remap self-insert-command] 'custom-no-edit)
-    (define-key map "\^m" 'custom-newline)
+    (define-key map [remap self-insert-command] 'Custom-no-edit)
+    (define-key map "\^m" 'Custom-newline)
     (define-key map " " 'scroll-up)
     (define-key map "\177" 'scroll-down)
     (define-key map "\C-c\C-c" 'Custom-set)
@@ -4448,12 +4461,12 @@ The format is suitable for use with `easy-menu-define'."
     map)
   "Keymap for `custom-mode'.")
 
-(defun custom-no-edit (pos &optional event)
+(defun Custom-no-edit (pos &optional event)
   "Invoke button at POS, or refuse to allow editing of Custom buffer."
   (interactive "@d")
   (error "You can't edit this part of the Custom buffer"))
 
-(defun custom-newline (pos &optional event)
+(defun Custom-newline (pos &optional event)
   "Invoke button at POS, or refuse to allow editing of Custom buffer."
   (interactive "@d")
   (let ((button (get-char-property pos 'button)))