X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmenubar-items.el;h=1c410a35923f0623168c95c69906ed97816de6ff;hb=1b70edcd9999965aafe4533453eb6b353b349898;hp=31e54a65a721d52376b35fdd5657763f55e74f72;hpb=98a6e4055a1fa624c592ac06f79287d55196ca37;p=chise%2Fxemacs-chise.git.1 diff --git a/lisp/menubar-items.el b/lisp/menubar-items.el index 31e54a6..1c410a3 100644 --- a/lisp/menubar-items.el +++ b/lisp/menubar-items.el @@ -54,10 +54,18 @@ ;;; Code: -(defun menu-truncate-list (list n) - (if (<= (length list) n) - list - (butlast list (- (length list) n)))) +(defun Menubar-items-truncate-history (list count label-length) + "Truncate a history LIST to first COUNT items. +Return a list of (label value) lists with labels truncated to last +LABEL-LENGTH characters of value." + (mapcar #'(lambda (x) + (if (<= (length x) label-length) + (list x x) + (list + (concat "..." (substring x (- label-length))) x))) + (if (<= (length list) count) + list + (butlast list (- (length list) count))))) (defun submenu-generate-accelerator-spec (list &optional omit-chars-list) "Add auto-generated accelerator specifications to a submenu. @@ -139,15 +147,19 @@ which will not be used as accelerators." ["Save %_As..." write-file] ["Save So%_me Buffers" save-some-buffers] "-----" + ,@(if (valid-specifier-tag-p 'msprinter) + '(["Page Set%_up..." generic-page-setup])) ["%_Print" generic-print-buffer :active (or (valid-specifier-tag-p 'msprinter) (and (not (eq system-type 'windows-nt)) - (fboundp 'lpr-buffer))) - :suffix (if put-buffer-names-in-file-menu (concat (buffer-name) "...") - "...")] - ["Prett%_y-Print" ps-print-buffer-with-faces - :active (fboundp 'ps-print-buffer-with-faces) - :suffix (if put-buffer-names-in-file-menu (buffer-name) "")] + (fboundp 'lpr-region))) + :suffix (if (region-active-p) "Selection..." + (if put-buffer-names-in-file-menu (concat (buffer-name) "...") + "..."))] + ,@(unless (valid-specifier-tag-p 'msprinter) + '(["Prett%_y-Print" ps-print-buffer-with-faces + :active (fboundp 'ps-print-buffer-with-faces) + :suffix (if put-buffer-names-in-file-menu (buffer-name) "")])) "-----" ["%_Revert Buffer" revert-buffer :active (or buffer-file-name revert-buffer-function) @@ -226,7 +238,8 @@ which will not be used as accelerators." ("%_View" ["%_New Frame" make-frame] - ["Frame on Other Displa%_y..." make-frame-on-display] + ["Frame on Other Displa%_y..." make-frame-on-display + :active (fboundp 'make-frame-on-display)] ["%_Delete Frame" delete-frame :active (not (eq (next-frame (selected-frame) 'nomini 'window-system) (selected-frame)))] @@ -401,13 +414,13 @@ which will not be used as accelerators." ;; hack-o-matic, we can't force a load of package-base here ;; since it triggers dialog box interactions which we can't ;; deal with while using a menu - ("Using %_Custom" + ("Using %_Custom" :filter (lambda (&rest junk) (if package-get-base (submenu-generate-accelerator-spec (cdr (custom-menu-create 'packages))) '("Please load Package Index")))) - + ["%_Help" (Info-goto-node "(xemacs)Packages")]) ("%_Internet" ["Read Mail %_1 (VM)..." vm @@ -428,10 +441,11 @@ which will not be used as accelerators." menu (let ((items (submenu-generate-accelerator-spec - (mapcar #'(lambda (string) - (vector string - (list 'grep string))) - (menu-truncate-list grep-history 10))))) + (mapcar #'(lambda (label-value) + (vector (first label-value) + (list 'grep (second label-value)))) + (Menubar-items-truncate-history + grep-history 10 50))))) (append menu '("---") items)))) ["%_Grep..." grep :active (fboundp 'grep)] ["%_Kill Grep" kill-compilation @@ -536,10 +550,11 @@ which will not be used as accelerators." menu (let ((items (submenu-generate-accelerator-spec - (mapcar #'(lambda (string) - (vector string - (list 'compile string))) - (menu-truncate-list compile-history 10))))) + (mapcar #'(lambda (label-value) + (vector (first label-value) + (list 'compile (second label-value)))) + (Menubar-items-truncate-history + compile-history 10 50))))) (append menu '("---") items)))) ["%_Compile..." compile :active (fboundp 'compile)] ["%_Repeat Compilation" recompile :active (fboundp 'recompile)] @@ -703,16 +718,10 @@ which will not be used as accelerators." :style toggle :selected (and (boundp 'pending-delete-mode) pending-delete-mode) :active (boundp 'pending-delete-mode)] - ("`%_kill-line' Behavior..." - ["Kill %_Whole Line" - (customize-set-variable 'kill-whole-line 'always) - :style radio :selected (eq kill-whole-line 'always)] - ["Kill to %_End of Line" - (customize-set-variable 'kill-whole-line nil) - :style radio :selected (eq kill-whole-line nil)] - ["Kill Whole Line at %_Beg, Otherwise to End" - (customize-set-variable 'kill-whole-line t) - :style radio :selected (eq kill-whole-line t)]) + ["`%_kill-line' Kills Whole Line at %_Beg" + (customize-set-variable 'kill-whole-line (not kill-whole-line)) + :style toggle + :selected kill-whole-line] ["Size for %_Block-Movement Commands..." (customize-set-variable 'block-movement-size (read-number "Block Movement Size: " @@ -724,6 +733,17 @@ which will not be used as accelerators." :style toggle :selected (and (boundp 'viper-mode) viper-mode) :active (fboundp 'toggle-viper-mode)] "----" + ["S%_hifted Motion Keys Select Region" + (customize-set-variable 'shifted-motion-keys-select-region + (not shifted-motion-keys-select-region)) + :style toggle + :selected shifted-motion-keys-select-region] + ["%_After Shifted Motion, Unshifted Motion Keys Deselect" + (customize-set-variable 'unshifted-motion-keys-deselect-region + (not unshifted-motion-keys-deselect-region)) + :style toggle + :selected unshifted-motion-keys-deselect-region] + "----" ["%_Set Key..." global-set-key] ["%_Unset Key..." global-unset-key] "---" @@ -877,6 +897,14 @@ which will not be used as accelerators." :active (and (boundp 'browse-url-browser-function) (fboundp 'browse-url-w3) (fboundp 'w3-fetch))] + ["Emacs-%_W3 (gnudoit)" + (customize-set-variable 'browse-url-browser-function 'browse-url-w3-gnudoit) + :style radio + :selected (and (boundp 'browse-url-browser-function) + (eq browse-url-browser-function + 'browse-url-w3-gnudoit)) + :active (and (boundp 'browse-url-browser-function) + (fboundp 'browse-url-w3-gnudoit))] ["%_Netscape" (customize-set-variable 'browse-url-browser-function 'browse-url-netscape) @@ -932,15 +960,67 @@ which will not be used as accelerators." (eq browse-url-browser-function 'browse-url-grail)) :active (and (boundp 'browse-url-browser-function) (fboundp 'browse-url-grail))] - ["%_Kfm" + ["%_KDE" + (customize-set-variable 'browse-url-browser-function + 'browse-url-kde) + :style radio + :selected (and (boundp 'browse-url-browser-function) + (eq browse-url-browser-function 'browse-url-kde)) + :active (and (boundp 'browse-url-browser-function) + (fboundp 'browse-url-kde))] + ["Mo%_zilla" + (customize-set-variable 'browse-url-browser-function + 'browse-url-mozilla) + :style radio + :selected (and (boundp 'browse-url-browser-function) + (eq browse-url-browser-function 'browse-url-mozilla)) + :active (and (boundp 'browse-url-browser-function) + (fboundp 'browse-url-mozilla))] + ["G%_aleon" + (customize-set-variable 'browse-url-browser-function + 'browse-url-galeon) + :style radio + :selected (and (boundp 'browse-url-browser-function) + (eq browse-url-browser-function 'browse-url-galeon)) + :active (and (boundp 'browse-url-browser-function) + (fboundp 'browse-url-galeon))] + ["%_Opera" + (customize-set-variable 'browse-url-browser-function + 'browse-url-opera) + :style radio + :selected (and (boundp 'browse-url-browser-function) + (eq browse-url-browser-function 'browse-url-opera)) + :active (and (boundp 'browse-url-browser-function) + (fboundp 'browse-url-opera))] + ["%_MMM" + (customize-set-variable 'browse-url-browser-function + 'browse-url-mmm) + :style radio + :selected (and (boundp 'browse-url-browser-function) + (eq browse-url-browser-function 'browse-url-mmm)) + :active (and (boundp 'browse-url-browser-function) + (fboundp 'browse-url-mmm))] + ["MS-Windows Default %_Browser" + (customize-set-variable 'browse-url-browser-function + 'browse-url-default-windows-browser) + :style radio + :selected (and (boundp 'browse-url-browser-function) + (eq browse-url-browser-function + 'browse-url-default-windows-browser)) + :active (and (boundp 'browse-url-browser-function) + (fboundp 'mswindows-shell-execute) + (fboundp 'browse-url-default-windows-browser))] + ["G%_eneric Browser" (customize-set-variable 'browse-url-browser-function - 'browse-url-kfm) + 'browse-url-generic) :style radio :selected (and (boundp 'browse-url-browser-function) - (eq browse-url-browser-function 'browse-url-kfm)) + (eq browse-url-browser-function 'browse-url-generic)) :active (and (boundp 'browse-url-browser-function) - (fboundp 'browse-url-kfm))] - )) + (boundp 'browse-url-generic-program) + browse-url-generic-program + (fboundp 'browse-url-generic))] + )) ("%_Troubleshooting" ["%_Debug on Error" (customize-set-variable 'debug-on-error (not debug-on-error)) @@ -968,17 +1048,32 @@ which will not be used as accelerators." (not scrollbars-visible-p)) :style toggle :selected scrollbars-visible-p])) - ["%_3D Modeline" - (customize-set-variable 'modeline-3d-p - (not modeline-3d-p)) - :style toggle - :selected modeline-3d-p] ["%_Wrap Long Lines" (progn;; becomes buffer-local (setq truncate-lines (not truncate-lines)) (customize-set-variable 'truncate-lines truncate-lines)) :style toggle :selected (not truncate-lines)] + "----" + ["%_3D Modeline" + (customize-set-variable 'modeline-3d-p + (not modeline-3d-p)) + :style toggle + :selected modeline-3d-p] + ("Modeline %_Horizontal Scrolling" + ["%_None" + (customize-set-variable 'modeline-scrolling-method nil) + :style radio + :selected (not modeline-scrolling-method)] + ["As %_Text" + (customize-set-variable 'modeline-scrolling-method t) + :style radio + :selected (eq modeline-scrolling-method t)] + ["As %_Scrollbar" + (customize-set-variable 'modeline-scrolling-method 'scrollbar) + :style radio + :selected (eq modeline-scrolling-method 'scrollbar)] + ) ,@(if (featurep 'toolbar) '("---" ["%_Toolbars Visible" @@ -1105,7 +1200,7 @@ which will not be used as accelerators." (not column-number-mode)) (redraw-modeline)) :style toggle :selected column-number-mode] - + ("\"Other %_Window\" Location" ["%_Always in Same Frame" (customize-set-variable @@ -1156,7 +1251,7 @@ which will not be used as accelerators." :selected (and (boundp 'gnuserv-frame) (eq gnuserv-frame t)) :active (boundp 'gnuserv-frame)] ) - ) + ) ("%_Menubars" ["%_Frame-Local Font Menu" (customize-set-variable 'font-menu-this-frame-only-p @@ -1402,7 +1497,7 @@ which will not be used as accelerators." ("%_Help" ["%_About XEmacs..." about-xemacs] "-----" - ["XEmacs %_News" view-emacs-news] + ["What's %_New in XEmacs" view-emacs-news] ["%_Obtaining XEmacs" describe-distribution] "-----" ("%_Info (Online Docs)" @@ -1420,13 +1515,18 @@ which will not be used as accelerators." ("%_Tutorials" :filter tutorials-menu-filter) ("%_Samples" - ["Sample .%_emacs" - (find-file (locate-data-file "sample.emacs")) - :active (locate-data-file "sample.emacs")] + ["Sample %_init.el" + (find-file (locate-data-file "sample.init.el")) + :active (locate-data-file "sample.init.el")] + ["Sample .%_gtkrc" + (find-file (locate-data-file "sample.gtkrc")) + :included (featurep 'gtk) + :active (locate-data-file "sample.gtkrc")] ["Sample .%_Xdefaults" (find-file (locate-data-file "sample.Xdefaults")) + :included (featurep 'x) :active (locate-data-file "sample.Xdefaults")] - ["Sample e%_nriched" + ["Sample %_enriched" (find-file (locate-data-file "enriched.doc")) :active (locate-data-file "enriched.doc")]) ("%_Commands & Keys" @@ -1452,8 +1552,8 @@ which will not be used as accelerators." ["Find %_Packages" finder-by-keyword] ["View %_Splash Screen" xemacs-splash-buffer] ["%_Unix Manual..." manual-entry]) - ["Send %_Bug Report..." report-emacs-bug - :active (fboundp 'report-emacs-bug)]))) + ["Send %_Bug Report..." report-xemacs-bug + :active (fboundp 'report-xemacs-bug)]))) (defun maybe-add-init-button ()