Mercurial > hg > xemacs-beta

diff lisp/menubar-items.el @ 793:e38acbeb1cae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-29 04:46:17 by ben] lots o' fixes etc/ChangeLog: New file. Separated out all entries for etc/ into their own ChangeLog. Includes entries for the following files: etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad, etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL, etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS, etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL, etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se, etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh, etc/custom/example-themes/europe-theme.el, etc/custom/example-themes/ex-custom-file, etc/custom/example-themes/example-theme.el, etc/e/eterm.ti, etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1, etc/gnuserv.README, etc/package-index.LATEST.gpg, etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm, etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs, etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E, etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar, etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1, etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL, etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el, etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\* unicode/unicode-consortium/8859-16.TXT: New file. mule/english.el: Define this charset now, since a bug was fixed that formerly prevented it. mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be integers. Makefile.in.in: Always include gui.c, to fix compile error when TTY-only. EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo(). Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate nearly all uses of Lisp_String * in favor of Lisp_Object, and correct macros so most of them favor Lisp_Object. Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings, but at level `debug' (usually ignored). Use it when instantiating specifiers, so problems can be debugged. Move log-warning-minimum-level into C so that we can optimize ERROR_ME_DEBUG_WARN. Fix warning levels consistent with new definitions. Add default_ and parent fields to char table; not yet implemented. New fun Dynarr_verify(); use for further error checking on Dynarrs. Rearrange code at top of lisp.h in conjunction with dynarr changes. Fix eifree(). Use Eistrings in various places (format_event_object(), where_is_to_char(), and callers thereof) to avoid fixed-size strings buffers. New fun write_eistring(). Reindent and fix GPM code to follow standards. Set default MS Windows font to Lucida Console (same size as Courier New but less interline spacing, so more lines fit). Increase default frame size on Windows to 50 lines. (If that's too big for the workspace, the frame will be shrunk as necessary.) Fix problem with text files with no newlines (). (Change `convert-eol' coding system to use `nil' for autodetect, consistent with make-coding-system.) Correct compile warnings in vm-limit.c. Fix handling of reverse-direction charsets to avoid errors when opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el. Recode some object printing methods to use write_fmt_string() instead of a fixed buffer and sprintf. Turn on display of png comments as warnings (level `info'), now that they're unobtrusive. Revamped the sound documentation. Fixed bug in redisplay w.r.t. hscroll/truncation/continuation glyphs causing jumping up and down of the lines, since they're bigger than the line size. (It was seen most obviously when there's a horizontal scroll bar, e.g. do C-h a glyph or something like that.) The problem was that the glyph-contrib-p setting on glyphs was ignored even if it was set properly, which it wasn't until now.
author ben
date Fri, 29 Mar 2002 04:49:13 +0000
parents 4e83fdb13eb9
children a5954632b187
line wrap: on
line diff
--- a/lisp/menubar-items.el	Sat Mar 23 05:08:52 2002 +0000
+++ b/lisp/menubar-items.el	Fri Mar 29 04:49:13 2002 +0000
@@ -282,7 +282,7 @@
       ["%_Revert Buffer" revert-buffer
        :active (or buffer-file-name revert-buffer-function)
        :suffix (if put-buffer-names-in-file-menu (buffer-name) "")]
