aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-12-14 23:24:10 -0800
committerPaul Eggert2011-12-14 23:24:10 -0800
commitbbd240ceeefcf4181aa9205f4e743b32b5c68e1f (patch)
tree957397737a8b0e76a40dfe79f191945e9f5aa09b
parent100d5755ed82e6c47833a3559fb0a154381d5afd (diff)
downloademacs-bbd240ceeefcf4181aa9205f4e743b32b5c68e1f.tar.gz
emacs-bbd240ceeefcf4181aa9205f4e743b32b5c68e1f.zip
Spelling fixes.
-rw-r--r--configure.in2
-rw-r--r--doc/misc/ede.texi4
-rw-r--r--doc/misc/semantic.texi2
-rw-r--r--etc/NEWS.222
-rw-r--r--lisp/arc-mode.el4
-rw-r--r--lisp/cedet/semantic/scope.el2
-rw-r--r--lisp/dframe.el2
-rw-r--r--lisp/emacs-lisp/pcase.el10
-rw-r--r--lisp/filesets.el2
-rw-r--r--lisp/international/ccl.el2
-rw-r--r--lisp/international/quail.el4
-rw-r--r--lisp/international/titdic-cnv.el4
-rw-r--r--lisp/org/org-protocol.el4
-rw-r--r--lisp/printing.el10
-rw-r--r--lisp/progmodes/cperl-mode.el14
-rw-r--r--lisp/progmodes/gdb-mi.el2
-rw-r--r--lisp/progmodes/idlwave.el2
-rw-r--r--src/ChangeLog.112
-rw-r--r--src/ChangeLog.82
-rw-r--r--src/charset.c2
-rw-r--r--src/charset.h4
-rw-r--r--src/font.h2
-rw-r--r--src/w16select.c9
-rw-r--r--src/w32font.c2
24 files changed, 47 insertions, 48 deletions
diff --git a/configure.in b/configure.in
index 53c219c0923..b4bb8eb708c 100644
--- a/configure.in
+++ b/configure.in
@@ -1683,7 +1683,7 @@ if test "$doug_lea_malloc" = "yes" ; then
1683 ## Use mmap directly for allocating larger buffers. 1683 ## Use mmap directly for allocating larger buffers.
1684 ## FIXME this comes from src/s/{gnu,gnu-linux}.h: 1684 ## FIXME this comes from src/s/{gnu,gnu-linux}.h:
1685 ## #ifdef DOUG_LEA_MALLOC; #undef REL_ALLOC; #endif 1685 ## #ifdef DOUG_LEA_MALLOC; #undef REL_ALLOC; #endif
1686 ## Does the AC_FUNC_MMAP test below make this check unecessary? 1686 ## Does the AC_FUNC_MMAP test below make this check unnecessary?
1687 case "$opsys" in 1687 case "$opsys" in
1688 gnu*) REL_ALLOC=no ;; 1688 gnu*) REL_ALLOC=no ;;
1689 esac 1689 esac
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index cc566086f44..d488fb5b515 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -705,11 +705,11 @@ A brief description of the project or target. This is currently used
705by the @samp{ede-speedbar} interface. 705by the @samp{ede-speedbar} interface.
706@item ede-want-file-p 706@item ede-want-file-p
707Return non-nil if a target will accept a given file. 707Return non-nil if a target will accept a given file.
708It is generally unecessary to override this. See the section on source 708It is generally unnecessary to override this. See the section on source
709code. 709code.
710@item ede-buffer-mine 710@item ede-buffer-mine
711Return non-nil if a buffer belongs to this target. Used during 711Return non-nil if a buffer belongs to this target. Used during
712association when a file is loaded. It is generally unecessary to 712association when a file is loaded. It is generally unnecessary to
713override this unless you keep auxiliary files. 713override this unless you keep auxiliary files.
714@end table 714@end table
715 715
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi
index dcfff1fcb96..8c56d2dc9f8 100644
--- a/doc/misc/semantic.texi
+++ b/doc/misc/semantic.texi
@@ -380,7 +380,7 @@ with the search results format.
380 380
381@item semanticdb-ref.el 381@item semanticdb-ref.el
382Tracks crossreferences. Cross references are needed when buffer is 382Tracks crossreferences. Cross references are needed when buffer is
383reparsed, and must alert other tables that any dependant caches may 383reparsed, and must alert other tables that any dependent caches may
384need to be flushed. References are in the form of include files. 384need to be flushed. References are in the form of include files.
385 385
386@end table 386@end table
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 87d77cf52fc..70c7b0e018b 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -4273,7 +4273,7 @@ of suffixes. The function also accepts a predicate argument to
4273further filter candidate files. 4273further filter candidate files.
4274 4274
4275One advantage of using this function is that the list of suffixes in 4275One advantage of using this function is that the list of suffixes in
4276`exec-suffixes' is OS-dependant, so this function will find 4276`exec-suffixes' is OS-dependent, so this function will find
4277executables without polluting Lisp code with OS dependencies. 4277executables without polluting Lisp code with OS dependencies.
4278 4278
4279*** The new function `file-remote-p' tests a file name and returns 4279*** The new function `file-remote-p' tests a file name and returns
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 48b4c5be164..816291166fa 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -860,13 +860,13 @@ using `make-temp-file', and the generated name is returned."
860 dir))) 860 dir)))
861 (if (or alien (file-exists-p fullname)) 861 (if (or alien (file-exists-p fullname))
862 (progn 862 (progn
863 ;; Maked sure all the leading directories in 863 ;; Make sure all the leading directories in
864 ;; archive-local-name exist under archive-tmpdir, so that 864 ;; archive-local-name exist under archive-tmpdir, so that
865 ;; the directory structure recorded in the archive is 865 ;; the directory structure recorded in the archive is
866 ;; reconstructed in the temporary directory. 866 ;; reconstructed in the temporary directory.
867 (make-directory (file-name-directory tmpfile) t) 867 (make-directory (file-name-directory tmpfile) t)
868 (make-temp-file tmpfile)) 868 (make-temp-file tmpfile))
869 ;; Maked sure all the leading directories in `fullname' exist 869 ;; Make sure all the leading directories in `fullname' exist
870 ;; under archive-tmpdir. This is necessary for nested archives 870 ;; under archive-tmpdir. This is necessary for nested archives
871 ;; (`archive-extract' sets `archive-remote' to t in case 871 ;; (`archive-extract' sets `archive-remote' to t in case
872 ;; an archive occurs inside another archive). 872 ;; an archive occurs inside another archive).
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index ea4903c70ea..937936032d2 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -725,7 +725,7 @@ The class returned from the scope calculation is variable
725 (oset scopecache localargs localargs) 725 (oset scopecache localargs localargs)
726 (oset scopecache localvar localvar) 726 (oset scopecache localvar localvar)
727 ))) 727 )))
728 ;; Make sure we become dependant on the typecache. 728 ;; Make sure we become dependent on the typecache.
729 (semanticdb-typecache-add-dependant scopecache) 729 (semanticdb-typecache-add-dependant scopecache)
730 ;; Handy debug output. 730 ;; Handy debug output.
731 (when (called-interactively-p 'any) 731 (when (called-interactively-p 'any)
diff --git a/lisp/dframe.el b/lisp/dframe.el
index b4f44e1a308..728f08d135d 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -221,7 +221,7 @@ Local to those buffers, as a function called that created it.")
221 (define-key map [mouse-2] 'dframe-click) 221 (define-key map [mouse-2] 'dframe-click)
222 ;; This is the power click for new frames, or refreshing a cache 222 ;; This is the power click for new frames, or refreshing a cache
223 (define-key map [S-mouse-2] 'dframe-power-click) 223 (define-key map [S-mouse-2] 'dframe-power-click)
224 ;; This adds a small unecessary visual effect 224 ;; This adds a small unnecessary visual effect
225 ;;(define-key map [down-mouse-2] 'dframe-quick-mouse) 225 ;;(define-key map [down-mouse-2] 'dframe-quick-mouse)
226 226
227 (define-key map [down-mouse-3] 'dframe-popup-kludge) 227 (define-key map [down-mouse-3] 'dframe-popup-kludge)
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index e6c4ccbbc50..6931ce75cb5 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -363,12 +363,12 @@ MATCH is the pattern that needs to be matched, of the form:
363 (dolist (branch rest) 363 (dolist (branch rest)
364 (let* ((match (car branch)) 364 (let* ((match (car branch))
365 (code&vars (cdr branch)) 365 (code&vars (cdr branch))
366 (splitted 366 (split
367 (pcase--split-match sym splitter match))) 367 (pcase--split-match sym splitter match)))
368 (unless (eq (car splitted) :pcase--fail) 368 (unless (eq (car split) :pcase--fail)
369 (push (cons (car splitted) code&vars) then-rest)) 369 (push (cons (car split) code&vars) then-rest))
370 (unless (eq (cdr splitted) :pcase--fail) 370 (unless (eq (cdr split) :pcase--fail)
371 (push (cons (cdr splitted) code&vars) else-rest)))) 371 (push (cons (cdr split) code&vars) else-rest))))
372 (cons (nreverse then-rest) (nreverse else-rest)))) 372 (cons (nreverse then-rest) (nreverse else-rest))))
373 373
374(defun pcase--split-consp (syma symd pat) 374(defun pcase--split-consp (syma symd pat)
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 680a107adfe..0f6c6e8dd78 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -453,7 +453,7 @@ will not be rewrapped if their length exceeds this value."
453 :group 'filesets) 453 :group 'filesets)
454 454
455(defcustom filesets-max-entry-length 50 455(defcustom filesets-max-entry-length 50
456 "Truncate names of splitted submenus to this length." 456 "Truncate names of split submenus to this length."
457 :set (function filesets-set-default) 457 :set (function filesets-set-default)
458 :type 'integer 458 :type 'integer
459 :group 'filesets) 459 :group 'filesets)
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index 457fe84c0b1..d16a272c9dc 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -1469,7 +1469,7 @@ OPERATOR :=
1469 | de-sjis 1469 | de-sjis
1470 1470
1471 ;; If ARG_0 and ARG_1 are the first and second code point of 1471 ;; If ARG_0 and ARG_1 are the first and second code point of
1472 ;; JISX0208 character CHAR, and SJIS is the correponding 1472 ;; JISX0208 character CHAR, and SJIS is the corresponding
1473 ;; Shift-JIS code, 1473 ;; Shift-JIS code,
1474 ;; (REG = ARG_0 en-sjis ARG_1) means: 1474 ;; (REG = ARG_0 en-sjis ARG_1) means:
1475 ;; ((REG = HIGH) 1475 ;; ((REG = HIGH)
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 3a70b1ec2a5..3e0f543492a 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2832,7 +2832,7 @@ STATE-n are symbols to denote state. STATE-0 is the initial state.
2832TRANSITION-n-m are transition rules from STATE-n, and have the form 2832TRANSITION-n-m are transition rules from STATE-n, and have the form
2833\(RULES . STATE-x) or RULES, where STATE-x is one of STATE-n above, 2833\(RULES . STATE-x) or RULES, where STATE-x is one of STATE-n above,
2834RULES is a symbol whose value is an alist of keys \(string) vs the 2834RULES is a symbol whose value is an alist of keys \(string) vs the
2835correponding characters or strings. The format of the symbol value of 2835corresponding characters or strings. The format of the symbol value of
2836RULES is the same as arguments to `quail-define-rules'. 2836RULES is the same as arguments to `quail-define-rules'.
2837 2837
2838If TRANSITION-n-m has the form (RULES . STATE-x), it means that 2838If TRANSITION-n-m has the form (RULES . STATE-x), it means that
@@ -2846,7 +2846,7 @@ The generated map can be set for the current Quail package by the
2846function `quail-install-map' (which see)." 2846function `quail-install-map' (which see)."
2847 (let ((state-alist (mapcar (lambda (x) (list (car x))) table)) 2847 (let ((state-alist (mapcar (lambda (x) (list (car x))) table))
2848 tail elt) 2848 tail elt)
2849 ;; STATE-ALIST is an alist of states vs the correponding sub Quail 2849 ;; STATE-ALIST is an alist of states vs the corresponding sub Quail
2850 ;; map. It is now initialized to ((STATE-0) (STATE-1) ...). 2850 ;; map. It is now initialized to ((STATE-0) (STATE-1) ...).
2851 ;; Set key sequence mapping rules in cdr part of each element. 2851 ;; Set key sequence mapping rules in cdr part of each element.
2852 (while table 2852 (while table
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 82349761bdb..304dc01abe4 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -103,7 +103,7 @@ For example:
103 103
104\\<quail-translation-docstring> 104\\<quail-translation-docstring>
105 105
106For double-width GB2312 characters correponding to ASCII, use the 106For double-width GB2312 characters corresponding to ASCII, use the
107input method `chinese-qj'.") 107input method `chinese-qj'.")
108 108
109 ("chinese-ecdict" "$(05CKH(B" 109 ("chinese-ecdict" "$(05CKH(B"
@@ -191,7 +191,7 @@ For instance, to input $ADc(B, you type \"n i 3 3\", the first \"n i\" is
191a Pinyin, the next \"3\" specifies tone, and the last \"3\" selects 191a Pinyin, the next \"3\" specifies tone, and the last \"3\" selects
192the third character from the candidate list. 192the third character from the candidate list.
193 193
194For double-width GB2312 characters correponding to ASCII, use the 194For double-width GB2312 characters corresponding to ASCII, use the
195input method `chinese-qj'.") 195input method `chinese-qj'.")
196 196
197 ("chinese-zozy" "$(0I\0D(B" 197 ("chinese-zozy" "$(0I\0D(B"
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index ca7bfe2a4d0..bbb93b07fc9 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -546,8 +546,8 @@ as filename."
546 (when (string-match proto fname) 546 (when (string-match proto fname)
547 (let* ((func (plist-get (cdr prolist) :function)) 547 (let* ((func (plist-get (cdr prolist) :function))
548 (greedy (plist-get (cdr prolist) :greedy)) 548 (greedy (plist-get (cdr prolist) :greedy))
549 (splitted (split-string fname proto)) 549 (split (split-string fname proto))
550 (result (if greedy restoffiles (cadr splitted)))) 550 (result (if greedy restoffiles (cadr split))))
551 (when (plist-get (cdr prolist) :kill-client) 551 (when (plist-get (cdr prolist) :kill-client)
552 (message "Greedy org-protocol handler. Killing client.") 552 (message "Greedy org-protocol handler. Killing client.")
553 (server-edit)) 553 (server-edit))
diff --git a/lisp/printing.el b/lisp/printing.el
index dab57d16dca..a604b9f1027 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -4710,12 +4710,12 @@ Interactively, you have the following situations:
4710 4710
4711 M-x pr-ps-fast-fire RET 4711 M-x pr-ps-fast-fire RET
4712 The command prompts the user for a N-UP value and printing will 4712 The command prompts the user for a N-UP value and printing will
4713 immediatelly be done using the current active printer. 4713 immediately be done using the current active printer.
4714 4714
4715 C-u M-x pr-ps-fast-fire RET 4715 C-u M-x pr-ps-fast-fire RET
4716 C-u 0 M-x pr-ps-fast-fire RET 4716 C-u 0 M-x pr-ps-fast-fire RET
4717 The command prompts the user for a N-UP value and also for a current 4717 The command prompts the user for a N-UP value and also for a current
4718 PostScript printer, then printing will immediatelly be done using the new 4718 PostScript printer, then printing will immediately be done using the new
4719 current active printer. 4719 current active printer.
4720 4720
4721 C-u 1 M-x pr-ps-fast-fire RET 4721 C-u 1 M-x pr-ps-fast-fire RET
@@ -4736,7 +4736,7 @@ zero and the argument SELECT is treated as follows:
4736 If it's nil, send the image to the printer. 4736 If it's nil, send the image to the printer.
4737 4737
4738 If it's a list or an integer lesser or equal to zero, the command prompts 4738 If it's a list or an integer lesser or equal to zero, the command prompts
4739 the user for a current PostScript printer, then printing will immediatelly 4739 the user for a current PostScript printer, then printing will immediately
4740 be done using the new current active printer. 4740 be done using the new current active printer.
4741 4741
4742 If it's an integer equal to 1, the command prompts the user for a file name 4742 If it's an integer equal to 1, the command prompts the user for a file name
@@ -4749,7 +4749,7 @@ zero and the argument SELECT is treated as follows:
4749 instead of sending it to the printer. 4749 instead of sending it to the printer.
4750 4750
4751 If it's a symbol which it's defined in `pr-ps-printer-alist', it's the new 4751 If it's a symbol which it's defined in `pr-ps-printer-alist', it's the new
4752 active printer and printing will immediatelly be done using the new active 4752 active printer and printing will immediately be done using the new active
4753 printer. 4753 printer.
4754 4754
4755 Otherwise, send the image to the printer. 4755 Otherwise, send the image to the printer.
@@ -4800,7 +4800,7 @@ Noninteractively, the argument SELECT-PRINTER is treated as follows:
4800 If it's nil, the printing is sent to the current active text printer. 4800 If it's nil, the printing is sent to the current active text printer.
4801 4801
4802 If it's a symbol which it's defined in `pr-txt-printer-alist', it's the new 4802 If it's a symbol which it's defined in `pr-txt-printer-alist', it's the new
4803 active printer and printing will immediatelly be done using the new active 4803 active printer and printing will immediately be done using the new active
4804 printer. 4804 printer.
4805 4805
4806 If it's non-nil, the command prompts the user for a new active text printer. 4806 If it's non-nil, the command prompts the user for a new active text printer.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 13fa310106c..86284eaa30a 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -958,7 +958,7 @@ B) Speed of editing operations.
958 `cperl-array-face' Array names 958 `cperl-array-face' Array names
959 `cperl-hash-face' Hash names 959 `cperl-hash-face' Hash names
960 `font-lock-comment-face' Comments, PODs and whatever is considered 960 `font-lock-comment-face' Comments, PODs and whatever is considered
961 syntaxically to be not code 961 syntactically to be not code
962 `font-lock-constant-face' HERE-doc delimiters, labels, delimiters of 962 `font-lock-constant-face' HERE-doc delimiters, labels, delimiters of
963 2-arg operators s/y/tr/ or of RExen, 963 2-arg operators s/y/tr/ or of RExen,
964 `font-lock-warning-face' Special-cased m// and s//foo/, 964 `font-lock-warning-face' Special-cased m// and s//foo/,
@@ -970,7 +970,7 @@ B) Speed of editing operations.
970 `cperl-nonoverridable-face' Non-overridable keywords, modifiers of RExen 970 `cperl-nonoverridable-face' Non-overridable keywords, modifiers of RExen
971 `font-lock-string-face' Strings, qw() constructs, RExen, POD sections, 971 `font-lock-string-face' Strings, qw() constructs, RExen, POD sections,
972 literal parts and the terminator of formats 972 literal parts and the terminator of formats
973 and whatever is syntaxically considered 973 and whatever is syntactically considered
974 as string literals 974 as string literals
975 `font-lock-type-face' Overridable keywords 975 `font-lock-type-face' Overridable keywords
976 `font-lock-variable-name-face' Variable declarations, indirect array and 976 `font-lock-variable-name-face' Variable declarations, indirect array and
@@ -1537,8 +1537,8 @@ default.) You can always quote (with \\[quoted-insert]) the left
1537since most the time you mean \"less\". CPerl mode tries to guess 1537since most the time you mean \"less\". CPerl mode tries to guess
1538whether you want to type pair <>, and inserts is if it 1538whether you want to type pair <>, and inserts is if it
1539appropriate. You can set `cperl-electric-parens-string' to the string that 1539appropriate. You can set `cperl-electric-parens-string' to the string that
1540contains the parenths from the above list you want to be electrical. 1540contains the parens from the above list you want to be electrical.
1541Electricity of parenths is controlled by `cperl-electric-parens'. 1541Electricity of parens is controlled by `cperl-electric-parens'.
1542You may also set `cperl-electric-parens-mark' to have electric parens 1542You may also set `cperl-electric-parens-mark' to have electric parens
1543look for active mark and \"embrace\" a region if possible.' 1543look for active mark and \"embrace\" a region if possible.'
1544 1544
@@ -3517,7 +3517,7 @@ Works before syntax recognition is done."
3517(defvar font-lock-warning-face) 3517(defvar font-lock-warning-face)
3518 3518
3519(defun cperl-find-sub-attrs (&optional st-l b-fname e-fname pos) 3519(defun cperl-find-sub-attrs (&optional st-l b-fname e-fname pos)
3520 "Syntaxically mark (and fontify) attributes of a subroutine. 3520 "Syntactically mark (and fontify) attributes of a subroutine.
3521Should be called with the point before leading colon of an attribute." 3521Should be called with the point before leading colon of an attribute."
3522 ;; Works *before* syntax recognition is done 3522 ;; Works *before* syntax recognition is done
3523 (or st-l (setq st-l (list nil))) ; Avoid overwriting '() 3523 (or st-l (setq st-l (list nil))) ; Avoid overwriting '()
@@ -4994,7 +4994,7 @@ conditional/loop constructs."
4994 (setq top (point)) 4994 (setq top (point))
4995 ;; Plan A: if line has an unfinished paren-group, go to end-of-group 4995 ;; Plan A: if line has an unfinished paren-group, go to end-of-group
4996 (while (= -1 (nth 0 (parse-partial-sexp (point) tmp-end -1))) 4996 (while (= -1 (nth 0 (parse-partial-sexp (point) tmp-end -1)))
4997 (setq top (point))) ; Get the outermost parenths in line 4997 (setq top (point))) ; Get the outermost parens in line
4998 (goto-char top) 4998 (goto-char top)
4999 (while (< (point) tmp-end) 4999 (while (< (point) tmp-end)
5000 (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol 5000 (parse-partial-sexp (point) tmp-end nil t) ; To start-sexp or eol
@@ -5906,7 +5906,7 @@ indentation and initial hashes. Behaves usually outside of comment."
5906 3 font-lock-variable-name-face))) 5906 3 font-lock-variable-name-face)))
5907 '("\\<for\\(each\\)?\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\(\\$[a-zA-Z_][a-zA-Z_0-9]*\\)[ \t]*(" 5907 '("\\<for\\(each\\)?\\([ \t]+\\(my\\|local\\|our\\)\\)?[ \t]*\\(\\$[a-zA-Z_][a-zA-Z_0-9]*\\)[ \t]*("
5908 4 font-lock-variable-name-face) 5908 4 font-lock-variable-name-face)
5909 ;; Avoid $!, and s!!, qq!! etc. when not fontifying syntaxically 5909 ;; Avoid $!, and s!!, qq!! etc. when not fontifying syntactically
5910 '("\\(?:^\\|[^smywqrx$]\\)\\(!\\)" 1 font-lock-negation-char-face) 5910 '("\\(?:^\\|[^smywqrx$]\\)\\(!\\)" 1 font-lock-negation-char-face)
5911 '("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend))) 5911 '("\\[\\(\\^\\)" 1 font-lock-negation-char-face prepend)))
5912 (setq 5912 (setq
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 86d4a72f408..9ad76f2cfec 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3865,7 +3865,7 @@ overlay arrow in source buffer."
3865If BUF is already displayed in some window, show it, deiconifying 3865If BUF is already displayed in some window, show it, deiconifying
3866the frame if necessary. Otherwise, find least recently used 3866the frame if necessary. Otherwise, find least recently used
3867window and show BUF there, if the window is not used for GDB 3867window and show BUF there, if the window is not used for GDB
3868already, in which case that window is splitted first." 3868already, in which case that window is split first."
3869 (let ((answer (get-buffer-window buf (or frame 0)))) 3869 (let ((answer (get-buffer-window buf (or frame 0))))
3870 (if answer 3870 (if answer
3871 (display-buffer buf nil (or frame 0)) ;Deiconify frame if necessary. 3871 (display-buffer buf nil (or frame 0)) ;Deiconify frame if necessary.
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 24deb569d74..6ce415b563d 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -2464,7 +2464,7 @@ If prefix ARG < 0 then move forward to enclosing block end."
2464(defun idlwave-down-block (&optional arg) 2464(defun idlwave-down-block (&optional arg)
2465 "Go down a block. 2465 "Go down a block.
2466With ARG: ARG >= 0 go forwards, ARG < 0 go backwards. 2466With ARG: ARG >= 0 go forwards, ARG < 0 go backwards.
2467Returns non-nil if successfull." 2467Returns non-nil if successful."
2468 (interactive "p") 2468 (interactive "p")
2469 (let (status) 2469 (let (status)
2470 (if (< arg 0) 2470 (if (< arg 0)
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index f9fd442da3f..289ef168088 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -30657,7 +30657,7 @@
30657 (display_buffer): Do not set split_height_threshold to twice the 30657 (display_buffer): Do not set split_height_threshold to twice the
30658 value of window_min_height to avoid changing the value of a 30658 value of window_min_height to avoid changing the value of a
30659 customizable variable. Rather explicitly check whether the 30659 customizable variable. Rather explicitly check whether the
30660 height of the window that shall be splitted is at least as large 30660 height of the window that shall be split is at least as large
30661 as split_height_threshold. 30661 as split_height_threshold.
30662 (Fwindow_full_width_p): New defun. 30662 (Fwindow_full_width_p): New defun.
30663 (syms_of_window): Defsubr it. 30663 (syms_of_window): Defsubr it.
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index e2572e8ac88..6973717a7d7 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -11485,7 +11485,7 @@
11485 Substitute homedir by `~' also in default_filename. 11485 Substitute homedir by `~' also in default_filename.
11486 11486
11487 * xdisp.c (try_window_id): Fix computation of tab_offset when 11487 * xdisp.c (try_window_id): Fix computation of tab_offset when
11488 backing up over a character that is splitted across lines. 11488 backing up over a character that is split across lines.
11489 11489
114901999-05-08 Kenichi HANDA <handa@etl.go.jp> 114901999-05-08 Kenichi HANDA <handa@etl.go.jp>
11491 11491
diff --git a/src/charset.c b/src/charset.c
index 3c15f1bee54..49fc7288069 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1660,7 +1660,7 @@ maybe_unify_char (int c, Lisp_Object val)
1660} 1660}
1661 1661
1662 1662
1663/* Return a character correponding to the code-point CODE of 1663/* Return a character corresponding to the code-point CODE of
1664 CHARSET. */ 1664 CHARSET. */
1665 1665
1666int 1666int
diff --git a/src/charset.h b/src/charset.h
index fc35d6bb991..5ca83130b77 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -238,7 +238,7 @@ struct charset
238 int unified_p; 238 int unified_p;
239}; 239};
240 240
241/* Hash table of charset symbols vs. the correponding attribute 241/* Hash table of charset symbols vs. the corresponding attribute
242 vectors. */ 242 vectors. */
243extern Lisp_Object Vcharset_hash_table; 243extern Lisp_Object Vcharset_hash_table;
244 244
@@ -389,7 +389,7 @@ extern Lisp_Object Vchar_charset_set;
389#endif 389#endif
390 390
391 391
392/* Return a character correponding to the code-point CODE of CHARSET. 392/* Return a character corresponding to the code-point CODE of CHARSET.
393 Try some optimization before calling decode_char. */ 393 Try some optimization before calling decode_char. */
394 394
395#define DECODE_CHAR(charset, code) \ 395#define DECODE_CHAR(charset, code) \
diff --git a/src/font.h b/src/font.h
index 8ca7c9c19c4..b6c1acf4a30 100644
--- a/src/font.h
+++ b/src/font.h
@@ -621,7 +621,7 @@ struct font_driver
621 /* Optional. 621 /* Optional.
622 Get coordinates of the INDEXth anchor point of the glyph whose 622 Get coordinates of the INDEXth anchor point of the glyph whose
623 code is CODE. Store the coordinates in *X and *Y. Return 0 if 623 code is CODE. Store the coordinates in *X and *Y. Return 0 if
624 the operations was successfull. Otherwise return -1. */ 624 the operations was successful. Otherwise return -1. */
625 int (*anchor_point) (struct font *font, unsigned code, int index, 625 int (*anchor_point) (struct font *font, unsigned code, int index,
626 int *x, int *y); 626 int *x, int *y);
627 627
diff --git a/src/w16select.c b/src/w16select.c
index cae7a6f82dd..7ba62fde0e5 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -114,7 +114,7 @@ identify_winoldap_version (void)
114 return regs.x.ax; 114 return regs.x.ax;
115} 115}
116 116
117/* Open the clipboard, return non-zero if successfull. */ 117/* Open the clipboard, return non-zero if successful. */
118unsigned 118unsigned
119open_clipboard (void) 119open_clipboard (void)
120{ 120{
@@ -137,7 +137,7 @@ open_clipboard (void)
137 return regs.x.ax; 137 return regs.x.ax;
138} 138}
139 139
140/* Empty clipboard, return non-zero if successfull. */ 140/* Empty clipboard, return non-zero if successful. */
141unsigned 141unsigned
142empty_clipboard (void) 142empty_clipboard (void)
143{ 143{
@@ -207,7 +207,7 @@ free_xfer_buf (void)
207 } 207 }
208} 208}
209 209
210/* Copy data into the clipboard, return zero if successfull. */ 210/* Copy data into the clipboard, return zero if successful. */
211unsigned 211unsigned
212set_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw) 212set_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw)
213{ 213{
@@ -405,7 +405,7 @@ get_clipboard_data (unsigned Format, void *Data, unsigned Size, int Raw)
405 return (unsigned) (dp - (unsigned char *)Data - 1); 405 return (unsigned) (dp - (unsigned char *)Data - 1);
406} 406}
407 407
408/* Close clipboard, return non-zero if successfull. */ 408/* Close clipboard, return non-zero if successful. */
409unsigned 409unsigned
410close_clipboard (void) 410close_clipboard (void)
411{ 411{
@@ -730,4 +730,3 @@ After the communication, this variable is set to nil. */);
730} 730}
731 731
732#endif /* MSDOS */ 732#endif /* MSDOS */
733
diff --git a/src/w32font.c b/src/w32font.c
index 5cc37c0e74f..e8a223de0a4 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -786,7 +786,7 @@ w32font_free_outline (struct font *font, void *outline);
786 Optional. 786 Optional.
787 Get coordinates of the INDEXth anchor point of the glyph whose 787 Get coordinates of the INDEXth anchor point of the glyph whose
788 code is CODE. Store the coordinates in *X and *Y. Return 0 if 788 code is CODE. Store the coordinates in *X and *Y. Return 0 if
789 the operations was successfull. Otherwise return -1. 789 the operations was successful. Otherwise return -1.
790static int 790static int
791w32font_anchor_point (struct font *font, unsigned code, 791w32font_anchor_point (struct font *font, unsigned code,
792 int index, int *x, int *y); 792 int index, int *x, int *y);