comparison lisp/x11/x-menubar.el @ 102:a145efe76779 r20-1b3

Import from CVS: tag r20-1b3
author cvs
date Mon, 13 Aug 2007 09:15:49 +0200
parents 4be1180a9e89
children cf808b4c4290
comparison
equal deleted inserted replaced
101:a0ec055d74dd 102:a145efe76779
552 ["Grail" (setq browse-url-browser-function 'browse-url-grail) 552 ["Grail" (setq browse-url-browser-function 'browse-url-grail)
553 :style radio 553 :style radio
554 :selected (eq browse-url-browser-function 'browse-url-grail)] 554 :selected (eq browse-url-browser-function 'browse-url-grail)]
555 ) 555 )
556 "-----" 556 "-----"
557 ["Edit Faces..." edit-faces t] 557 ["Edit Faces..." cu-edit-faces t]
558 ("Font" :filter font-menu-family-constructor) 558 ("Font" :filter font-menu-family-constructor)
559 ("Size" :filter font-menu-size-constructor) 559 ("Size" :filter font-menu-size-constructor)
560 ("Weight" :filter font-menu-weight-constructor) 560 ("Weight" :filter font-menu-weight-constructor)
561 ,@(if (featurep 'mule) 561 ,@(if (featurep 'mule)
562 '("-----" 562 '("-----"
608 ["News" view-emacs-news t] 608 ["News" view-emacs-news t]
609 ["Packages" finder-by-keyword t] 609 ["Packages" finder-by-keyword t]
610 ["Splash" xemacs-splash-buffer t]) 610 ["Splash" xemacs-splash-buffer t])
611 "-----" 611 "-----"
612 ("XEmacs FAQ" 612 ("XEmacs FAQ"
613 ["FAQ" xemacs-local-faq t] 613 ["FAQ (local)" xemacs-local-faq t]
614 ["FAQ via WWW" xemacs-www-faq t] 614 ["FAQ via WWW" xemacs-www-faq t]
615 ["Home Page" xemacs-www-page t]) 615 ["Home Page" xemacs-www-page t])
616 ("Samples" 616 ("Samples"
617 ["Sample" (find-file 617 ["Sample" (find-file
618 (expand-file-name "sample.emacs" 618 (expand-file-name "sample.emacs"
1035 language-environment-list)) 1035 language-environment-list))
1036 1036
1037 1037
1038 ;;; The Options menu 1038 ;;; The Options menu
1039 1039
1040 (defvar options-save-faces nil
1041 "if t, save-options will save all the face information.
1042 Set to nil to avoid this. This is recommended on XEmacs 19.15
1043 and above as we have a much more powerful (read: working) way
1044 of changing and saving faces via cu-edit-faces.el & custom.el.")
1045
1040 (defconst options-menu-saved-forms 1046 (defconst options-menu-saved-forms
1041 ;; This is really quite a kludge, but it gets the job done. 1047 ;; This is really quite a kludge, but it gets the job done.
1042 ;; 1048 ;;
1043 ;; remember that we have to conditionalize on default features 1049 ;; remember that we have to conditionalize on default features
1044 ;; both in the forms to evaluate and in the forms output to 1050 ;; both in the forms to evaluate and in the forms output to
1161 ;; Now save all faces. 1167 ;; Now save all faces.
1162 1168
1163 ;; Setting this in lisp conflicts with X resources. Bad move. --Stig 1169 ;; Setting this in lisp conflicts with X resources. Bad move. --Stig
1164 ;; (list 'set-face-font ''default (face-font-name 'default)) 1170 ;; (list 'set-face-font ''default (face-font-name 'default))
1165 ;; (list 'set-face-font ''modeline (face-font-name 'modeline)) 1171 ;; (list 'set-face-font ''modeline (face-font-name 'modeline))
1166 1172 (if options-save-faces
1167 (cons 'progn 1173 (cons 'progn
1168 (mapcar #'(lambda (face) 1174 (mapcar #'(lambda (face)
1169 `(make-face ',face)) 1175 `(make-face ',face))
1170 (face-list))) 1176 (face-list))))
1171 1177
1172 (cons 'progn 1178 (if options-save-faces
1173 (apply 'nconc 1179 (cons 'progn
1174 (mapcar 1180 (apply 'nconc
1175 #'(lambda (face) 1181 (mapcar
1176 (delq nil 1182 #'(lambda (face)
1177 (mapcar 1183 (delq nil
1178 #'(lambda (property) 1184 (mapcar
1179 (if (specifier-spec-list 1185 #'(lambda (property)
1180 (face-property face property)) 1186 (if (specifier-spec-list
1181 `(add-spec-list-to-specifier 1187 (face-property face property))
1182 (face-property ',face ',property) 1188 `(add-spec-list-to-specifier
1183 ',(save-options-specifier-spec-list 1189 (face-property ',face ',property)
1184 face property)))) 1190 ',(save-options-specifier-spec-list
1185 (delq 'display-table 1191 face property))))
1186 (copy-sequence 1192 (delq 'display-table
1187 built-in-face-specifiers))))) 1193 (copy-sequence
1188 (face-list)))) 1194 built-in-face-specifiers)))))
1195 (face-list)))))
1189 1196
1190 ;; Mule-specific: 1197 ;; Mule-specific:
1191 (if (featurep 'mule) 1198 (if (featurep 'mule)
1192 `(if (featurep 'mule) 1199 `(if (featurep 'mule)
1193 (set-language-environment ',(current-language-environment)))) 1200 (set-language-environment ',(current-language-environment))))