diff options
| author | Dave Love | 1999-12-18 16:47:43 +0000 |
|---|---|---|
| committer | Dave Love | 1999-12-18 16:47:43 +0000 |
| commit | d17f0db587846dc1e0be442cfa9975c8c02b537f (patch) | |
| tree | 283f05bddfc77b1fb13e77c4b282f6cb10708dea | |
| parent | 35079221bbdc876d52777be254f5262c7cdc713d (diff) | |
| download | emacs-d17f0db587846dc1e0be442cfa9975c8c02b537f.tar.gz emacs-d17f0db587846dc1e0be442cfa9975c8c02b537f.zip | |
Small doc fixes.
(scheme-mode-variables): Don't make imenu-generic-expression
buffer-local redundantly.
| -rw-r--r-- | lisp/progmodes/scheme.el | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el index cc7b0b62601..94dfbf53dd7 100644 --- a/lisp/progmodes/scheme.el +++ b/lisp/progmodes/scheme.el | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | 53 | ||
| 54 | (require 'lisp-mode) | 54 | (require 'lisp-mode) |
| 55 | 55 | ||
| 56 | (defvar scheme-mode-syntax-table nil "") | 56 | (defvar scheme-mode-syntax-table nil) |
| 57 | (if (not scheme-mode-syntax-table) | 57 | (if (not scheme-mode-syntax-table) |
| 58 | (let ((i 0)) | 58 | (let ((i 0)) |
| 59 | (setq scheme-mode-syntax-table (make-syntax-table)) | 59 | (setq scheme-mode-syntax-table (make-syntax-table)) |
| @@ -107,13 +107,13 @@ | |||
| 107 | (modify-syntax-entry ?# "_ p14") | 107 | (modify-syntax-entry ?# "_ p14") |
| 108 | (modify-syntax-entry ?\\ "\\ "))) | 108 | (modify-syntax-entry ?\\ "\\ "))) |
| 109 | 109 | ||
| 110 | (defvar scheme-mode-abbrev-table nil "") | 110 | (defvar scheme-mode-abbrev-table nil) |
| 111 | (define-abbrev-table 'scheme-mode-abbrev-table ()) | 111 | (define-abbrev-table 'scheme-mode-abbrev-table ()) |
| 112 | 112 | ||
| 113 | (defvar scheme-imenu-generic-expression | 113 | (defvar scheme-imenu-generic-expression |
| 114 | '((nil | 114 | '((nil |
| 115 | "^(define\\(\\|-\\(generic\\(\\|-procedure\\)\\|method\\)\\)*\\s-+(?\\(\\sw+\\)" 4) | 115 | "^(define\\(\\|-\\(generic\\(\\|-procedure\\)\\|method\\)\\)*\\s-+(?\\(\\sw+\\)" 4) |
| 116 | ("Types" | 116 | ("Types" |
| 117 | "^(define-class\\s-+(?\\(\\sw+\\)" 1) | 117 | "^(define-class\\s-+(?\\(\\sw+\\)" 1) |
| 118 | ("Macros" | 118 | ("Macros" |
| 119 | "^(\\(defmacro\\|define-macro\\|define-syntax\\)\\s-+(?\\(\\sw+\\)" 2)) | 119 | "^(\\(defmacro\\|define-macro\\|define-syntax\\)\\s-+(?\\(\\sw+\\)" 2)) |
| @@ -160,11 +160,10 @@ | |||
| 160 | (setq mode-line-process '("" scheme-mode-line-process)) | 160 | (setq mode-line-process '("" scheme-mode-line-process)) |
| 161 | (make-local-variable 'imenu-case-fold-search) | 161 | (make-local-variable 'imenu-case-fold-search) |
| 162 | (setq imenu-case-fold-search t) | 162 | (setq imenu-case-fold-search t) |
| 163 | (make-local-variable 'imenu-generic-expression) | ||
| 164 | (setq imenu-generic-expression scheme-imenu-generic-expression) | 163 | (setq imenu-generic-expression scheme-imenu-generic-expression) |
| 165 | (make-local-variable 'imenu-syntax-alist) | 164 | (make-local-variable 'imenu-syntax-alist) |
| 166 | (setq imenu-syntax-alist '(("+-*/.<>=?!$%_&~^:" . "w"))) | 165 | (setq imenu-syntax-alist '(("+-*/.<>=?!$%_&~^:" . "w"))) |
| 167 | (make-local-variable 'font-lock-defaults) | 166 | (make-local-variable 'font-lock-defaults) |
| 168 | (setq font-lock-defaults | 167 | (setq font-lock-defaults |
| 169 | '((scheme-font-lock-keywords | 168 | '((scheme-font-lock-keywords |
| 170 | scheme-font-lock-keywords-1 scheme-font-lock-keywords-2) | 169 | scheme-font-lock-keywords-1 scheme-font-lock-keywords-2) |
| @@ -206,7 +205,7 @@ All commands in `shared-lisp-mode-map' are inherited by this map.") | |||
| 206 | ;;;###autoload | 205 | ;;;###autoload |
| 207 | (defun scheme-mode () | 206 | (defun scheme-mode () |
| 208 | "Major mode for editing Scheme code. | 207 | "Major mode for editing Scheme code. |
| 209 | Editing commands are similar to those of lisp-mode. | 208 | Editing commands are similar to those of `lisp-mode'. |
| 210 | 209 | ||
| 211 | In addition, if an inferior Scheme process is running, some additional | 210 | In addition, if an inferior Scheme process is running, some additional |
| 212 | commands will be defined, for evaluating expressions and controlling | 211 | commands will be defined, for evaluating expressions and controlling |
| @@ -219,7 +218,7 @@ Commands: | |||
| 219 | Delete converts tabs to spaces as it moves back. | 218 | Delete converts tabs to spaces as it moves back. |
| 220 | Blank lines separate paragraphs. Semicolons start comments. | 219 | Blank lines separate paragraphs. Semicolons start comments. |
| 221 | \\{scheme-mode-map} | 220 | \\{scheme-mode-map} |
| 222 | Entry to this mode calls the value of scheme-mode-hook | 221 | Entry to this mode calls the value of `scheme-mode-hook' |
| 223 | if that value is non-nil." | 222 | if that value is non-nil." |
| 224 | (interactive) | 223 | (interactive) |
| 225 | (kill-all-local-variables) | 224 | (kill-all-local-variables) |
| @@ -247,20 +246,20 @@ Set this to nil if you normally use another dialect." | |||
| 247 | " | 246 | " |
| 248 | "*An SGML declaration for the DSSSL file. | 247 | "*An SGML declaration for the DSSSL file. |
| 249 | If it is defined as a string this will be inserted into an empty buffer | 248 | If it is defined as a string this will be inserted into an empty buffer |
| 250 | which is in dsssl-mode. It is typically James Clark's style-sheet | 249 | which is in `dsssl-mode'. It is typically James Clark's style-sheet |
| 251 | doctype, as required for Jade." | 250 | doctype, as required for Jade." |
| 252 | :type '(choice (string :tag "Specified string") | 251 | :type '(choice (string :tag "Specified string") |
| 253 | (const :tag "None" :value nil)) | 252 | (const :tag "None" :value nil)) |
| 254 | :group 'scheme) | 253 | :group 'scheme) |
| 255 | 254 | ||
| 256 | (defcustom scheme-mode-hook nil | 255 | (defcustom scheme-mode-hook nil |
| 257 | "Normal hook (list of functions) run when entering scheme-mode. | 256 | "Normal hook run when entering `scheme-mode'. |
| 258 | See `run-hooks'." | 257 | See `run-hooks'." |
| 259 | :type 'hook | 258 | :type 'hook |
| 260 | :group 'scheme) | 259 | :group 'scheme) |
| 261 | 260 | ||
| 262 | (defcustom dsssl-mode-hook nil | 261 | (defcustom dsssl-mode-hook nil |
| 263 | "Normal hook (list of functions) run when entering dsssl-mode. | 262 | "Normal hook run when entering `dsssl-mode'. |
| 264 | See `run-hooks'." | 263 | See `run-hooks'." |
| 265 | :type 'hook | 264 | :type 'hook |
| 266 | :group 'scheme) | 265 | :group 'scheme) |
| @@ -270,7 +269,7 @@ See `run-hooks'." | |||
| 270 | ;; not sure it's the best way to organize it; perhaps one type | 269 | ;; not sure it's the best way to organize it; perhaps one type |
| 271 | ;; should be at the first level, though you don't see this anyhow if | 270 | ;; should be at the first level, though you don't see this anyhow if |
| 272 | ;; it gets split up. | 271 | ;; it gets split up. |
| 273 | '(("Defines" | 272 | '(("Defines" |
| 274 | "^(define\\s-+(?\\(\\sw+\\)" 1) | 273 | "^(define\\s-+(?\\(\\sw+\\)" 1) |
| 275 | ("Modes" | 274 | ("Modes" |
| 276 | "^\\s-*(mode\\s-+\\(\\(\\sw\\|\\s-\\)+\\)" 1) | 275 | "^\\s-*(mode\\s-+\\(\\(\\sw\\|\\s-\\)+\\)" 1) |
| @@ -278,7 +277,7 @@ See `run-hooks'." | |||
| 278 | ;; (element foo ...) or (element (foo bar ...) ...) | 277 | ;; (element foo ...) or (element (foo bar ...) ...) |
| 279 | ;; Fixme: Perhaps it should do `root'. | 278 | ;; Fixme: Perhaps it should do `root'. |
| 280 | "^\\s-*(element\\s-+(?\\(\\(\\sw\\|\\s-\\)+\\))?" 1) | 279 | "^\\s-*(element\\s-+(?\\(\\(\\sw\\|\\s-\\)+\\))?" 1) |
| 281 | ("Declarations" | 280 | ("Declarations" |
| 282 | "^(declare\\(-\\sw+\\)+\\>\\s-+\\(\\sw+\\)" 2)) | 281 | "^(declare\\(-\\sw+\\)+\\>\\s-+\\(\\sw+\\)" 2)) |
| 283 | "Imenu generic expression for DSSSL mode. See `imenu-generic-expression'.") | 282 | "Imenu generic expression for DSSSL mode. See `imenu-generic-expression'.") |
| 284 | 283 | ||
| @@ -343,7 +342,7 @@ See `run-hooks'." | |||
| 343 | ;;;###autoload | 342 | ;;;###autoload |
| 344 | (defun dsssl-mode () | 343 | (defun dsssl-mode () |
| 345 | "Major mode for editing DSSSL code. | 344 | "Major mode for editing DSSSL code. |
| 346 | Editing commands are similar to those of lisp-mode. | 345 | Editing commands are similar to those of `lisp-mode'. |
| 347 | 346 | ||
| 348 | Commands: | 347 | Commands: |
| 349 | Delete converts tabs to spaces as it moves back. | 348 | Delete converts tabs to spaces as it moves back. |
| @@ -461,7 +460,7 @@ that variable's value is a string." | |||
| 461 | (not (string-equal (substring string 0 1) "("))) | 460 | (not (string-equal (substring string 0 1) "("))) |
| 462 | 461 | ||
| 463 | (defun next-sexp-as-string () | 462 | (defun next-sexp-as-string () |
| 464 | ;; Assumes that protected by a save-excursion | 463 | ;; Assumes that it is protected by a save-excursion |
| 465 | (forward-sexp 1) | 464 | (forward-sexp 1) |
| 466 | (let ((the-end (point))) | 465 | (let ((the-end (point))) |
| 467 | (backward-sexp 1) | 466 | (backward-sexp 1) |