Show
Ignore:
Timestamp:
2006年07月29日 07時48分34秒 (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

    r4111 r4131  
    10881088;;;###autoload 
    10891089(defvar customize-package-emacs-version-alist nil 
    1090   "Alist mapping versions of Emacs to versions of a package. 
    1091 These package versions are listed in the :package-version 
    1092 keyword used in `defcustom', `defgroup', and `defface'. Its 
    1093 elements look like this: 
     1090  "Alist mapping versions of a package to Emacs versions. 
     1091We use this for packages that have their own names, but are released 
     1092as part of Emacs itself. 
     1093 
     1094Each elements looks like this: 
    10941095 
    10951096     (PACKAGE (PVERSION . EVERSION)...) 
    10961097 
    1097 For each PACKAGE, which is a symbol, there are one or more 
    1098 elements that contain a package version PVERSION with an 
    1099 associated Emacs version EVERSION.  These versions are strings. 
    1100 For example, the MH-E package updates this alist with the 
    1101 following: 
     1098Here PACKAGE is the name of a package, as a symbol.  After 
     1099PACKAGE come one or more elements, each associating a 
     1100package version PVERSION with the first Emacs version 
     1101EVERSION in which it (or a subsequent version of PACKAGE) 
     1102was first released.  Both PVERSION and EVERSION are strings. 
     1103PVERSION should be a string that this package used in 
     1104the :package-version keyword for `defcustom', `defgroup', 
     1105and `defface'. 
     1106 
     1107For example, the MH-E package updates this alist as follows: 
    11021108 
    11031109     (add-to-list 'customize-package-emacs-version-alist 
    …… 
    11741180 
    11751181(defun customize-package-emacs-version (symbol package-version) 
    1176   "Return Emacs version of SYMBOL. 
    1177 PACKAGE-VERSION has the form (PACKAGE . VERSION).  The VERSION of 
    1178 PACKAGE is looked up in the associated list 
     1182  "Return the Emacs version in which SYMBOL's meaning last changed. 
     1183PACKAGE-VERSION has the form (PACKAGE . VERSION).  We use 
    11791184`customize-package-emacs-version-alist' to find the version of 
    1180 Emacs that is associated with it." 
     1185Emacs that is associated with version VERSION of PACKAGE." 
    11811186  (let (package-versions emacs-version) 
    11821187    ;; Use message instead of error since we want user to be able to 
    …… 
    11941199                      "customize-package-emacs-version-alist"))) 
    11951200          (t 
    1196            (message "Package %s neglected to update %s" 
     1201           (message "Package %s version %s lists no corresponding Emacs version" 
    11971202                    (car package-version) 
    1198                     "customize-package-emacs-version-alist"))) 
     1203                    (cdr package-version)))) 
    11991204    emacs-version)) 
    12001205 
    …… 
    26692674                           (cond 
    26702675                            ((eq (caar tmp) 'user) 'saved) 
    2671                             ((eq (caar tmp) 'changed) 'changed) 
     2676                            ((eq (caar tmp) 'changed) 
     2677                             (if (condition-case nil 
     2678                                     (and (null comment) 
     2679                                          (equal value 
     2680                                                 (eval 
     2681                                                  (car (get symbol 'standard-value))))) 
     2682                                   (error nil)) 
     2683                                 ;; The value was originally set outside 
     2684                                 ;; custom, but it was set to the standard 
     2685                                 ;; value (probably an autoloaded defcustom). 
     2686                                 'standard 
     2687                               'changed)) 
    26722688                            (t 'themed)) 
    26732689                         'changed)) 
    …… 
    44204436  (let ((map (make-keymap))) 
    44214437    (set-keymap-parent map widget-keymap) 
    4422     (define-key map [remap self-insert-command] 
    4423       'custom-no-edit) 
    4424     (define-key map "\^m" 'custom-no-edit) 
     4438    (define-key map [remap self-insert-command] 'custom-no-edit) 
    44254439    (define-key map " " 'scroll-up) 
    44264440    (define-key map "\177" 'scroll-down) 
    …… 
    44344448  "Keymap for `custom-mode'.") 
    44354449 
    4436 (defun custom-no-edit () 
    4437   "Refuse to allow editing of Custom buffer." 
    4438   (interactive) 
     4450(defun custom-no-edit (pos &optional event) 
     4451  "Invoke button at POS, or refuse to allow editing of Custom buffer." 
     4452  (interactive "@d") 
    44394453  (error "You can't edit this part of the Custom buffer")) 
    44404454