diff options
| author | Richard M. Stallman | 2007-12-29 19:26:14 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2007-12-29 19:26:14 +0000 |
| commit | 8ed10e73798ef28d87d393db73f5cf0c258a9df5 (patch) | |
| tree | 3628b18c455f9acd390efe75c997c0fc3704cfe6 | |
| parent | 4fed1740bd3d843e21f18b4eac599c203f5378fa (diff) | |
| download | emacs-8ed10e73798ef28d87d393db73f5cf0c258a9df5.tar.gz emacs-8ed10e73798ef28d87d393db73f5cf0c258a9df5.zip | |
(custom-add-parent-links): Fill the "Parent documentation" text.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ab19236752..2e4ff332ce6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -12,6 +12,11 @@ | |||
| 12 | * facemenu.el (list-colors-print): Use :background and :foreground | 12 | * facemenu.el (list-colors-print): Use :background and :foreground |
| 13 | instead of background-color and foreground-color. | 13 | instead of background-color and foreground-color. |
| 14 | 14 | ||
| 15 | 2007-12-29 Drew Adams <drew.adams@oracle.com> | ||
| 16 | |||
| 17 | * cus-edit.el (custom-add-parent-links): | ||
| 18 | Fill the "Parent documentation" text. | ||
| 19 | |||
| 15 | 2007-12-29 Eli Zaretskii <eliz@gnu.org> | 20 | 2007-12-29 Eli Zaretskii <eliz@gnu.org> |
| 16 | 21 | ||
| 17 | * textmodes/ispell.el (ispell-grep-command): Use "grep" on | 22 | * textmodes/ispell.el (ispell-grep-command): Use "grep" on |
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 40ff46f1675..7fccf0c6130 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el | |||
| @@ -1412,7 +1412,7 @@ that are not customizable options, as well as faces and groups | |||
| 1412 | (defun customize-apropos-options (regexp &optional arg) | 1412 | (defun customize-apropos-options (regexp &optional arg) |
| 1413 | "Customize all loaded customizable options matching REGEXP. | 1413 | "Customize all loaded customizable options matching REGEXP. |
| 1414 | With prefix arg, include variables that are not customizable options | 1414 | With prefix arg, include variables that are not customizable options |
| 1415 | \(but we recommend using `apropos-variable' instead)." | 1415 | \(but it is better to use `apropos-variable' if you want to find those)." |
| 1416 | (interactive "sCustomize options (regexp): \nP") | 1416 | (interactive "sCustomize options (regexp): \nP") |
| 1417 | (customize-apropos regexp (or arg 'options))) | 1417 | (customize-apropos regexp (or arg 'options))) |
| 1418 | 1418 | ||
| @@ -2341,6 +2341,8 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." | |||
| 2341 | (get (car parents) 'custom-links)))) | 2341 | (get (car parents) 'custom-links)))) |
| 2342 | (many (> (length links) 2))) | 2342 | (many (> (length links) 2))) |
| 2343 | (when links | 2343 | (when links |
| 2344 | (let ((pt (point)) | ||
| 2345 | (left-margin (+ left-margin 2))) | ||
| 2344 | (insert "\nParent documentation: ") | 2346 | (insert "\nParent documentation: ") |
| 2345 | (while links | 2347 | (while links |
| 2346 | (push (widget-create-child-and-convert | 2348 | (push (widget-create-child-and-convert |
| @@ -2357,7 +2359,9 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." | |||
| 2357 | (insert ", and ") | 2359 | (insert ", and ") |
| 2358 | (insert " and "))) | 2360 | (insert " and "))) |
| 2359 | (t | 2361 | (t |
| 2360 | (insert ", "))))))) | 2362 | (insert ", ")))) |
| 2363 | (fill-region-as-paragraph pt (point)) | ||
| 2364 | (delete-to-left-margin (1+ pt) (+ pt 2)))))) | ||
| 2361 | (if parents | 2365 | (if parents |
| 2362 | (insert "\n") | 2366 | (insert "\n") |
| 2363 | (delete-region start (point))) | 2367 | (delete-region start (point))) |