diff options
author | Francesco Potortì <pot@gnu.org> | 1994-10-27 19:08:03 +0000 |
---|---|---|
committer | Francesco Potortì <pot@gnu.org> | 1994-10-27 19:08:03 +0000 |
commit | cad7f290b91dfbb8781c03041af6b7d1de3bbdae (patch) | |
tree | 0c9c8a8aedf539d24c6424fd7f524d0edbb784b8 /lisp/man.el | |
parent | d77dddb61e3271a412c10bafd7f5d3ae61a70ba7 (diff) | |
download | emacs-cad7f290b91dfbb8781c03041af6b7d1de3bbdae.tar.gz |
* man.el (Man-fontify-manpage-flag): defvar put at outer level.
(manual-program, Man-untabify-command, Man-untabify-command-args,
Man-sed-command, Man-awk-command, Man-mode-line-format,
Man-mode-map, Man-mode-hook, Man-cooked-hook, Man-name-regexp,
Man-section-regexp, Man-page-header-regexp, Man-heading-regexp,
Man-see-also-regexp, Man-first-heading-regexp,
Man-reference-regexp, Man-switches, Man-specified-section-option):
Make them normal defvars, no more user options.
(Man-overstrike-face, Man-undeline-face): New user options.
(Man-init-defvars): Man-fontify-manpage-flag removed from here.
(man-fontify-manpage): Use the new user options above.
Diffstat (limited to 'lisp/man.el')
-rw-r--r-- | lisp/man.el | 109 |
1 files changed, 56 insertions, 53 deletions
diff --git a/lisp/man.el b/lisp/man.el index ab27a6b74ab..52645b61515 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -3,8 +3,8 @@ ;; Copyright (C) 1993, 1994 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw <bwarsaw@cen.com> -;; Last-Modified: $Date: 1994/10/24 12:37:01 $ -;; Version: $Revision: 1.54 $ +;; Last-Modified: $Date: 1994/10/24 15:34:50 $ +;; Version: $Revision: 1.55 $ ;; Keywords: help ;; Adapted-By: ESR, pot @@ -106,7 +106,6 @@ (defvar Man-filter-list) (defvar Man-original-frame) (defvar Man-arguments) -(defvar Man-fontify-manpage-flag) (defvar Man-sections-alist) (defvar Man-refpages-alist) (defvar Man-uses-untabify-flag) @@ -116,8 +115,14 @@ ;; vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ;; user variables -(defvar manual-program "man" - "The name of the program that produces man pages.") +(defvar Man-fontify-manpage-flag t + "*Make up the manpage with fonts.") + +(defvar Man-overstrike-face 'bold + "*Face to use when fontifying overstrike.") + +(defvar Man-underline-face 'underline + "*Face to use when fontifying underlinining.") ;; Use the value of the obsolete user option Man-notify, if set. (defvar Man-notify-method (if (boundp 'Man-notify) Man-notify 'friendly) @@ -171,39 +176,20 @@ their references which Un*x `man' does not recognize. This association list is used to translate those sections, when found, to the associated section number.") +(defvar manual-program "man" + "The name of the program that produces man pages.") + (defvar Man-untabify-command "pr" - "*Command used for untabifying.") + "Command used for untabifying.") (defvar Man-untabify-command-args (list "-t" "-e") - "*List of arguments to be passed to Man-untabify-command (which see).") + "List of arguments to be passed to Man-untabify-command (which see).") (defvar Man-sed-command "sed" - "*Command used for processing sed scripts.") + "Command used for processing sed scripts.") (defvar Man-awk-command "awk" - "*Command used for processing awk scripts.") - -(defconst Man-sysv-sed-script "\ -/\b/ { s/_\b//g - s/\b_//g - s/o\b+/o/g - :ovstrk - s/\\(.\\)\b\\1/\\1/g - t ovstrk - } -/\e\\[[0-9][0-9]*m/ s///g" - "Script for sysV-like sed to nuke backspaces and ANSI codes from manpages.") - -(defconst Man-berkeley-sed-script "\ -/\b/ { s/_\b//g\\ - s/\b_//g\\ - s/o\b+/o/g\\ - :ovstrk\\ - s/\\(.\\)\b\\1/\\1/g\\ - t ovstrk\\ - }\\ -/\e\\[[0-9][0-9]*m/ s///g" - "Script for berkeley-like sed to nuke backspaces and ANSI codes from manpages.") + "Command used for processing awk scripts.") (defvar Man-mode-line-format '("" mode-line-modified @@ -212,54 +198,51 @@ the associated section number.") " " Man-page-mode-string " %[(" mode-name mode-line-process minor-mode-alist ")%]----" (-3 . "%p") "-%-") - "*Mode line format for manual mode buffer.") + "Mode line format for manual mode buffer.") (defvar Man-mode-map nil - "*Keymap for Man mode.") + "Keymap for Man mode.") (defvar Man-mode-hook nil - "*Hook run when Man mode is enabled.") + "Hook run when Man mode is enabled.") (defvar Man-cooked-hook nil - "*Hook run after removing backspaces but before Man-mode processing.") + "Hook run after removing backspaces but before Man-mode processing.") (defvar Man-name-regexp "[-a-zA-Z0-9_][-a-zA-Z0-9_.]*" - "*Regular expression describing the name of a manpage (without section).") + "Regular expression describing the name of a manpage (without section).") (defvar Man-section-regexp "[0-9][a-zA-Z+]*\\|[LNln]" - "*Regular expression describing a manpage section within parentheses.") + "Regular expression describing a manpage section within parentheses.") (defvar Man-page-header-regexp (concat "^[ \t]*\\(" Man-name-regexp "(\\(" Man-section-regexp "\\))\\).*\\1") - "*Regular expression describing the heading of a page.") + "Regular expression describing the heading of a page.") (defvar Man-heading-regexp "^\\([A-Z][A-Z ]+\\)$" - "*Regular expression describing a manpage heading entry.") + "Regular expression describing a manpage heading entry.") (defvar Man-see-also-regexp "SEE ALSO" - "*Regular expression for SEE ALSO heading (or your equivalent). + "Regular expression for SEE ALSO heading (or your equivalent). This regexp should not start with a `^' character.") (defvar Man-first-heading-regexp "^[ \t]*NAME$\\|^[ \t]*No manual entry fo.*$" - "*Regular expression describing first heading on a manpage. + "Regular expression describing first heading on a manpage. This regular expression should start with a `^' character.") (defvar Man-reference-regexp (concat "\\(" Man-name-regexp "\\)(\\(" Man-section-regexp "\\))") - "*Regular expression describing a reference in the SEE ALSO section.") + "Regular expression describing a reference in the SEE ALSO section.") (defvar Man-switches "" - "*Switches passed to the man command, as a single string.") + "Switches passed to the man command, as a single string.") -;; Would someone like to provide a good test for being on Solaris? -;; We could give it its own value of system-type, but that has drawbacks; -;; it would require changes in lots of places that test system-type. (defvar Man-specified-section-option (if (string-match "-solaris[0-9.]*$" system-configuration) "-s" "") - "*Option that indicates a specified a manual section name.") + "Option that indicates a specified a manual section name.") ;; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ;; end user variables @@ -279,6 +262,28 @@ This regular expression should start with a `^' character.") (setq-default Man-current-page 0) (setq-default Man-page-mode-string "1 of 1") +(defconst Man-sysv-sed-script "\ +/\b/ { s/_\b//g + s/\b_//g + s/o\b+/o/g + :ovstrk + s/\\(.\\)\b\\1/\\1/g + t ovstrk + } +/\e\\[[0-9][0-9]*m/ s///g" + "Script for sysV-like sed to nuke backspaces and ANSI codes from manpages.") + +(defconst Man-berkeley-sed-script "\ +/\b/ { s/_\b//g\\ + s/\b_//g\\ + s/o\b+/o/g\\ + :ovstrk\\ + s/\\(.\\)\b\\1/\\1/g\\ + t ovstrk\\ + }\\ +/\e\\[[0-9][0-9]*m/ s///g" + "Script for berkeley-like sed to nuke backspaces and ANSI codes from manpages.") + (if Man-mode-map nil (setq Man-mode-map (make-keymap)) @@ -310,8 +315,6 @@ This regular expression should start with a `^' character.") "Used for initialising variables based on the value of window-system. This is necessary if one wants to dump man.el with emacs." - (defvar Man-fontify-manpage-flag t - "*Make up the manpage with fonts.") ;; The following is necessary until fonts are implemented on ;; terminals. (setq Man-fontify-manpage-flag (and Man-fontify-manpage-flag @@ -619,19 +622,19 @@ Same for the ANSI bold and normal escape sequences." (progn (if (search-forward "\e[0m" nil 'move) (delete-backward-char 4)) (point)) - 'face 'bold)) + 'face Man-overstrike-face)) (goto-char (point-min)) (while (search-forward "_\b" nil t) (backward-delete-char 2) - (put-text-property (point) (1+ (point)) 'face 'underline)) + (put-text-property (point) (1+ (point)) 'face Man-underline-face)) (goto-char (point-min)) (while (search-forward "\b_" nil t) (backward-delete-char 2) - (put-text-property (1- (point)) (point) 'face 'underline)) + (put-text-property (1- (point)) (point) 'face Man-underline-face)) (goto-char (point-min)) (while (re-search-forward "\\(.\\)\\(\b\\1\\)+" nil t) (replace-match "\\1") - (put-text-property (1- (point)) (point) 'face 'bold)) + (put-text-property (1- (point)) (point) 'face Man-overstrike-face)) (goto-char (point-min)) (while (search-forward "o\b+" nil t) (backward-delete-char 2) |