Re: Changes in the menu bar

[Eli Zaretskii]

> Date: Mon, 26 Nov 2001 14:25:00 -0700 (MST)
> From: Richard Stallman <address@hidden>
> 
>     And changing the wording in the menu from "Apropos Variable" to
>     "Variable Matching Regexp" is a negligible price to pay for making
>     the feature more accessible to the newbies.
> 
> I agree.  "Variable Matching Regexp" is a better name,
> but I am not sure it is the best we can find.
> 
>     I like it; I think something like `Show Matching Variables' (&c) would
>     be a bit more consistent with the rest of the menu though.
> 
> I think that is a good name.
> 
>     Of course then my suggestion of `General Apropos' becomes not so good,
>     because it doesn't match the others, and I'm not really sure _what_
>     you'd call it under this alternate scheme... `Show Matching Stuff'?  [eek]
> 
> Maybe `Show Matching Names' or `Show Matching Anything'.

How about the changes below?

Index: lisp/menu-bar.el
===================================================================
RCS file: /cvs/emacs/lisp/menu-bar.el,v
retrieving revision 1.187
diff -c -r1.187 menu-bar.el
*** lisp/menu-bar.el    2001/11/25 05:46:35     1.187
--- lisp/menu-bar.el    2001/11/27 19:18:38
***************
*** 853,885 ****
              :help "Describe this buffer's major and minor mode"))
  
  (defvar menu-bar-apropos-menu (make-sparse-keymap "Apropos"))
  
  (define-key menu-bar-apropos-menu [apropos-documentation]
!   '(menu-item "Apropos Documentation..." apropos-documentation
!               :help "List variables whose doc strings match a regexp"))
  (define-key menu-bar-apropos-menu [apropos]
!   '(menu-item "Apropos Symbol..."  apropos
!               :help "List symbols whose names match a regexp"))
  (define-key menu-bar-apropos-menu [apropos-value]
!   '(menu-item "Apropos Value..." apropos-value
!               :help "List variables whose values match a regexp"))
  (define-key menu-bar-apropos-menu [apropos-variables]
!   '(menu-item "Apropos Variables..." apropos-variable
!             :help "List variables whose names match a regexp"))
  (define-key menu-bar-apropos-menu [apropos-commands]
!   '(menu-item "Apropos Commands..." apropos-command
!             :help "List commands whose names match a regexp"))
  
! (defvar menu-bar-manuals-menu (make-sparse-keymap "Manuals"))
  
  (define-key menu-bar-manuals-menu [man]
    '(menu-item "Read Man Page..." manual-entry
              :help "Man-page docs for external commands and libraries"))
  (define-key menu-bar-manuals-menu [sep2]
    '("--"))
  (define-key menu-bar-manuals-menu [info]
!   '(menu-item "Browse Manuals with Info" Info-directory
              :help "Read any of the installed manuals"))
  (define-key menu-bar-manuals-menu [command]
    '(menu-item "Find Command in Manual" Info-goto-emacs-command-node
              :help "Display manual section that describes a command"))
--- 853,926 ----
              :help "Describe this buffer's major and minor mode"))
  
  (defvar menu-bar-apropos-menu (make-sparse-keymap "Apropos"))
+ (defun menu-bar-read-lispref ()
+   "Display the Emacs Lisp Reference manual in Info mode."
+   (interactive)
+   (info "elisp"))
  
+ (defun menu-bar-read-lispintro ()
+   "Display the Introduction to Emacs Lisp Programming in Info mode."
+   (interactive)
+   (info "eintr"))
+ 
+ (defun menu-bar-read-emacs-man ()
+   "Display Emacs User Manual in Info mode."
+   (interactive)
+   (info "emacs"))
+ 
+ (defun search-emacs-glossary (term)
+   "Search the Glossary node of the Emacs manual for an entry for TERM."
+   (interactive "sTerm to look up: ")
+   (let ((case-fold-search t))
+     (condition-case nil
+       (progn
+         (info "(emacs)Glossary")
+         (cond
+          ((re-search-forward (concat "^" (regexp-quote term)) nil t))
+          ((search-forward term nil t))
+          (t (message "Couldn't find %s in Emacs Glossary" term))))
+       (error
+        (bury-buffer)
+        (error "Couldn't find the Emacs Glossary")))))
+ 
  (define-key menu-bar-apropos-menu [apropos-documentation]
!   '(menu-item "Lookup by Documentation Text..." apropos-documentation
!               :help
!             "Find functions and variables whose doc strings match a regexp"))
  (define-key menu-bar-apropos-menu [apropos]
!   '(menu-item "Lookup Any Object by Name..."  apropos
!               :help "Find all symbols whose names match a regexp"))
  (define-key menu-bar-apropos-menu [apropos-value]
!   '(menu-item "Lookup Options by Value..." apropos-value
!               :help "Find variables whose values match a regexp"))
  (define-key menu-bar-apropos-menu [apropos-variables]
!   '(menu-item "Lookup Options by Name..." apropos-variable
!             :help "Find variables whose names match a regexp"))
  (define-key menu-bar-apropos-menu [apropos-commands]
!   '(menu-item "Lookup Commands by Name..." apropos-command
!             :help "Find commands whose names match a regexp"))
  
