Index: lisp/help.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/help.el,v retrieving revision 1.284 diff -c -r1.284 help.el *** lisp/help.el 6 Aug 2005 22:13:43 -0000 1.284 --- lisp/help.el 16 Oct 2005 14:50:25 -0000 *************** *** 282,305 **** (setq sym (intern-soft (match-string 1 str))) (and (fboundp sym) sym))))))) ;;; `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 () --- 282,321 ---- (setq sym (intern-soft (match-string 1 str))) (and (fboundp sym) sym))))))) + (defun view-possibly-compressed-file (file) + (let ((auto-compression-mode t)) + (view-file + (if (and + (not (file-exists-p file)) + (file-exists-p (concat file ".gz"))) + (concat file ".gz") + file)))) + ;;; `User' help functions (defun describe-distribution () "Display info on how to obtain the latest version of GNU Emacs." (interactive) ! (view-possibly-compressed-file (expand-file-name "DISTRIB" data-directory))) + (defun describe-extra-packages () + "Display info on some additional packages available for GNU Emacs." + (interactive) + (let (enable-local-variables) + (view-possibly-compressed-file (expand-file-name "MORE.STUFF" data-directory)) + (goto-address))) + (defun describe-copying () "Display info on how you may redistribute copies of GNU Emacs." (interactive) ! (view-possibly-compressed-file (expand-file-name "COPYING" data-directory)) (goto-char (point-min))) (defun describe-project () "Display info on the GNU project." (interactive) ! (view-possibly-compressed-file (expand-file-name "THE-GNU-PROJECT" data-directory)) (goto-char (point-min))) (defun describe-no-warranty () *************** *** 329,340 **** ;; run describe-prefix-bindings. (setq prefix-help-command 'describe-prefix-bindings) (defun view-emacs-news (&optional arg) "Display info on recent changes to Emacs. With argument, display info only for the selected version." (interactive "P") (if (not arg) ! (view-file (expand-file-name "NEWS" data-directory)) (let* ((map (sort (delete-dups (apply --- 345,357 ---- ;; run describe-prefix-bindings. (setq prefix-help-command 'describe-prefix-bindings) + (defun view-emacs-news (&optional arg) "Display info on recent changes to Emacs. With argument, display info only for the selected version." (interactive "P") (if (not arg) ! (view-possibly-compressed-file (expand-file-name "NEWS" data-directory)) (let* ((map (sort (delete-dups (apply *************** *** 365,371 **** res) (if (not file) (error "No news is good news") ! (view-file (expand-file-name file data-directory)) (widen) (goto-char (point-min)) (when (re-search-forward --- 382,388 ---- res) (if (not file) (error "No news is good news") ! (view-fileview-possibly-compressed-file (expand-file-name file data-directory)) (widen) (goto-char (point-min)) (when (re-search-forward *************** *** 390,396 **** (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. --- 407,413 ---- (defun view-todo (&optional arg) "Display the Emacs TODO list." (interactive "P") ! (view-possibly-compressed-file (expand-file-name "TODO" data-directory))) (defun view-echo-area-messages () "View the log of recent echo-area messages: the `*Messages*' buffer. *************** *** 402,408 **** (defun view-order-manuals () "Display the Emacs ORDERS file." (interactive) ! (view-file (expand-file-name "ORDERS" data-directory)) (goto-address)) (defun view-emacs-FAQ () --- 419,425 ---- (defun view-order-manuals () "Display the Emacs ORDERS file." (interactive) ! (view-possibly-compressed-file (expand-file-name "ORDERS" data-directory)) (goto-address)) (defun view-emacs-FAQ () *************** *** 414,420 **** (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. --- 431,437 ---- (defun view-emacs-problems () "Display info on known problems with Emacs and possible workarounds." (interactive) ! (view-possibly-compressed-file (expand-file-name "PROBLEMS" data-directory))) (defun view-lossage () "Display last 100 input keystrokes. Index: lisp/help-fns.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/help-fns.el,v retrieving revision 1.75 diff -c -r1.75 help-fns.el *** lisp/help-fns.el 13 Sep 2005 14:58:35 -0000 1.75 --- lisp/help-fns.el 16 Oct 2005 14:50:25 -0000 *************** *** 52,68 **** (if (get-language-info current-language-environment 'tutorial) current-language-environment "English"))) ! file filename) (setq filename (get-language-info lang 'tutorial)) (setq file (expand-file-name (concat "~/" filename))) (delete-other-windows) (if (get-file-buffer file) (switch-to-buffer (get-file-buffer file)) ! (switch-to-buffer (create-file-buffer file)) (setq buffer-file-name file) (setq default-directory (expand-file-name "~/")) (setq buffer-auto-save-file-name nil) - (insert-file-contents (expand-file-name filename data-directory)) (hack-local-variables) (goto-char (point-min)) (search-forward "\n<<") --- 52,73 ---- (if (get-language-info current-language-environment 'tutorial) current-language-environment "English"))) ! file filename) (setq filename (get-language-info lang 'tutorial)) (setq file (expand-file-name (concat "~/" filename))) (delete-other-windows) (if (get-file-buffer file) (switch-to-buffer (get-file-buffer file)) ! (setq file (expand-file-name filename data-directory)) ! (unless (file-exists-p file) ! (if (file-exists-p (concat file ".gz")) ! (setq file (concat file ".gz")) ! (error "%s does not exist" file))) ! (let ((auto-compression-mode t)) ! (find-file file)) (setq buffer-file-name file) (setq default-directory (expand-file-name "~/")) (setq buffer-auto-save-file-name nil) (hack-local-variables) (goto-char (point-min)) (search-forward "\n<<") Index: lisp/menu-bar.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/menu-bar.el,v retrieving revision 1.273 diff -c -r1.273 menu-bar.el *** lisp/menu-bar.el 10 Sep 2005 10:55:14 -0000 1.273 --- lisp/menu-bar.el 16 Oct 2005 14:50:28 -0000 *************** *** 1356,1371 **** '(menu-item "Getting New Versions" describe-distribution :help "How to get latest versions of Emacs")) (define-key menu-bar-help-menu [more] ! '(menu-item "Find Extra Packages" ! menu-bar-help-extra-packages :help "Where to find some extra packages and possible updates")) - (defun menu-bar-help-extra-packages () - "Display help about some additional packages available for Emacs." - (interactive) - (let (enable-local-variables) - (view-file (expand-file-name "MORE.STUFF" - data-directory)) - (goto-address))) (define-key menu-bar-help-menu [about] '(menu-item "About Emacs" display-splash-screen :help "Display version number, copyright info, and basic help")) --- 1356,1363 ---- '(menu-item "Getting New Versions" describe-distribution :help "How to get latest versions of Emacs")) (define-key menu-bar-help-menu [more] ! '(menu-item "Find Extra Packages" describe-extra-packages :help "Where to find some extra packages and possible updates")) (define-key menu-bar-help-menu [about] '(menu-item "About Emacs" display-splash-screen :help "Display version number, copyright info, and basic help"))