diff options
| author | Luc Teirlinck | 2005-11-16 02:02:03 +0000 |
|---|---|---|
| committer | Luc Teirlinck | 2005-11-16 02:02:03 +0000 |
| commit | 08adfdbb4b56787499888b1c6780a85e223f5e07 (patch) | |
| tree | e957711ee49ddf4c7173b35e2b180c072646b6a9 | |
| parent | 19b9d1de60043bd63a3f5ca0e06dab6ab10f01df (diff) | |
| download | emacs-08adfdbb4b56787499888b1c6780a85e223f5e07.tar.gz emacs-08adfdbb4b56787499888b1c6780a85e223f5e07.zip | |
(custom-add-parent-links): Fix bug whereby, for instance,
`(fringe custom-face)' shadowed `(fringe custom-group)'
in the custom-group property of the symbol frames and the
fringe group got no link to its parent group frames.
Doc fix.
| -rw-r--r-- | lisp/cus-edit.el | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 89c6d6297c1..0bd2e9bc5a8 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el | |||
| @@ -2124,7 +2124,7 @@ Insert PREFIX first if non-nil." | |||
| 2124 | 2124 | ||
| 2125 | (defun custom-add-parent-links (widget &optional initial-string) | 2125 | (defun custom-add-parent-links (widget &optional initial-string) |
| 2126 | "Add \"Parent groups: ...\" to WIDGET if the group has parents. | 2126 | "Add \"Parent groups: ...\" to WIDGET if the group has parents. |
| 2127 | The value if non-nil if any parents were found. | 2127 | The value is non-nil if any parents were found. |
| 2128 | If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." | 2128 | If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." |
| 2129 | (let ((name (widget-value widget)) | 2129 | (let ((name (widget-value widget)) |
| 2130 | (type (widget-type widget)) | 2130 | (type (widget-type widget)) |
| @@ -2133,15 +2133,14 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." | |||
| 2133 | (parents nil)) | 2133 | (parents nil)) |
| 2134 | (insert (or initial-string "Parent groups:")) | 2134 | (insert (or initial-string "Parent groups:")) |
| 2135 | (mapatoms (lambda (symbol) | 2135 | (mapatoms (lambda (symbol) |
| 2136 | (let ((entry (assq name (get symbol 'custom-group)))) | 2136 | (when (member (list name type) (get symbol 'custom-group)) |
| 2137 | (when (eq (nth 1 entry) type) | 2137 | (insert " ") |
| 2138 | (insert " ") | 2138 | (push (widget-create-child-and-convert |
| 2139 | (push (widget-create-child-and-convert | 2139 | widget 'custom-group-link |
| 2140 | widget 'custom-group-link | 2140 | :tag (custom-unlispify-tag-name symbol) |
| 2141 | :tag (custom-unlispify-tag-name symbol) | 2141 | symbol) |
| 2142 | symbol) | 2142 | buttons) |
| 2143 | buttons) | 2143 | (setq parents (cons symbol parents))))) |
| 2144 | (setq parents (cons symbol parents)))))) | ||
| 2145 | (and (null (get name 'custom-links)) ;No links of its own. | 2144 | (and (null (get name 'custom-links)) ;No links of its own. |
| 2146 | (= (length parents) 1) ;A single parent. | 2145 | (= (length parents) 1) ;A single parent. |
| 2147 | (let* ((links (get (car parents) 'custom-links)) | 2146 | (let* ((links (get (car parents) 'custom-links)) |