Mercurial > hg > xemacs-beta
comparison lisp/x11/x-menubar.el @ 110:fe104dbd9147 r20-1b7
Import from CVS: tag r20-1b7
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:19:45 +0200 |
parents | 360340f9fd5f |
children | 9f59509498e1 |
comparison
equal
deleted
inserted
replaced
109:e183fc049578 | 110:fe104dbd9147 |
---|---|
1207 | 1207 |
1208 (defun save-options-non-customized-face-list () | 1208 (defun save-options-non-customized-face-list () |
1209 "This function will return a list of all faces that have not been | 1209 "This function will return a list of all faces that have not been |
1210 'customized'." | 1210 'customized'." |
1211 (delq nil (mapcar '(lambda (face) | 1211 (delq nil (mapcar '(lambda (face) |
1212 (if (not (or (get face 'saved-face) | 1212 (unless (get face 'saved-face) |
1213 (get face 'factory-face))) | 1213 face)) |
1214 face)) | |
1215 (face-list)))) | 1214 (face-list)))) |
1216 | 1215 |
1217 (defun save-options-specifier-spec-list (face property) | 1216 (defun save-options-specifier-spec-list (face property) |
1218 (if (not (or (eq property 'font) (eq property 'color))) | 1217 (if (not (or (eq property 'font) (eq property 'color))) |
1219 (specifier-spec-list (face-property face property) 'global) | 1218 (specifier-spec-list (face-property face property) 'global) |
1408 (interactive "@_") | 1407 (interactive "@_") |
1409 (run-hooks 'activate-popup-menu-hook) | 1408 (run-hooks 'activate-popup-menu-hook) |
1410 (popup-menu | 1409 (popup-menu |
1411 (cond ((and global-popup-menu mode-popup-menu) | 1410 (cond ((and global-popup-menu mode-popup-menu) |
1412 (check-menu-syntax mode-popup-menu) | 1411 (check-menu-syntax mode-popup-menu) |
1413 (let ((title (car mode-popup-menu)) | 1412 (let* ((title (car mode-popup-menu)) |
1414 (items (cdr mode-popup-menu))) | 1413 (items (cdr mode-popup-menu)) |
1415 (append global-popup-menu | 1414 filters) |
1415 ;; Strip keywords from local menu for attaching them at the top | |
1416 (while (not (vectorp (car items))) | |
1417 (setq items (append filters (list (car items)))) | |
1418 (setq items (cdr items))) | |
1419 ;; If filters contains a keyword already present in | |
1420 ;; `global-popup-menu' you will probably lose. | |
1421 (append (list (car global-popup-menu)) | |
1422 filters | |
1423 (cdr global-popup-menu) | |
1416 '("---" "---") | 1424 '("---" "---") |
1417 (if popup-menu-titles (list title)) | 1425 (if popup-menu-titles (list title)) |
1418 (if popup-menu-titles '("---" "---")) | 1426 (if popup-menu-titles '("---" "---")) |
1419 items))) | 1427 items))) |
1420 (t | 1428 (t |