aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1998-06-20 22:06:30 +0000
committerKarl Heuer1998-06-20 22:06:30 +0000
commit94487c4e376640bab3281d19b19bbca531ab78ec (patch)
treee3a7036be3c5cffb73bd92d9f1fefaeadb4fd81a
parent799fdb040b4d006cfefd0a4d288f4dc89c436447 (diff)
downloademacs-94487c4e376640bab3281d19b19bbca531ab78ec.tar.gz
emacs-94487c4e376640bab3281d19b19bbca531ab78ec.zip
Doc fixes.
-rw-r--r--lisp/international/characters.el8
-rw-r--r--lisp/startup.el4
-rw-r--r--lisp/textmodes/ispell.el10
-rw-r--r--src/charset.h4
-rw-r--r--src/coding.c2
-rw-r--r--src/emacs.c2
-rw-r--r--src/xdisp.c2
7 files changed, 16 insertions, 16 deletions
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 4eec1209a8a..ba55a2c7677 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -54,13 +54,13 @@
54 54
55;; For each group (row) of 2-byte character sets. 55;; For each group (row) of 2-byte character sets.
56 56
57(define-category ?A "Alpha numeric characters of 2-byte character sets") 57(define-category ?A "Alpha-numeric characters of 2-byte character sets")
58(define-category ?C "Chinese (Han) characters of 2-byte character sets") 58(define-category ?C "Chinese (Han) characters of 2-byte character sets")
59(define-category ?G "Greek characters of 2-byte characters sets") 59(define-category ?G "Greek characters of 2-byte character sets")
60(define-category ?H "Japanese Hiragana characters of 2-byte character sets") 60(define-category ?H "Japanese Hiragana characters of 2-byte character sets")
61(define-category ?K "Japanese Katakana characters of 2-byte character sets") 61(define-category ?K "Japanese Katakana characters of 2-byte character sets")
62(define-category ?N "Korean Hangul characters of 2-byte character sets") 62(define-category ?N "Korean Hangul characters of 2-byte character sets")
63(define-category ?Y "Cyrillic character of 2-byte character sets") 63(define-category ?Y "Cyrillic characters of 2-byte character sets")
64(define-category ?I "Indian Glyphs") 64(define-category ?I "Indian Glyphs")
65 65
66;; For phonetic classifications. 66;; For phonetic classifications.
@@ -83,7 +83,7 @@
83(define-category ? 83(define-category ?
84 "This character counts as a space for indentation purposes.") 84 "This character counts as a space for indentation purposes.")
85 85
86;; Keep the followings for `kinsoku' processing. See comments in 86;; Keep the following for `kinsoku' processing. See comments in
87;; kinsoku.el. 87;; kinsoku.el.
88(define-category ?> "A character which can't be placed at beginning of line.") 88(define-category ?> "A character which can't be placed at beginning of line.")
89(define-category ?< "A character which can't be placed at end of line.") 89(define-category ?< "A character which can't be placed at end of line.")
diff --git a/lisp/startup.el b/lisp/startup.el
index 1bb948ea0a8..32fe585682c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -134,7 +134,7 @@ with the contents of the startup message."
134 "*Non-nil inhibits the initial startup echo area message. 134 "*Non-nil inhibits the initial startup echo area message.
135Setting this variable takes effect 135Setting this variable takes effect
136only if you do it with the customization buffer 136only if you do it with the customization buffer
137or it your `.emacs' file contains a line of this form: 137or if your `.emacs' file contains a line of this form:
138 (setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\") 138 (setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\")
139If your `.emacs' file is byte-compiled, use the following form instead: 139If your `.emacs' file is byte-compiled, use the following form instead:
140 (eval '(setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\")) 140 (eval '(setq inhibit-startup-echo-area-message \"YOUR-USER-NAME\"))
@@ -249,7 +249,7 @@ Emacs never sets this variable itself.")
249 "The brand of keyboard you are using. 249 "The brand of keyboard you are using.
250This variable is used to define 250This variable is used to define
251the proper function and keypad keys for use under X. It is used in a 251the proper function and keypad keys for use under X. It is used in a
252fashion analogous to the environment value TERM.") 252fashion analogous to the environment variable TERM.")
253 253
254(defvar window-setup-hook nil 254(defvar window-setup-hook nil
255 "Normal hook run to initialize window system display. 255 "Normal hook run to initialize window system display.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 080c221a48e..2499111a767 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -774,13 +774,13 @@ The last occurring definition in the buffer will be used.")
774 ;; identification of the computer name, e.g.: 774 ;; identification of the computer name, e.g.:
775 ;; "\\(\\w\\|-\\)+[.:@]\\(\\w\\|-\\)*\\([.:/@]+\\(\\w\\|-\\|~\\)+\\)+" 775 ;; "\\(\\w\\|-\\)+[.:@]\\(\\w\\|-\\)*\\([.:/@]+\\(\\w\\|-\\|~\\)+\\)+"
776 ) 776 )
777 "A-list expressing begining and end of regions not to spell check. 777 "Alist expressing beginning and end of regions not to spell check.
778The alist key must be a regular expression. 778The alist key must be a regular expression.
779Valid forms include: 779Valid forms include:
780 (KEY) - just skip the key. 780 (KEY) - just skip the key.
781 (KEY . REGEXP) - skip to the end REGEXP. REGEXP may be string or symbol. 781 (KEY . REGEXP) - skip to the end of REGEXP. REGEXP may be string or symbol.
782 (KEY REGEXP) - skip to end of REGEXP. REGEXP must be a string. 782 (KEY REGEXP) - skip to end of REGEXP. REGEXP must be a string.
783 (KEY FUNCTION ARGS) - function called with args returns end of region.") 783 (KEY FUNCTION ARGS) - FUNCTION called with ARGS returns end of region.")
784 784
785 785
786 786
@@ -1984,7 +1984,7 @@ Return non-nil if not aborted."
1984 1984
1985 1985
1986;;; Creates the regexp for skipping a region. 1986;;; Creates the regexp for skipping a region.
1987;;; Makes the skip-regxp local for tex buffers adding in the 1987;;; Makes the skip-regexp local for tex buffers adding in the
1988;;; tex expressions to skip as well. 1988;;; tex expressions to skip as well.
1989;;; Call AFTER ispell-buffer-local-parsing. 1989;;; Call AFTER ispell-buffer-local-parsing.
1990(defun ispell-begin-skip-region-regexp () 1990(defun ispell-begin-skip-region-regexp ()
@@ -2780,7 +2780,7 @@ Both should not be used to define a buffer-local dictionary."
2780; LocalWords: pgp NZST Vignaux autoloaded loaddefs aff Francais Nederlands SPC 2780; LocalWords: pgp NZST Vignaux autoloaded loaddefs aff Francais Nederlands SPC
2781; LocalWords: popup nonmenu regexp herr num pers dict unhighlight ccept uit NB 2781; LocalWords: popup nonmenu regexp herr num pers dict unhighlight ccept uit NB
2782; LocalWords: buf grep sync prev inc hilight olddot AIX ersion msg read's op 2782; LocalWords: buf grep sync prev inc hilight olddot AIX ersion msg read's op
2783; LocalWords: bufs pt regxp multibyte cmd Quinlan uuencoded esp unidiff eg sc 2783; LocalWords: bufs pt multibyte cmd Quinlan uuencoded esp unidiff eg sc
2784; LocalWords: VM lns HTML eval american IspellPersDict 2784; LocalWords: VM lns HTML eval american IspellPersDict
2785 2785
2786;;; ispell.el ends here 2786;;; ispell.el ends here
diff --git a/src/charset.h b/src/charset.h
index 17331f2495b..a3989d9623b 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -155,7 +155,7 @@ extern int charset_big5_2; /* Big5 Level 2 (Chinese Traditional) */
155 Emacs has two kinds of representation of a character: multi-byte 155 Emacs has two kinds of representation of a character: multi-byte
156 form (for buffer and string) and single-word form (for character 156 form (for buffer and string) and single-word form (for character
157 object in Emacs Lisp). The latter is called "character code" here 157 object in Emacs Lisp). The latter is called "character code" here
158 after. Both representation encode the information of charset and 158 after. Both representations encode the information of charset and
159 POSITION-CODE but in a different way (for instance, MSB of 159 POSITION-CODE but in a different way (for instance, MSB of
160 POSITION-CODE is set in multi-byte form). 160 POSITION-CODE is set in multi-byte form).
161 161
@@ -197,7 +197,7 @@ extern int charset_big5_2; /* Big5 Level 2 (Chinese Traditional) */
197/*** GENERAL NOTE on COMPOSITE CHARACTER *** 197/*** GENERAL NOTE on COMPOSITE CHARACTER ***
198 198
199 A composite character is a character composed from several (up to 199 A composite character is a character composed from several (up to
200 16) non-composite characters (components). Although each components 200 16) non-composite characters (components). Although each component
201 can belong to any charset, a composite character itself belongs to 201 can belong to any charset, a composite character itself belongs to
202 the charset `charset-composition' and is assigned a special 202 the charset `charset-composition' and is assigned a special
203 leading-code `LEADING_CODE_COMPOSITION' for multi-byte form. See 203 leading-code `LEADING_CODE_COMPOSITION' for multi-byte form. See
diff --git a/src/coding.c b/src/coding.c
index f6945d07308..2a986fd1d4e 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -315,7 +315,7 @@ Lisp_Object Vcoding_system_for_write;
315Lisp_Object Vlast_coding_system_used; 315Lisp_Object Vlast_coding_system_used;
316 316
317/* A vector of length 256 which contains information about special 317/* A vector of length 256 which contains information about special
318 Latin codes (espepcially for dealing with Microsoft code). */ 318 Latin codes (especially for dealing with Microsoft codes). */
319Lisp_Object Vlatin_extra_code_table; 319Lisp_Object Vlatin_extra_code_table;
320 320
321/* Flag to inhibit code conversion of end-of-line format. */ 321/* Flag to inhibit code conversion of end-of-line format. */
diff --git a/src/emacs.c b/src/emacs.c
index 3a1e0f2b5ff..671c6eb4b62 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -599,7 +599,7 @@ main (argc, argv, envp)
599 printf ("You may redistribute copies of Emacs\n"); 599 printf ("You may redistribute copies of Emacs\n");
600 printf ("under the terms of the GNU General Public License.\n"); 600 printf ("under the terms of the GNU General Public License.\n");
601 printf ("For more information about these matters, "); 601 printf ("For more information about these matters, ");
602 printf ("see the files named COPYING.\n"); 602 printf ("see the file named COPYING.\n");
603 exit (0); 603 exit (0);
604 } 604 }
605 } 605 }
diff --git a/src/xdisp.c b/src/xdisp.c
index 365b172c8a4..6a14f44d775 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3797,7 +3797,7 @@ display_text_line (w, start, start_byte, vpos, hpos, taboffset, ovstr_done)
3797 else 3797 else
3798 { 3798 {
3799 /* C is a multibyte character or a character to be displayed 3799 /* C is a multibyte character or a character to be displayed
3800 by octral form. */ 3800 by octal form. */
3801 int remaining_bytes = len; 3801 int remaining_bytes = len;
3802 3802
3803 if (c >= 0400) 3803 if (c >= 0400)