Show
Ignore:
Timestamp:
09/09/06 16:30:10 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp/cus-edit.el

    r4148 r4161  
    42564256              (value (get symbol 'saved-value)) 
    42574257              (requests (get symbol 'custom-requests)) 
    4258               (now (not (or (custom-variable-p symbol
    4259                             (and (not (boundp symbol)
    4260                                 (not (eq (get symbol 'force-value) 
    4261                                          'rogue)))))) 
     4258              (now (and (not (custom-variable-p symbol)
     4259                        (or (boundp symbol
     4260                            (eq (get symbol 'force-value) 
     4261                                'rogue)))) 
    42624262              (comment (get symbol 'saved-variable-comment))) 
    4263           ;; Check `requests'. 
     4263          ;; Check REQUESTS for validity.  
    42644264          (dolist (request requests) 
    42654265            (when (and (symbolp request) (not (featurep request))) 
    42664266              (message "Unknown requested feature: %s" request) 
    42674267              (setq requests (delq request requests)))) 
     4268          ;; Is there anything customized about this variable? 
    42684269          (when (or (and spec (eq (car spec) 'user)) 
    42694270                    comment 
    42704271                    (and (null spec) (get symbol 'saved-value))) 
     4272            ;; Output an element for this variable. 
     4273            ;; It has the form (SYMBOL VALUE-FORM NOW REQUESTS COMMENT). 
     4274            ;; SYMBOL is the variable name. 
     4275            ;; VALUE-FORM is an expression to return the customized value. 
     4276            ;; NOW if non-nil means always set the variable immediately 
     4277            ;; when the customizations are reloaded.  This is used 
     4278            ;; for rogue variables 
     4279            ;; REQUESTS is a list of packages to load before setting the 
     4280            ;; variable.  Each element of it will be passed to `require'. 
     4281            ;; COMMENT is whatever comment the user has specified 
     4282            ;; with the customize facility. 
    42714283            (unless (bolp) 
    42724284              (princ "\n")) 
     
    43844396  `( ,(custom-unlispify-menu-entry symbol t) 
    43854397     :filter (lambda (&rest junk) 
    4386                (let ((menu (custom-menu-create ',symbol))) 
     4398               (let* ((menu (custom-menu-create ',symbol))) 
    43874399                 (if (consp menu) (cdr menu) menu))))) 
    43884400 
     
    43914403  "Create menu for customization group SYMBOL. 
    43924404The menu is in a format applicable to `easy-menu-define'." 
    4393   (let* ((item (vector (custom-unlispify-menu-entry symbol) 
     4405  (let* ((deactivate-mark nil) 
     4406         (item (vector (custom-unlispify-menu-entry symbol) 
    43944407                       `(customize-group ',symbol) 
    43954408                       t))) 
     
    44364449  (let ((map (make-keymap))) 
    44374450    (set-keymap-parent map widget-keymap) 
    4438     (define-key map [remap self-insert-command] 'custom-no-edit) 
    4439     (define-key map "\^m" 'custom-newline) 
     4451    (define-key map [remap self-insert-command] 'Custom-no-edit) 
     4452    (define-key map "\^m" 'Custom-newline) 
    44404453    (define-key map " " 'scroll-up) 
    44414454    (define-key map "\177" 'scroll-down) 
     
    44494462  "Keymap for `custom-mode'.") 
    44504463 
    4451 (defun custom-no-edit (pos &optional event) 
     4464(defun Custom-no-edit (pos &optional event) 
    44524465  "Invoke button at POS, or refuse to allow editing of Custom buffer." 
    44534466  (interactive "@d") 
    44544467  (error "You can't edit this part of the Custom buffer")) 
    44554468 
    4456 (defun custom-newline (pos &optional event) 
     4469(defun Custom-newline (pos &optional event) 
    44574470  "Invoke button at POS, or refuse to allow editing of Custom buffer." 
    44584471  (interactive "@d")