Re: Move etc/future-bug into etc/JOKES ??

[storm@cua.dk (Kim F. Storm)]

storm@cua.dk (Kim F. Storm) writes:

> Here is a small patch for help.el which provides the following additional
> help commands:
>
> C-h C-j  => Display jokes  (JOKES + future-bug + DEVEL.HUMOR)
>
> C-h C-o  => Display other info sources  (MORE.STUFF)
>
> C-h D    => Debugging GNU Emacs  (DEBUG)

Actually, it might be better to move the current

C-h C-d to C-h C-o  => Display ordering information...

We can then use these:

C-h C-d => debugging info
C-h C-x => eXternal sources of information ... (

[I don't care much about the jokes (C-h C-j),
so I can leave that out if people dislike it].


Here's an updated patch  (I'll fix the manual if approved):

*** help.el	28 Feb 2007 23:33:46 +0100	1.326
--- help.el	01 Mar 2007 14:38:14 +0100	
***************
*** 47,60 ****
      (define-key map "?" 'help-for-help)
  
      (define-key map "\C-c" 'describe-copying)
!     (define-key map "\C-d" 'describe-distribution)
      (define-key map "\C-e" 'view-emacs-problems)
      (define-key map "\C-f" 'view-emacs-FAQ)
      (define-key map "\C-m" 'view-order-manuals)
      (define-key map "\C-n" 'view-emacs-news)
      (define-key map "\C-p" 'describe-project)
      (define-key map "\C-t" 'view-todo)
      (define-key map "\C-w" 'describe-no-warranty)
  
      ;; This does not fit the pattern, but it is natural given the C-\ command.
      (define-key map "\C-\\" 'describe-input-method)
--- 47,63 ----
      (define-key map "?" 'help-for-help)
  
      (define-key map "\C-c" 'describe-copying)
!     (define-key map "\C-d" 'view-emacs-debugging)
      (define-key map "\C-e" 'view-emacs-problems)
      (define-key map "\C-f" 'view-emacs-FAQ)
+     (define-key map "\C-j" 'view-emacs-jokes)
      (define-key map "\C-m" 'view-order-manuals)
      (define-key map "\C-n" 'view-emacs-news)
+     (define-key map "\C-o" 'describe-distribution)
      (define-key map "\C-p" 'describe-project)
      (define-key map "\C-t" 'view-todo)
      (define-key map "\C-w" 'describe-no-warranty)
+     (define-key map "\C-x" 'view-external-sources)
  
      ;; This does not fit the pattern, but it is natural given the C-\ command.
      (define-key map "\C-\\" 'describe-input-method)
***************
*** 178,184 ****
  (defalias 'help-for-help 'help-for-help-internal)
  ;; It can't find this, but nobody will look.
  (make-help-screen help-for-help-internal
!   "a b c C e f F i I k C-k l L m p r s t v w C-c C-d C-f C-n C-p C-t C-w . or ? :"
    "You have typed %THIS-KEY%, the help character.  Type a Help option:
  \(Use SPC or DEL to scroll through this text.  Type \\<help-map>\\[help-quit] to exit the Help command.)
  
--- 181,187 ----
  (defalias 'help-for-help 'help-for-help-internal)
  ;; It can't find this, but nobody will look.
  (make-help-screen help-for-help-internal
!   "Type a help option: [abcCdDefFiIkKlLmprstvw.] C-[cdefjmnoptw] or ?"
    "You have typed %THIS-KEY%, the help character.  Type a Help option:
  \(Use SPC or DEL to scroll through this text.  Type \\<help-map>\\[help-quit] to exit the Help command.)
  
***************
*** 226,239 ****
          in the echo area.
  
  C-c Display Emacs copying permission (GNU General Public License).
! C-d Display Emacs ordering information.
  C-e Display info about Emacs problems.
  C-f Display the Emacs FAQ.
  C-m Display how to order printed Emacs manuals.
  C-n Display news of recent Emacs changes.
  C-p Display information about the GNU project.
  C-t Display the Emacs TODO list.
! C-w Display information on absence of warranty for GNU Emacs."
    help-map)
  
  \f
--- 229,245 ----
          in the echo area.
  
  C-c Display Emacs copying permission (GNU General Public License).
! C-d Display instructions for debugging GNU Emacs.
  C-e Display info about Emacs problems.
  C-f Display the Emacs FAQ.
+ C-j Display jokes about Emacs, GNU, and hacking.
  C-m Display how to order printed Emacs manuals.
  C-n Display news of recent Emacs changes.
+ C-o Display Emacs ordering information.
  C-p Display information about the GNU project.
  C-t Display the Emacs TODO list.
! C-w Display information on absence of warranty for GNU Emacs.
! C-x Display external sources of extensions to and information about Emacs."
    help-map)
  
  \f
***************
*** 279,300 ****
  \f
  ;;; `User' help functions
  
  (defun describe-distribution ()
    "Display info on how to obtain the latest version of GNU Emacs."
    (interactive)
!   (view-file (expand-file-name "DISTRIB" data-directory)))
  
  (defun describe-copying ()
    "Display info on how you may redistribute copies of GNU Emacs."
    (interactive)
!   (view-file (expand-file-name "COPYING" data-directory))
!   (goto-char (point-min)))
  
  (defun describe-project ()
    "Display info on the GNU project."
    (interactive)
!   (view-file (expand-file-name "THE-GNU-PROJECT" data-directory))
!   (goto-char (point-min)))
  
  (defun describe-no-warranty ()
    "Display info on all the kinds of warranty Emacs does NOT have."
--- 285,309 ----
  \f
  ;;; `User' help functions
  
+ (defun view-help-file (file &optional dir)
+   (view-file (expand-file-name file (or dir data-directory)))
+   (goto-address)
+   (goto-char (point-min)))
+ 
  (defun describe-distribution ()
    "Display info on how to obtain the latest version of GNU Emacs."
    (interactive)
!   (view-help-file "DISTRIB"))
  
  (defun describe-copying ()
    "Display info on how you may redistribute copies of GNU Emacs."
    (interactive)
!   (view-help-file "COPYING"))
  
  (defun describe-project ()
    "Display info on the GNU project."
    (interactive)
!   (view-help-file "THE-GNU-PROJECT"))
  
  (defun describe-no-warranty ()
    "Display info on all the kinds of warranty Emacs does NOT have."
***************
*** 397,403 ****
  (defun view-todo (&optional arg)
    "Display the Emacs TODO list."
    (interactive "P")
!   (view-file (expand-file-name "TODO" data-directory)))
  
  (defun view-echo-area-messages ()
    "View the log of recent echo-area messages: the `*Messages*' buffer.
--- 406,412 ----
  (defun view-todo (&optional arg)
    "Display the Emacs TODO list."
    (interactive "P")
!   (view-help-file "TODO"))
  
  (defun view-echo-area-messages ()
    "View the log of recent echo-area messages: the `*Messages*' buffer.
***************
*** 409,416 ****
  (defun view-order-manuals ()
    "Display the Emacs ORDERS file."
    (interactive)
!   (view-file (expand-file-name "ORDERS" data-directory))
!   (goto-address))
  
  (defun view-emacs-FAQ ()
    "Display the Emacs Frequently Asked Questions (FAQ) file."
--- 418,424 ----
  (defun view-order-manuals ()
    "Display the Emacs ORDERS file."
    (interactive)
!   (view-help-file "ORDERS"))
  
  (defun view-emacs-FAQ ()
    "Display the Emacs Frequently Asked Questions (FAQ) file."
***************
*** 421,427 ****
  (defun view-emacs-problems ()
    "Display info on known problems with Emacs and possible workarounds."
    (interactive)
!   (view-file (expand-file-name "PROBLEMS" data-directory)))
  
  (defun view-lossage ()
    "Display last 100 input keystrokes.
--- 429,465 ----
  (defun view-emacs-problems ()
    "Display info on known problems with Emacs and possible workarounds."
    (interactive)
!   (view-help-file "PROBLEMS"))
! 
! (defun view-emacs-debugging ()
!   "Display info on how to debug Emacs problems."
!   (interactive)
!   (view-help-file "DEBUG"))
! 
! (defun view-external-sources ()
!   "Display external sources of information about Emacs."
!   (interactive)
!   (view-help-file "MORE.STUFF"))
! 
! (defun view-emacs-jokes ()
!   "Display jokes about Emacs, the GNU project, and hacking."
!   (interactive)
!   (let ((buf (get-buffer-create "*JOKES*")))
!     (with-current-buffer buf
!       (let ((inhibit-read-only t))
! 	(erase-buffer)
! 	(insert "* Emacs, the GNU project, and hacking\n\n\n")
! 	(insert-file-contents (expand-file-name "JOKES" data-directory))
! 	(goto-char (point-max))
! 	(insert "\n\n\n* Future Bug report\n\n\n")
! 	(insert-file-contents (expand-file-name "future-bug" data-directory))
! 	(goto-char (point-max))
! 	(insert "\n\n\n* Emacs developer list humor\n\n\n")
! 	(insert-file-contents (expand-file-name "DEVEL.HUMOR" data-directory))
! 	(outline-mode)
! 	(view-mode)
! 	(goto-char (point-min))))
!     (display-buffer buf)))
  
  (defun view-lossage ()
    "Display last 100 input keystrokes.

-- 
Kim F. Storm <storm@cua.dk> http://www.cua.dk