Mercurial > emacs
comparison lisp/cus-edit.el @ 91040:14c4a6aac623
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 11 Oct 2007 16:14:00 +0000 |
| parents | cd5e99697764 56754c942db2 |
| children | d38543a1c0f9 |
comparison
equal
deleted
inserted
replaced
| 91039:eefadc1e1d5e | 91040:14c4a6aac623 |
|---|---|
| 1548 "(emacs)Top") | 1548 "(emacs)Top") |
| 1549 (widget-insert ".")) | 1549 (widget-insert ".")) |
| 1550 ;; Insert custom command buttons if the toolbar is not in use. | 1550 ;; Insert custom command buttons if the toolbar is not in use. |
| 1551 | 1551 |
| 1552 (widget-insert "\n") | 1552 (widget-insert "\n") |
| 1553 (when (not (and tool-bar-mode (display-graphic-p))) | 1553 ;; tool-bar is not dumped in builds without x. |
| 1554 (when (not (and (bound-and-true-p tool-bar-mode) (display-graphic-p))) | |
| 1554 (if custom-buffer-verbose-help | 1555 (if custom-buffer-verbose-help |
| 1555 (widget-insert "\n | 1556 (widget-insert "\n |
| 1556 Operate on all settings in this buffer that are not marked HIDDEN:\n")) | 1557 Operate on all settings in this buffer that are not marked HIDDEN:\n")) |
| 1557 (let ((button (lambda (tag action active help icon) | 1558 (let ((button (lambda (tag action active help icon) |
| 1558 (widget-insert " ") | 1559 (widget-insert " ") |
| 3008 (insert tag ": *\n") | 3009 (insert tag ": *\n") |
| 3009 (widget-put widget :inactive | 3010 (widget-put widget :inactive |
| 3010 (cons value (cons from (- (point) from)))))))) | 3011 (cons value (cons from (- (point) from)))))))) |
| 3011 | 3012 |
| 3012 (defun custom-face-edit-activate (widget) | 3013 (defun custom-face-edit-activate (widget) |
| 3013 "Make face widget WIDGET inactive for user modifications." | 3014 "Make face widget WIDGET active for user modifications." |
| 3014 (let ((inactive (widget-get widget :inactive)) | 3015 (let ((inactive (widget-get widget :inactive)) |
| 3015 (inhibit-read-only t) | 3016 (inhibit-read-only t) |
| 3016 (inhibit-modification-hooks t)) | 3017 (inhibit-modification-hooks t)) |
| 3017 (when (consp inactive) | 3018 (when (consp inactive) |
| 3018 (save-excursion | 3019 (save-excursion |