comparison lisp/x11/x-menubar.el @ 32:e04119814345 r19-15b99

Import from CVS: tag r19-15b99
author cvs
date Mon, 13 Aug 2007 08:52:56 +0200
parents ec9a17fef872
children 8d2a9b52c682
comparison
equal deleted inserted replaced
31:b9328a10c56c 32:e04119814345
125 ["Random Flames" flame t] 125 ["Random Flames" flame t]
126 ["Dunnet (Adventure)" dunnet t] 126 ["Dunnet (Adventure)" dunnet t]
127 ["Towers of Hanoi" hanoi t] 127 ["Towers of Hanoi" hanoi t]
128 ["Game of Life" life t] 128 ["Game of Life" life t]
129 ["Multiplication Puzzle" mpuz t] 129 ["Multiplication Puzzle" mpuz t]
130 ["Mine Game" mine t]
130 ) 131 )
131 ) 132 )
132 133
133 ("Options" 134 ("Options"
134 ,custom-help-menu 135 ,custom-help-menu
1178 1179
1179 (defun save-options-non-customized-face-list () 1180 (defun save-options-non-customized-face-list ()
1180 "This function will return a list of all faces that have not been 1181 "This function will return a list of all faces that have not been
1181 'customized'." 1182 'customized'."
1182 (delq nil (mapcar '(lambda (face) 1183 (delq nil (mapcar '(lambda (face)
1183 (if (not (or (get face 'saved-face) 1184 (unless (get face 'saved-face)
1184 (get face 'factory-face))) 1185 face))
1185 face))
1186 (face-list)))) 1186 (face-list))))
1187 1187
1188 (defun save-options-specifier-spec-list (face property) 1188 (defun save-options-specifier-spec-list (face property)
1189 (if (not (or (eq property 'font) (eq property 'color))) 1189 (if (not (or (eq property 'font) (eq property 'color)))
1190 (specifier-spec-list (face-property face property) 'global) 1190 (specifier-spec-list (face-property face property) 'global)
1398 (interactive "@_") 1398 (interactive "@_")
1399 (run-hooks 'activate-popup-menu-hook) 1399 (run-hooks 'activate-popup-menu-hook)
1400 (popup-menu 1400 (popup-menu
1401 (cond ((and global-popup-menu mode-popup-menu) 1401 (cond ((and global-popup-menu mode-popup-menu)
1402 (check-menu-syntax mode-popup-menu) 1402 (check-menu-syntax mode-popup-menu)
1403 (let ((title (car mode-popup-menu)) 1403 (let* ((title (car mode-popup-menu))
1404 (items (cdr mode-popup-menu))) 1404 (items (cdr mode-popup-menu))
1405 (append global-popup-menu 1405 filters)
1406 ;; Strip keywords from local menu for attaching them at the top
1407 (while (not (vectorp (car items)))
1408 (setq items (append filters (list (car items))))
1409 (setq items (cdr items)))
1410 ;; If filters contains a keyword already present in
1411 ;; `global-popup-menu' you will probably lose.
1412 (append (list (car global-popup-menu))
1413 filters
1414 (cdr global-popup-menu)
1406 '("---" "---") 1415 '("---" "---")
1407 (if popup-menu-titles (list title)) 1416 (if popup-menu-titles (list title))
1408 (if popup-menu-titles '("---" "---")) 1417 (if popup-menu-titles '("---" "---"))
1409 items))) 1418 items)))
1410 (t 1419 (t