-      ("%_Rever%_t/Recover"
+      ("Rever%_t/Recover"
       ("Revert Buffer with Specified %_Encoding"
        :filter
        (lambda (menu)
@@ -346,6 +346,9 @@
        :active (not (one-window-p t))]
       ["Un-Split (Keep %_Others)" delete-window
        :active (not (one-window-p t))]
+      ["Balance %_Windows" balance-windows
+       :active (not (one-window-p t))]
+      ["Shrink Window to %_Fit" shrink-window-if-larger-than-buffer]
       "----"
       ("N%_arrow"
        ["%_Narrow to Region" narrow-to-region :active (region-exists-p)]
@@ -356,17 +359,58 @@
 				    (/= (point-max) (1+ (buffer-size))))]
        )
       "----"
-      ["Show Message %_Log" show-message-log]
-      "----"
       ["%_Goto Line..." goto-line]
-      ["%_What Line" what-line]
-      ("%_Bookmarks"
-       :filter bookmark-menu-filter)
+      ["Beginning of %_Defun" beginning-of-defun]
+      ["%_End of Defun" end-of-defun]
+      ["%_Count Lines in Buffer" count-lines-buffer
+       :included (not (region-active-p))]
+      ["%_Count Lines in Region" count-lines-region
+       :included (region-active-p)]
       "----"
       ["%_Jump to Previous Mark" (set-mark-command t)
        :active (mark t)]
+      ["Se%_t Bookmark" bookmark-set
+       :active (fboundp 'bookmark-set)]
+      ("%_Bookmarks"
+       :filter
+       (lambda (menu)
+	 (let ((alist (and-boundp 'bookmark-alist
+			bookmark-alist)))
+	   (if (not alist)
+	       menu
+	     (let ((items
+		    (submenu-generate-accelerator-spec
+		     (mapcar #'(lambda (bmk)
+				 `[,bmk (bookmark-jump ',bmk)])
+			     (bookmark-all-names)))))
+	       (append menu '("---") items)))))
+       "---"
+       ["Insert %_Contents" bookmark-menu-insert
+	:active (fboundp 'bookmark-menu-insert)]
+       ["Insert L%_ocation" bookmark-menu-locate
+	:active (fboundp 'bookmark-menu-locate)]
+       "---"
+       ["%_Rename Bookmark" bookmark-menu-rename
+	:active (fboundp 'bookmark-menu-rename)]
+       ("%_Delete Bookmark"
+	 :filter (lambda (menu)
+		   (submenu-generate-accelerator-spec
+		    (mapcar #'(lambda (bmk)
+				`[,bmk (bookmark-delete ',bmk)])
+			    (bookmark-all-names)))))
+       ["%_Edit Bookmark List" bookmark-bmenu-list
+	:active (and-boundp 'bookmark-alist bookmark-alist)]
+       "---"
+       ["%_Save Bookmarks"        bookmark-save
+	:active (and-boundp 'bookmark-alist bookmark-alist)]
+       ["Save Bookmarks %_As..."  bookmark-write
+	:active (and-boundp 'bookmark-alist bookmark-alist)]
+       ["%_Load a Bookmark File" bookmark-load
+	:active (fboundp 'bookmark-load)]
+       )
       )
 
+
      ("C%_mds"
       ["Repeat %_Last Complex Command..." repeat-complex-command]
       ["E%_valuate Lisp Expression..." eval-expression]
@@ -379,15 +423,11 @@
       ["E%_xecute Last Macro" call-last-kbd-macro
        :active last-kbd-macro]
       ("%_Other Macro"
+       ["Edit %_Last Macro" edit-last-kbd-macro
+	:active last-kbd-macro]
+       ["%_Edit Macro..." edit-kbd-macro]
        ["%_Append to Last Macro" (start-kbd-macro t)
 	:active (and (not defining-kbd-macro) last-kbd-macro)]
-       ["%_Query User During Macro" kbd-macro-query
-	:active defining-kbd-macro]
-       ["Enter %_Recursive Edit During Macro" (kbd-macro-query t)
-	:active defining-kbd-macro]
-       "---"
-       ["E%_xecute Last Macro on Region Lines"
-	:active (and last-kbd-macro (region-exists-p))]
        "---"
        ["%_Name Last Macro..." name-last-kbd-macro
 	:active last-kbd-macro]
@@ -395,9 +435,13 @@
 	:active (and last-kbd-macro
 		     (fboundp 'assign-last-kbd-macro-to-key))]
        "---"
-       ["%_Edit Macro..." edit-kbd-macro]
-       ["Edit %_Last Macro" edit-last-kbd-macro
-	:active last-kbd-macro]
+       ["E%_xecute Last Macro on Region Lines"
+	:active (and last-kbd-macro (region-exists-p))]
+       "---"
+       ["%_Query User During Macro" kbd-macro-query
+	:active defining-kbd-macro]
+       ["Enter %_Recursive Edit During Macro" (kbd-macro-query t)
+	:active defining-kbd-macro]
        "---"
        ["%_Insert Named Macro into Buffer..." insert-kbd-macro]
        ["Read Macro from Re%_gion" read-kbd-macro
@@ -565,7 +609,7 @@
        ["Grep %_All Files in Current Directory..."
 	grep-all-files-in-current-directory
 	:active (fboundp 'grep-all-files-in-current-directory)]
-       ["G%_rep All Files in Current Directory and Below..."
+       ["Grep All Files in Current Directory %_Recursively..."
 	grep-all-files-in-current-directory-and-below
 	:active (fboundp 'grep-all-files-in-current-directory-and-below)]
        "---"
@@ -1536,9 +1580,7 @@
       ["%_About XEmacs..." about-xemacs]
       ["%_Home Page (www.xemacs.org)" xemacs-www-page
        :active (fboundp 'browse-url)]
-      "-----"
       ["What's %_New in XEmacs" view-emacs-news]
-      ["%_Obtaining XEmacs" describe-distribution]
       "-----"
       ("%_Info (Online Docs)"
        ["Info Con%_tents" (Info-goto-node "(dir)")]
@@ -1590,7 +1632,6 @@
        ["Describe %_Key..." describe-key]
        ["Show %_Bindings" describe-bindings]
        ["Show M%_ouse Bindings" describe-pointer]
-       ["%_Recent Keys" view-lossage]
        "-----"
        ["Describe %_Function..." describe-function]
        ["Describe %_Variable..." describe-variable]
@@ -1620,7 +1661,7 @@
 	     ["Show %_Diagnosis for MULE" mule-diag :active nil]
 	     ["Show \"%_hello\" in Many Languages" view-hello-file]
 	     )))
-      ("%_Misc"
+      ("%_Other"
        ["%_Current Installation Info" describe-installation
 	:active (boundp 'Installation-string)]
        ["%_No Warranty" describe-no-warranty]
@@ -1629,7 +1670,9 @@
        ["View %_Splash Screen" xemacs-splash-buffer]
        ["%_Unix Manual..." manual-entry])
       "-----"
-      ["%_Recent Messages" view-lossage]
+      ["Recent %_Messages" (view-lossage t)]
+      ["Recent %_Keystrokes" view-lossage]
+      ["Recent %_Warnings" view-warnings]
       ["Send %_Bug Report..." report-xemacs-bug
        :active (fboundp 'report-xemacs-bug)])))
 
@@ -1656,47 +1699,6 @@
 
 (defvar put-buffer-names-in-file-menu t)
 
-
-;;; The Bookmarks menu
-
-(defun bookmark-menu-filter (&rest ignore)
-  (declare (special bookmark-alist))
-  (let ((definedp (and (boundp 'bookmark-alist)
-		       bookmark-alist
-		       t)))
-    `(,(if definedp
-	   '("%_Jump to Bookmark"
-	     :filter (lambda (&rest junk)
-		       (submenu-generate-accelerator-spec
-			(mapcar #'(lambda (bmk)
-				    `[,bmk (bookmark-jump ',bmk)])
-				(bookmark-all-names)))))
-	 ["%_Jump to Bookmark" nil nil])
-      ["Set %_Bookmark" bookmark-set
-       :active (fboundp 'bookmark-set)]
-      "---"
-      ["Insert %_Contents" bookmark-menu-insert
-       :active (fboundp 'bookmark-menu-insert)]
-      ["Insert L%_ocation" bookmark-menu-locate
-       :active (fboundp 'bookmark-menu-locate)]
-      "---"
-      ["%_Rename Bookmark" bookmark-menu-rename
-       :active (fboundp 'bookmark-menu-rename)]
-      ,(if definedp
-	   '("%_Delete Bookmark"
-	     :filter (lambda (&rest junk)
-		       (submenu-generate-accelerator-spec
-			(mapcar #'(lambda (bmk)
-				    `[,bmk (bookmark-delete ',bmk)])
-				(bookmark-all-names)))))
-	 ["%_Delete Bookmark" nil nil])
-      ["%_Edit Bookmark List" bookmark-bmenu-list	,definedp]
-      "---"
-      ["%_Save Bookmarks"        bookmark-save		,definedp]
-      ["Save Bookmarks %_As..."  bookmark-write		,definedp]
-      ["%_Load a Bookmark File" bookmark-load
-       :active (fboundp 'bookmark-load)])))
-
 ;;; The Buffers menu
 
 (defgroup buffers-menu nil