! (defvar menu-bar-manuals-menu (make-sparse-keymap "Other Manuals"))
  
  (define-key menu-bar-manuals-menu [man]
    '(menu-item "Read Man Page..." manual-entry
              :help "Man-page docs for external commands and libraries"))
  (define-key menu-bar-manuals-menu [sep2]
    '("--"))
+ (define-key menu-bar-manuals-menu [order-emacs-manuals]
+   '(menu-item "Ordering Manuals" view-order-manuals
+             :help "How to order manuals from the Free Software Foundation"))
  (define-key menu-bar-manuals-menu [info]
!   '(menu-item "All Other Manuals (Info)" Info-directory
              :help "Read any of the installed manuals"))
+ (define-key menu-bar-manuals-menu [info-elisp]
+   '(menu-item "Emacs Lisp Reference" menu-bar-read-lispref
+             :help "Read the Emacs Lisp Reference manual"))
+ (define-key menu-bar-manuals-menu [info-elintro]
+   '(menu-item "Introduction to Emacs Lisp" menu-bar-read-lispintro
+             :help "Read the Introduction to Emacs Lisp Programming"))
+ (define-key menu-bar-manuals-menu [sep3]
+   '("--"))
  (define-key menu-bar-manuals-menu [command]
    '(menu-item "Find Command in Manual" Info-goto-emacs-command-node
              :help "Display manual section that describes a command"))
***************
*** 890,896 ****
  (define-key menu-bar-help-menu [eliza]
    '(menu-item "Emacs Psychiatrist" doctor
              :help "Our doctor will help you feel better"))
! (define-key menu-bar-help-menu [sep3]
    '("--"))
  (define-key menu-bar-help-menu [describe-no-warranty]
    '(menu-item "(Non)Warranty" describe-no-warranty
--- 931,937 ----
  (define-key menu-bar-help-menu [eliza]
    '(menu-item "Emacs Psychiatrist" doctor
              :help "Our doctor will help you feel better"))
! (define-key menu-bar-help-menu [sep4]
    '("--"))
  (define-key menu-bar-help-menu [describe-no-warranty]
    '(menu-item "(Non)Warranty" describe-no-warranty
***************
*** 919,942 ****
              :help "Find packages and features by keyword"))
  (define-key menu-bar-help-menu [apropos]
    (list 'menu-item "Apropos" menu-bar-apropos-menu
!       :help "Find commands, variables, keys"))
  (define-key menu-bar-help-menu [describe]
    (list 'menu-item "Describe" menu-bar-describe-menu
        :help "Describe commands, variables, keys"))
  (define-key menu-bar-help-menu [manuals]
!   (list 'menu-item "Manuals" menu-bar-manuals-menu
!       :help "Lookup commands and keys in docs, read manuals"))
  (define-key menu-bar-help-menu [sep1]
    '("--"))
  (define-key menu-bar-help-menu [report-emacs-bug]
    '(menu-item "Send Bug Report..." report-emacs-bug
              :help "Send e-mail to Emacs maintainers"))
! (define-key menu-bar-help-menu [order-emacs-manuals]
!   '(menu-item "Ordering Manuals" view-order-manuals
!             :help "How to order manuals from the Free Software Foundation"))
! (define-key menu-bar-help-menu [emacs-manual]
!   '(menu-item "Read the Emacs Manual"
!             (lambda () (interactive) (info "emacs"))))
  (define-key menu-bar-help-menu [emacs-problems]
    '(menu-item "Emacs Known Problems" view-emacs-problems))
  (define-key menu-bar-help-menu [emacs-news]
--- 960,983 ----
              :help "Find packages and features by keyword"))
  (define-key menu-bar-help-menu [apropos]
    (list 'menu-item "Apropos" menu-bar-apropos-menu
!       :help "Find commands, variables, keys, etc."))
  (define-key menu-bar-help-menu [describe]
    (list 'menu-item "Describe" menu-bar-describe-menu
        :help "Describe commands, variables, keys"))
  (define-key menu-bar-help-menu [manuals]
!   (list 'menu-item "Other Manuals" menu-bar-manuals-menu
!       :help "Search and Browse on-line manuals"))
! (define-key menu-bar-help-menu [emacs-manual]
!   '(menu-item "Read the Emacs Manual" menu-bar-read-emacs-man
!             :help "Full documentation of Emacs features"))
  (define-key menu-bar-help-menu [sep1]
    '("--"))
  (define-key menu-bar-help-menu [report-emacs-bug]
    '(menu-item "Send Bug Report..." report-emacs-bug
              :help "Send e-mail to Emacs maintainers"))
! (define-key menu-bar-help-menu [emacs-glossary]
!   '(menu-item "What is Emacs Word For..." search-emacs-glossary
!             :help "Learn Emacs terminology, a.k.a. Emacspeak"))
  (define-key menu-bar-help-menu [emacs-problems]
    '(menu-item "Emacs Known Problems" view-emacs-problems))
  (define-key menu-bar-help-menu [emacs-news]