diff options
| author | Dave Love | 1999-10-22 17:04:35 +0000 |
|---|---|---|
| committer | Dave Love | 1999-10-22 17:04:35 +0000 |
| commit | a564ebfca1b1524b3cb624d170b24b554e8463ab (patch) | |
| tree | d93edaf182a01ebd7853923bb7d364bd1f752719 | |
| parent | 8f09e4402f75f9a297007b07d386b6790fa97509 (diff) | |
| download | emacs-a564ebfca1b1524b3cb624d170b24b554e8463ab.tar.gz emacs-a564ebfca1b1524b3cb624d170b24b554e8463ab.zip | |
Minor doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/make-mode.el | 34 |
2 files changed, 19 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8599a2fab35..5ac58a79d43 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 1999-10-22 Dave Love <fx@gnu.org> | 1 | 1999-10-22 Dave Love <fx@gnu.org> |
| 2 | 2 | ||
| 3 | * make-mode.el: Minor doc fixes. | ||
| 4 | |||
| 3 | * latin-9.el: Avoid non-ASCII characters to prevent loadup failure. | 5 | * latin-9.el: Avoid non-ASCII characters to prevent loadup failure. |
| 4 | 6 | ||
| 5 | 1999-10-21 Dave Love <fx@gnu.org> | 7 | 1999-10-21 Dave Love <fx@gnu.org> |
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 9a0d957ba57..036bd2e07f8 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el | |||
| @@ -124,7 +124,7 @@ | |||
| 124 | (defcustom makefile-macro-assign " = " | 124 | (defcustom makefile-macro-assign " = " |
| 125 | "String to append to all macro names inserted by `makefile-insert-macro'. | 125 | "String to append to all macro names inserted by `makefile-insert-macro'. |
| 126 | The normal value should be \" = \", since this is what | 126 | The normal value should be \" = \", since this is what |
| 127 | standard make expects. However, newer makes such as dmake | 127 | standard make expects. However, newer makes such as dmake |
| 128 | allow a larger variety of different macro assignments, so you | 128 | allow a larger variety of different macro assignments, so you |
| 129 | might prefer to use \" += \" or \" := \" ." | 129 | might prefer to use \" += \" or \" := \" ." |
| 130 | :type 'string | 130 | :type 'string |
| @@ -196,7 +196,7 @@ Otherwise filenames are omitted." | |||
| 196 | "If non-nil, automatically clean up continuation lines when saving. | 196 | "If non-nil, automatically clean up continuation lines when saving. |
| 197 | A line is cleaned up by removing all whitespace following a trailing | 197 | A line is cleaned up by removing all whitespace following a trailing |
| 198 | backslash. This is done silently. | 198 | backslash. This is done silently. |
| 199 | IMPORTANT: Please note that enabling this option causes makefile-mode | 199 | IMPORTANT: Please note that enabling this option causes Makefile mode |
| 200 | to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\"." | 200 | to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\"." |
| 201 | :type 'boolean | 201 | :type 'boolean |
| 202 | :group 'makefile) | 202 | :group 'makefile) |
| @@ -224,8 +224,8 @@ you enter a \".\" at the beginning of a line in makefile-mode." | |||
| 224 | (defcustom makefile-runtime-macros-list | 224 | (defcustom makefile-runtime-macros-list |
| 225 | '(("@") ("&") (">") ("<") ("*") ("^") ("+") ("?") ("%") ("$")) | 225 | '(("@") ("&") (">") ("<") ("*") ("^") ("+") ("?") ("%") ("$")) |
| 226 | "List of macros that are resolved by make at runtime. | 226 | "List of macros that are resolved by make at runtime. |
| 227 | If you insert a macro reference using makefile-insert-macro-ref, the name | 227 | If you insert a macro reference using `makefile-insert-macro-ref', the name |
| 228 | of the macro is checked against this list. If it can be found its name will | 228 | of the macro is checked against this list. If it can be found its name will |
| 229 | not be enclosed in { } or ( )." | 229 | not be enclosed in { } or ( )." |
| 230 | :type '(repeat (list string)) | 230 | :type '(repeat (list string)) |
| 231 | :group 'makefile) | 231 | :group 'makefile) |
| @@ -237,7 +237,7 @@ not be enclosed in { } or ( )." | |||
| 237 | "^ *\\([^ \n\t#:=]+\\([ \t]+\\([^ \t\n#:=]+\\|\\$[({][^ \t\n#})]+[})]\\)\\)*\\)[ \t]*:\\([ \t]*$\\|\\([^=\n].*$\\)\\)" | 237 | "^ *\\([^ \n\t#:=]+\\([ \t]+\\([^ \t\n#:=]+\\|\\$[({][^ \t\n#})]+[})]\\)\\)*\\)[ \t]*:\\([ \t]*$\\|\\([^=\n].*$\\)\\)" |
| 238 | "Regex used to find dependency lines in a makefile.") | 238 | "Regex used to find dependency lines in a makefile.") |
| 239 | 239 | ||
| 240 | ;; Note that the first subexpression is used by font lock. Note | 240 | ;; Note that the first subexpression is used by font lock. Note |
| 241 | ;; that if you change this regexp you might have to fix the imenu | 241 | ;; that if you change this regexp you might have to fix the imenu |
| 242 | ;; index in makefile-imenu-generic-expression. | 242 | ;; index in makefile-imenu-generic-expression. |
| 243 | (defconst makefile-macroassign-regex | 243 | (defconst makefile-macroassign-regex |
| @@ -284,7 +284,7 @@ not be enclosed in { } or ( )." | |||
| 284 | (list | 284 | (list |
| 285 | (list "Dependencies" makefile-dependency-regex 1) | 285 | (list "Dependencies" makefile-dependency-regex 1) |
| 286 | (list "Macro Assignment" makefile-macroassign-regex 1)) | 286 | (list "Macro Assignment" makefile-macroassign-regex 1)) |
| 287 | "Imenu generic expression for makefile-mode. See `imenu-generic-expression'.") | 287 | "Imenu generic expression for Makefile mode. See `imenu-generic-expression'.") |
| 288 | 288 | ||
| 289 | ;;; ------------------------------------------------------------ | 289 | ;;; ------------------------------------------------------------ |
| 290 | ;;; The following configurable variables are used in the | 290 | ;;; The following configurable variables are used in the |
| @@ -320,7 +320,7 @@ The function must satisfy this calling convention: | |||
| 320 | be checked, as a string. | 320 | be checked, as a string. |
| 321 | 321 | ||
| 322 | * As its second argument, it may accept the name of a makefile | 322 | * As its second argument, it may accept the name of a makefile |
| 323 | as a string. Depending on what you're going to do you may | 323 | as a string. Depending on what you're going to do you may |
| 324 | not need this. | 324 | not need this. |
| 325 | 325 | ||
| 326 | * It must return the integer value 0 (zero) if the given target | 326 | * It must return the integer value 0 (zero) if the given target |
| @@ -383,17 +383,17 @@ The function must satisfy this calling convention: | |||
| 383 | () | 383 | () |
| 384 | (setq makefile-browser-map (make-sparse-keymap)) | 384 | (setq makefile-browser-map (make-sparse-keymap)) |
| 385 | (define-key makefile-browser-map "n" 'makefile-browser-next-line) | 385 | (define-key makefile-browser-map "n" 'makefile-browser-next-line) |
| 386 | (define-key makefile-browser-map "\C-n" 'makefile-browser-next-line) | 386 | (define-key makefile-browser-map "\C-n" 'makefile-browser-next-line) |
| 387 | (define-key makefile-browser-map "p" 'makefile-browser-previous-line) | 387 | (define-key makefile-browser-map "p" 'makefile-browser-previous-line) |
| 388 | (define-key makefile-browser-map "\C-p" 'makefile-browser-previous-line) | 388 | (define-key makefile-browser-map "\C-p" 'makefile-browser-previous-line) |
| 389 | (define-key makefile-browser-map " " 'makefile-browser-toggle) | 389 | (define-key makefile-browser-map " " 'makefile-browser-toggle) |
| 390 | (define-key makefile-browser-map "i" 'makefile-browser-insert-selection) | 390 | (define-key makefile-browser-map "i" 'makefile-browser-insert-selection) |
| 391 | (define-key makefile-browser-map "I" 'makefile-browser-insert-selection-and-quit) | 391 | (define-key makefile-browser-map "I" 'makefile-browser-insert-selection-and-quit) |
| 392 | (define-key makefile-browser-map "\C-c\C-m" 'makefile-browser-insert-continuation) | 392 | (define-key makefile-browser-map "\C-c\C-m" 'makefile-browser-insert-continuation) |
| 393 | (define-key makefile-browser-map "q" 'makefile-browser-quit) | 393 | (define-key makefile-browser-map "q" 'makefile-browser-quit) |
| 394 | ;; disable horizontal movement | 394 | ;; disable horizontal movement |
| 395 | (define-key makefile-browser-map "\C-b" 'undefined) | 395 | (define-key makefile-browser-map "\C-b" 'undefined) |
| 396 | (define-key makefile-browser-map "\C-f" 'undefined)) | 396 | (define-key makefile-browser-map "\C-f" 'undefined)) |
| 397 | 397 | ||
| 398 | 398 | ||
| 399 | (defvar makefile-mode-syntax-table nil) | 399 | (defvar makefile-mode-syntax-table nil) |
| @@ -404,7 +404,7 @@ The function must satisfy this calling convention: | |||
| 404 | (modify-syntax-entry ?\) ")( " makefile-mode-syntax-table) | 404 | (modify-syntax-entry ?\) ")( " makefile-mode-syntax-table) |
| 405 | (modify-syntax-entry ?\[ "(] " makefile-mode-syntax-table) | 405 | (modify-syntax-entry ?\[ "(] " makefile-mode-syntax-table) |
| 406 | (modify-syntax-entry ?\] ")[ " makefile-mode-syntax-table) | 406 | (modify-syntax-entry ?\] ")[ " makefile-mode-syntax-table) |
| 407 | (modify-syntax-entry ?\{ "(} " makefile-mode-syntax-table) | 407 | (modify-syntax-entry ?\{ "(} " makefile-mode-syntax-table) |
| 408 | (modify-syntax-entry ?\} "){ " makefile-mode-syntax-table) | 408 | (modify-syntax-entry ?\} "){ " makefile-mode-syntax-table) |
| 409 | (modify-syntax-entry ?\' "\" " makefile-mode-syntax-table) | 409 | (modify-syntax-entry ?\' "\" " makefile-mode-syntax-table) |
| 410 | (modify-syntax-entry ?\` "\" " makefile-mode-syntax-table) | 410 | (modify-syntax-entry ?\` "\" " makefile-mode-syntax-table) |
| @@ -492,7 +492,7 @@ makefile-macro-assign: | |||
| 492 | The string that gets appended to all macro names | 492 | The string that gets appended to all macro names |
| 493 | inserted by `makefile-insert-macro'. | 493 | inserted by `makefile-insert-macro'. |
| 494 | The normal value should be \" = \", since this is what | 494 | The normal value should be \" = \", since this is what |
| 495 | standard make expects. However, newer makes such as dmake | 495 | standard make expects. However, newer makes such as dmake |
| 496 | allow a larger variety of different macro assignments, so you | 496 | allow a larger variety of different macro assignments, so you |
| 497 | might prefer to use \" += \" or \" := \" . | 497 | might prefer to use \" += \" or \" := \" . |
| 498 | 498 | ||
| @@ -525,12 +525,12 @@ makefile-pickup-everything-picks-up-filenames-p: | |||
| 525 | filenames are omitted. | 525 | filenames are omitted. |
| 526 | 526 | ||
| 527 | makefile-cleanup-continuations-p: | 527 | makefile-cleanup-continuations-p: |
| 528 | If this variable is set to a non-nil value then makefile-mode | 528 | If this variable is set to a non-nil value then Makefile mode |
| 529 | will assure that no line in the file ends with a backslash | 529 | will assure that no line in the file ends with a backslash |
| 530 | (the continuation character) followed by any whitespace. | 530 | (the continuation character) followed by any whitespace. |
| 531 | This is done by silently removing the trailing whitespace, leaving | 531 | This is done by silently removing the trailing whitespace, leaving |
| 532 | the backslash itself intact. | 532 | the backslash itself intact. |
| 533 | IMPORTANT: Please note that enabling this option causes makefile-mode | 533 | IMPORTANT: Please note that enabling this option causes Makefile mode |
| 534 | to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\". | 534 | to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\". |
| 535 | 535 | ||
| 536 | makefile-browser-hook: | 536 | makefile-browser-hook: |
| @@ -684,7 +684,7 @@ Anywhere else just self-inserts." | |||
| 684 | (makefile-remember-target target-name)))) | 684 | (makefile-remember-target target-name)))) |
| 685 | 685 | ||
| 686 | (defun makefile-insert-target-ref (target-name) | 686 | (defun makefile-insert-target-ref (target-name) |
| 687 | "Complete on a list of known targets, then insert target-ref at point." | 687 | "Complete on a list of known targets, then insert TARGET-NAME at point." |
| 688 | (interactive | 688 | (interactive |
| 689 | (list | 689 | (list |
| 690 | (progn | 690 | (progn |
| @@ -905,7 +905,7 @@ The context determines which are considered." | |||
| 905 | With no argument, inserts backslashes and aligns existing backslashes. | 905 | With no argument, inserts backslashes and aligns existing backslashes. |
| 906 | With an argument, deletes the backslashes. | 906 | With an argument, deletes the backslashes. |
| 907 | 907 | ||
| 908 | This function does not modify the last line of the region if the region ends | 908 | This function does not modify the last line of the region if the region ends |
| 909 | right at the start of the following line; it does not modify blank lines | 909 | right at the start of the following line; it does not modify blank lines |
| 910 | at the start of the region. So you can put the region around an entire macro | 910 | at the start of the region. So you can put the region around an entire macro |
| 911 | definition and conveniently use this command." | 911 | definition and conveniently use this command." |
| @@ -1298,7 +1298,7 @@ and generates the overview, one line per target name." | |||
| 1298 | (function (lambda (item) | 1298 | (function (lambda (item) |
| 1299 | (let* ((target-name (car item)) | 1299 | (let* ((target-name (car item)) |
| 1300 | (no-prereqs (not (member target-name prereq-list))) | 1300 | (no-prereqs (not (member target-name prereq-list))) |
| 1301 | (needs-rebuild (or no-prereqs | 1301 | (needs-rebuild (or no-prereqs |
| 1302 | (funcall | 1302 | (funcall |
| 1303 | makefile-query-one-target-method | 1303 | makefile-query-one-target-method |
| 1304 | target-name | 1304 | target-name |