aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-12-18 22:21:24 -0800
committerPaul Eggert2011-12-18 22:21:24 -0800
commit99d990817cac77ba755b4e31722c44f6f6bbe3b0 (patch)
tree20ede6f28ea8785e182ee29d753a547409dd39c4
parent3771cb1735b47102e7f94187bcdeb1a4644a557e (diff)
downloademacs-99d990817cac77ba755b4e31722c44f6f6bbe3b0.tar.gz
emacs-99d990817cac77ba755b4e31722c44f6f6bbe3b0.zip
Spelling fixes.
-rw-r--r--admin/grammars/bovine-grammar.el2
-rw-r--r--admin/grammars/js.wy2
-rw-r--r--doc/lispref/spellfile1
-rw-r--r--doc/misc/idlwave.texi2
-rw-r--r--etc/NEWS.192
-rw-r--r--leim/ChangeLog2
-rw-r--r--leim/quail/hanja3.el2
-rw-r--r--lisp/ChangeLog.122
-rw-r--r--lisp/allout.el10
-rw-r--r--lisp/cedet/data-debug.el4
-rw-r--r--lisp/cedet/semantic/analyze/debug.el2
-rw-r--r--lisp/emacs-lisp/bytecomp.el2
-rw-r--r--lisp/font-lock.el2
-rw-r--r--lisp/gnus/ChangeLog2
-rw-r--r--lisp/gnus/gnus-art.el2
-rw-r--r--lisp/gnus/gnus-msg.el2
-rw-r--r--lisp/gnus/gnus-spec.el4
-rw-r--r--lisp/gnus/gnus-win.el4
-rw-r--r--lisp/gnus/message.el2
-rw-r--r--lisp/mail/rmailmm.el2
-rw-r--r--lisp/progmodes/sql.el2
-rw-r--r--lisp/progmodes/verilog-mode.el2
-rw-r--r--lisp/reveal.el2
-rw-r--r--lisp/simple.el6
-rw-r--r--lisp/textmodes/rst.el2
-rw-r--r--lisp/textmodes/texnfo-upd.el2
-rw-r--r--lisp/vc/vc-hg.el2
-rw-r--r--src/ccl.c4
-rw-r--r--src/w32term.c2
-rw-r--r--src/xterm.c2
-rw-r--r--test/indent/prolog.prolog2
31 files changed, 40 insertions, 41 deletions
diff --git a/admin/grammars/bovine-grammar.el b/admin/grammars/bovine-grammar.el
index eda7b42adbd..a7fe955acf4 100644
--- a/admin/grammars/bovine-grammar.el
+++ b/admin/grammars/bovine-grammar.el
@@ -298,7 +298,7 @@ VALUE is a value, or range of values to match against. For
298example, a SYMBOL might need to match \"foo\". Some TYPES will not 298example, a SYMBOL might need to match \"foo\". Some TYPES will not
299have matching criteria. 299have matching criteria.
300 300
301LAMBDA is a lambda expression which is evaled with the text of the 301LAMBDA is a lambda expression which is evalled with the text of the
302type when it is found. It is passed the list of all buffer text 302type when it is found. It is passed the list of all buffer text
303elements found since the last lambda expression. It should return a 303elements found since the last lambda expression. It should return a
304semantic element (see below.) 304semantic element (see below.)
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index a13abf56e6e..ffa324806cf 100644
--- a/admin/grammars/js.wy
+++ b/admin/grammars/js.wy
@@ -66,7 +66,7 @@
66;; Other Goals 66;; Other Goals
67%start FormalParameterList 67%start FormalParameterList
68 68
69;; with the terminals stuff, I used the javacript.y names, 69;; with the terminals stuff, I used the javascript.y names,
70;; but the semantic/wisent/java-tags.wy types 70;; but the semantic/wisent/java-tags.wy types
71;; when possible 71;; when possible
72;; ------------------ 72;; ------------------
diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile
index e0d77ee0541..18fb633acfd 100644
--- a/doc/lispref/spellfile
+++ b/doc/lispref/spellfile
@@ -337,7 +337,6 @@ fset
337fstab 337fstab
338ftp 338ftp
339fu 339fu
340funtions
341garbles 340garbles
342gc 341gc
343gcpro 342gcpro
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 5149eb91651..c7495d8cc93 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -669,7 +669,7 @@ We have already used the routine info display in the first part of this
669tutorial. This was the invoked using @kbd{C-c ?}, and displays 669tutorial. This was the invoked using @kbd{C-c ?}, and displays
670information about the IDL routine near the cursor position. Wouldn't it 670information about the IDL routine near the cursor position. Wouldn't it
671be nice to have the same kind of information available for your own 671be nice to have the same kind of information available for your own
672routines and for the huge amount of code in major libraries like JHUPL 672routines and for the huge amount of code in major libraries like JHUAPL
673or the IDL-Astro library? In many cases, you may already have this 673or the IDL-Astro library? In many cases, you may already have this
674information. Files named @file{.idlwave_catalog} in library directories 674information. Files named @file{.idlwave_catalog} in library directories
675contain scanned information on the routines in that directory; many 675contain scanned information on the routines in that directory; many
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 849566e6238..df6c4893f87 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -6114,7 +6114,7 @@ When you have edited both buffers as you wish, merge them with C-x 6
61141. This copies the text from the right-hand buffer as a second column 61141. This copies the text from the right-hand buffer as a second column
6115in the other buffer. To go back to two-column editing, use C-x 6 s. 6115in the other buffer. To go back to two-column editing, use C-x 6 s.
6116 6116
6117Use C-x 6 d to disassociate the two buffers, leaving each as it 6117Use C-x 6 d to dissociate the two buffers, leaving each as it
6118stands. (If the other buffer, the one that was not current when you 6118stands. (If the other buffer, the one that was not current when you
6119type C-x 6 d, is empty, C-x 6 d kills it.) 6119type C-x 6 d, is empty, C-x 6 d kills it.)
6120 6120
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 95a3671bdd1..57c5a406785 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1895,7 +1895,7 @@
1895 * Makefile.in (${TIT}): To byte-compile quail packages, use just 1895 * Makefile.in (${TIT}): To byte-compile quail packages, use just
1896 built quail. 1896 built quail.
1897 1897
18981997-12-09 Koaunghi Un <koanughi.un@zdv.uni-tuebingen.de> 18981997-12-09 Koaunghi Un <koaunghi.un@zdv.uni-tuebingen.de>
1899 1899
1900 * quail/hanja3.el: New file. 1900 * quail/hanja3.el: New file.
1901 1901
diff --git a/leim/quail/hanja3.el b/leim/quail/hanja3.el
index aa0fc7948af..dae716c7a8b 100644
--- a/leim/quail/hanja3.el
+++ b/leim/quail/hanja3.el
@@ -2,7 +2,7 @@
2 2
3;; Copyright (C) 1997, 1999, 2001-2011 Free Software Foundation, Inc. 3;; Copyright (C) 1997, 1999, 2001-2011 Free Software Foundation, Inc.
4 4
5;; Author: Koaunghi Un <koanughi.un@zdv.uni-tuebingen.de> 5;; Author: Koaunghi Un <koaunghi.un@zdv.uni-tuebingen.de>
6;; Keywords: mule, quail, multilingual, input method, Korean, Hanja 6;; Keywords: mule, quail, multilingual, input method, Korean, Hanja
7 7
8;; This file is part of GNU Emacs. 8;; This file is part of GNU Emacs.
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index b97555f1e9d..0dd5a6ec7a3 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -18459,7 +18459,7 @@
18459 reveal-open-spots, so as to be more reliable. There were several 18459 reveal-open-spots, so as to be more reliable. There were several
18460 tricky corner cases where an open spot might be lost, or where 18460 tricky corner cases where an open spot might be lost, or where
18461 a closed spot might end up on the list of open spots. 18461 a closed spot might end up on the list of open spots.
18462 Only reveal text that's ellipsised. 18462 Only reveal text that's ellipsized.
18463 18463
184642005-11-07 Carsten Dominik <dominik@science.uva.nl> 184642005-11-07 Carsten Dominik <dominik@science.uva.nl>
18465 18465
diff --git a/lisp/allout.el b/lisp/allout.el
index 9289e38b418..480c22d31e0 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -3334,7 +3334,7 @@ coordinating with allout activity.")
3334 (run-hooks 'allout-post-undo-hook) 3334 (run-hooks 'allout-post-undo-hook)
3335 (cond ((and (= buffer-saved-size -1) 3335 (cond ((and (= buffer-saved-size -1)
3336 allout-auto-save-temporarily-disabled) 3336 allout-auto-save-temporarily-disabled)
3337 ;; user possibly undid a decryption, deinhibit auto-save: 3337 ;; user possibly undid a decryption, disinhibit auto-save:
3338 (allout-maybe-resume-auto-save-info-after-encryption)) 3338 (allout-maybe-resume-auto-save-info-after-encryption))
3339 ((save-excursion 3339 ((save-excursion
3340 (save-restriction 3340 (save-restriction
@@ -5871,7 +5871,7 @@ encryption.
5871Further, encrypting with a KEYMODE-CUE universal argument greater 5871Further, encrypting with a KEYMODE-CUE universal argument greater
5872than 4 - eg, preceded by a doubled Ctrl-U - causes association of 5872than 4 - eg, preceded by a doubled Ctrl-U - causes association of
5873the specified recipients with the file, replacing those currently 5873the specified recipients with the file, replacing those currently
5874associated with it. This can be used to deassociate any 5874associated with it. This can be used to dissociate any
5875recipients with the file, by selecting no recipients in the 5875recipients with the file, by selecting no recipients in the
5876dialog. 5876dialog.
5877 5877
@@ -5912,7 +5912,7 @@ encryption.
5912Further, encrypting with a KEYMODE-CUE universal argument greater 5912Further, encrypting with a KEYMODE-CUE universal argument greater
5913than 4 - eg, preceded by a doubled Ctrl-U - causes association of 5913than 4 - eg, preceded by a doubled Ctrl-U - causes association of
5914the specified recipients with the file, replacing those currently 5914the specified recipients with the file, replacing those currently
5915associated with it. This can be used to deassociate any 5915associated with it. This can be used to dissociate any
5916recipients with the file, by selecting no recipients in the 5916recipients with the file, by selecting no recipients in the
5917dialog. 5917dialog.
5918 5918
@@ -6045,7 +6045,7 @@ encryption.
6045Further, encrypting with a KEYMODE-CUE universal argument greater 6045Further, encrypting with a KEYMODE-CUE universal argument greater
6046than 4 - eg, preceded by a doubled Ctrl-U - causes association of 6046than 4 - eg, preceded by a doubled Ctrl-U - causes association of
6047the specified recipients with the file, replacing those currently 6047the specified recipients with the file, replacing those currently
6048associated with it. This can be used to deassociate any 6048associated with it. This can be used to dissociate any
6049recipients with the file, by selecting no recipients in the 6049recipients with the file, by selecting no recipients in the
6050dialog. 6050dialog.
6051 6051
@@ -6661,7 +6661,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
6661 (if (/= arg 1) 6661 (if (/= arg 1)
6662 (condition-case nil (line-move (1- arg)) (error nil))) 6662 (condition-case nil (line-move (1- arg)) (error nil)))
6663 6663
6664 ;; Move to beginning-of-line, ignoring fields and invisibles. 6664 ;; Move to beginning-of-line, ignoring fields and invisible text.
6665 (skip-chars-backward "^\n") 6665 (skip-chars-backward "^\n")
6666 (while (and (not (bobp)) 6666 (while (and (not (bobp))
6667 (let ((prop 6667 (let ((prop
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index 329d1c608c2..d553c433fc4 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -1060,11 +1060,11 @@ If the result is a list or vector, then use the data debugger to display it."
1060 (setq values (cons (eval expr) values)) 1060 (setq values (cons (eval expr) values))
1061 (let ((old-value (make-symbol "t")) new-value) 1061 (let ((old-value (make-symbol "t")) new-value)
1062 ;; Bind debug-on-error to something unique so that we can 1062 ;; Bind debug-on-error to something unique so that we can
1063 ;; detect when evaled code changes it. 1063 ;; detect when evalled code changes it.
1064 (let ((debug-on-error old-value)) 1064 (let ((debug-on-error old-value))
1065 (setq values (cons (eval expr) values)) 1065 (setq values (cons (eval expr) values))
1066 (setq new-value debug-on-error)) 1066 (setq new-value debug-on-error))
1067 ;; If evaled code has changed the value of debug-on-error, 1067 ;; If evalled code has changed the value of debug-on-error,
1068 ;; propagate that change to the global binding. 1068 ;; propagate that change to the global binding.
1069 (unless (eq old-value new-value) 1069 (unless (eq old-value new-value)
1070 (setq debug-on-error new-value)))) 1070 (setq debug-on-error new-value))))
diff --git a/lisp/cedet/semantic/analyze/debug.el b/lisp/cedet/semantic/analyze/debug.el
index b02358b7243..ce8e79b19dc 100644
--- a/lisp/cedet/semantic/analyze/debug.el
+++ b/lisp/cedet/semantic/analyze/debug.el
@@ -70,7 +70,7 @@
70 (let ((pentry (nth idx pf)) 70 (let ((pentry (nth idx pf))
71 (ptentry (nth idx pft))) 71 (ptentry (nth idx pft)))
72 (if (or (stringp pentry) (not ptentry)) 72 (if (or (stringp pentry) (not ptentry))
73 ;; Found someting ok. stop 73 ;; Found something ok. Stop.
74 (setq stop t) 74 (setq stop t)
75 (setq idx (1+ idx))))) 75 (setq idx (1+ idx)))))
76 ;; We found the first non-tag entry. What is the situation? 76 ;; We found the first non-tag entry. What is the situation?
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 9aa230cfe9b..29c5f3f092b 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2637,7 +2637,7 @@ If FORM is a lambda or a macro, byte-compile it as a function."
2637 (setq form (cdr form))) 2637 (setq form (cdr form)))
2638 (setq form (car form))) 2638 (setq form (car form)))
2639 (if (and (eq (car-safe form) 'list) 2639 (if (and (eq (car-safe form) 'list)
2640 ;; The spec is evaled in callint.c in dynamic-scoping 2640 ;; The spec is evalled in callint.c in dynamic-scoping
2641 ;; mode, so just leaving the form unchanged would mean 2641 ;; mode, so just leaving the form unchanged would mean
2642 ;; it won't be eval'd in the right mode. 2642 ;; it won't be eval'd in the right mode.
2643 (not lexical-binding)) 2643 (not lexical-binding))
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index c319974fb41..2db0d809275 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -294,7 +294,7 @@ If a number, only buffers greater than this size have fontification messages."
294;; and they give users another mechanism for changing face appearance. 294;; and they give users another mechanism for changing face appearance.
295;; We now allow a FACENAME in `font-lock-keywords' to be any expression that 295;; We now allow a FACENAME in `font-lock-keywords' to be any expression that
296;; returns a face. So the easiest thing is to continue using these variables, 296;; returns a face. So the easiest thing is to continue using these variables,
297;; rather than sometimes evaling FACENAME and sometimes not. sm. 297;; rather than sometimes evalling FACENAME and sometimes not. sm.
298 298
299;; Note that in new code, in the vast majority of cases there is no 299;; Note that in new code, in the vast majority of cases there is no
300;; need to create variables that specify face names. Simply using 300;; need to create variables that specify face names. Simply using
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ee7442c55e1..c26c0a0a5b1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -21339,7 +21339,7 @@
21339 (gnus-agent-cat-groups): Use eval-and-compile, not 21339 (gnus-agent-cat-groups): Use eval-and-compile, not
21340 eval-when-compile, to define gnus-agent-set-cat-groups as the setf 21340 eval-when-compile, to define gnus-agent-set-cat-groups as the setf
21341 method of gnus-agent-cat-groups even when the buffer has been 21341 method of gnus-agent-cat-groups even when the buffer has been
21342 evaled. 21342 evalled.
21343 (gnus-agent-save-active, gnus-agent-save-active-1): Merge to 21343 (gnus-agent-save-active, gnus-agent-save-active-1): Merge to
21344 delete gnus-agent-save-active-1. 21344 delete gnus-agent-save-active-1.
21345 (gnus-agent-save-groups): Delete. Identical to 21345 (gnus-agent-save-groups): Delete. Identical to
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 555c715bc2f..ea0710bf026 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -669,7 +669,7 @@ non-nil.
669If the match is a string, it is used as a regexp match on the 669If the match is a string, it is used as a regexp match on the
670article. If the match is a symbol, that symbol will be funcalled 670article. If the match is a symbol, that symbol will be funcalled
671from the buffer of the article to be saved with the newsgroup as the 671from the buffer of the article to be saved with the newsgroup as the
672parameter. If it is a list, it will be evaled in the same buffer. 672parameter. If it is a list, it will be evalled in the same buffer.
673 673
674If this form or function returns a string, this string will be used as a 674If this form or function returns a string, this string will be used as a
675possible file name; and if it returns a non-nil list, that list will be 675possible file name; and if it returns a non-nil list, that list will be
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 58373525f96..6ff1023383b 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1784,7 +1784,7 @@ this is a reply."
1784 (and header 1784 (and header
1785 (string-match (nth 2 match) header))))))) 1785 (string-match (nth 2 match) header)))))))
1786 (t 1786 (t
1787 ;; This is a form to be evaled. 1787 ;; This is a form to be evalled.
1788 (eval match))))) 1788 (eval match)))))
1789 ;; We have a match, so we set the variables. 1789 ;; We have a match, so we set the variables.
1790 (dolist (attribute style) 1790 (dolist (attribute style)
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 2345c4fc141..4c5715c67f9 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -52,7 +52,7 @@ text properties. This is only needed on XEmacs, as Emacs does this anyway."
52(defvar gnus-group-indentation "") 52(defvar gnus-group-indentation "")
53 53
54;; Format specs. The chunks below are the machine-generated forms 54;; Format specs. The chunks below are the machine-generated forms
55;; that are to be evaled as the result of the default format strings. 55;; that are to be evalled as the result of the default format strings.
56;; We write them in here to get them byte-compiled. That way the 56;; We write them in here to get them byte-compiled. That way the
57;; default actions will be quite fast, while still retaining the full 57;; default actions will be quite fast, while still retaining the full
58;; flexibility of the user-defined format specs. 58;; flexibility of the user-defined format specs.
@@ -690,7 +690,7 @@ are supported for %s."
690 (not (and (featurep 'xemacs) 690 (not (and (featurep 'xemacs)
691 gnus-use-correct-string-widths))) 691 gnus-use-correct-string-widths)))
692 (insert (number-to-string pad-width))) 692 (insert (number-to-string pad-width)))
693 ;; Create the form to be evaled. 693 ;; Create the form to be evalled.
694 (if (or max-width cut-width ignore-value 694 (if (or max-width cut-width ignore-value
695 (and (featurep 'xemacs) 695 (and (featurep 'xemacs)
696 gnus-use-correct-string-widths)) 696 gnus-use-correct-string-widths))
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index ecd5b3b525b..f0009830b44 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -242,7 +242,7 @@ See the Gnus manual for an explanation of the syntax used.")
242 (let* ((current-window (or (get-buffer-window (current-buffer)) (selected-window))) 242 (let* ((current-window (or (get-buffer-window (current-buffer)) (selected-window)))
243 (window (or window current-window))) 243 (window (or window current-window)))
244 (select-window window) 244 (select-window window)
245 ;; The SPLIT might be something that is to be evaled to 245 ;; The SPLIT might be something that is to be evalled to
246 ;; return a new SPLIT. 246 ;; return a new SPLIT.
247 (while (and (not (assq (car split) gnus-window-to-buffer)) 247 (while (and (not (assq (car split) gnus-window-to-buffer))
248 (symbolp (car split)) (fboundp (car split))) 248 (symbolp (car split)) (fboundp (car split)))
@@ -447,7 +447,7 @@ should have point."
447 (when (consp (car split)) 447 (when (consp (car split))
448 (push 1.0 split) 448 (push 1.0 split)
449 (push 'vertical split)) 449 (push 'vertical split))
450 ;; The SPLIT might be something that is to be evaled to 450 ;; The SPLIT might be something that is to be evalled to
451 ;; return a new SPLIT. 451 ;; return a new SPLIT.
452 (while (and (not (assq (car split) gnus-window-to-buffer)) 452 (while (and (not (assq (car split) gnus-window-to-buffer))
453 (symbolp (car split)) (fboundp (car split))) 453 (symbolp (car split)) (fboundp (car split)))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 8fbd2c765fe..5198618c2c3 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4409,7 +4409,7 @@ This function could be useful in `message-setup-hook'."
4409 ;; A simple function. 4409 ;; A simple function.
4410 ((functionp action) 4410 ((functionp action)
4411 (funcall action)) 4411 (funcall action))
4412 ;; Something to be evaled. 4412 ;; Something to be evalled.
4413 (t 4413 (t
4414 (eval action)))))) 4414 (eval action))))))
4415 4415
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index d01cfc7f2c8..03023b07527 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -320,7 +320,7 @@ The value is a vector [INDEX HEADER TAGLINE BODY END], where
320 (setq index 2)) 320 (setq index 2))
321 ;; If the tagline is displayed, get past it to the body. 321 ;; If the tagline is displayed, get past it to the body.
322 (if (rmail-mime-display-tagline current) 322 (if (rmail-mime-display-tagline current)
323 ;; The next foward-line call must be in sync with how 323 ;; The next forward-line call must be in sync with how
324 ;; `rmail-mime-insert-tagline' formats the tagline. The 324 ;; `rmail-mime-insert-tagline' formats the tagline. The
325 ;; body begins after the empty line that ends the tagline. 325 ;; body begins after the empty line that ends the tagline.
326 (forward-line 3)) 326 (forward-line 3))
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 03e095b6bfc..60ba768a80e 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -4224,7 +4224,7 @@ The default comes from `process-coding-system-alist' and
4224 "^\\(.+\\) (hex ..)$" 4224 "^\\(.+\\) (hex ..)$"
4225 "SET \\1") 4225 "SET \\1")
4226 4226
4227 ;; FEDDBACK ON for 99 or more rows 4227 ;; FEEDBACK ON for 99 or more rows
4228 ;; feedback OFF 4228 ;; feedback OFF
4229 (sql-redirect-value 4229 (sql-redirect-value
4230 sqlbuf 4230 sqlbuf
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 87c678890de..52e7b6e2429 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -10932,7 +10932,7 @@ Typing \\[verilog-auto] will make this into:
10932(defun verilog-auto-logic () 10932(defun verilog-auto-logic ()
10933 "Expand AUTOLOGIC statements, as part of \\[verilog-auto]. 10933 "Expand AUTOLOGIC statements, as part of \\[verilog-auto].
10934Make wire statements using the SystemVerilog logic keyword. 10934Make wire statements using the SystemVerilog logic keyword.
10935This is currently equivelent to: 10935This is currently equivalent to:
10936 10936
10937 /*AUTOWIRE*/ 10937 /*AUTOWIRE*/
10938 10938
diff --git a/lisp/reveal.el b/lisp/reveal.el
index c776ab72969..8b4ac22a717 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -106,7 +106,7 @@ Each element has the form (WINDOW . OVERLAY).")
106 (let ((inv (overlay-get ol 'invisible)) open) 106 (let ((inv (overlay-get ol 'invisible)) open)
107 (when (and inv 107 (when (and inv
108 ;; There's an `invisible' property. Make sure it's 108 ;; There's an `invisible' property. Make sure it's
109 ;; actually invisible, and ellipsised. 109 ;; actually invisible, and ellipsized.
110 (and (consp buffer-invisibility-spec) 110 (and (consp buffer-invisibility-spec)
111 (cdr (assq inv buffer-invisibility-spec))) 111 (cdr (assq inv buffer-invisibility-spec)))
112 (or (setq open 112 (or (setq open
diff --git a/lisp/simple.el b/lisp/simple.el
index c9ac32e0f9e..b7165c9f6a9 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1225,11 +1225,11 @@ this command arranges for all errors to enter the debugger."
1225 (push (eval eval-expression-arg lexical-binding) values) 1225 (push (eval eval-expression-arg lexical-binding) values)
1226 (let ((old-value (make-symbol "t")) new-value) 1226 (let ((old-value (make-symbol "t")) new-value)
1227 ;; Bind debug-on-error to something unique so that we can 1227 ;; Bind debug-on-error to something unique so that we can
1228 ;; detect when evaled code changes it. 1228 ;; detect when evalled code changes it.
1229 (let ((debug-on-error old-value)) 1229 (let ((debug-on-error old-value))
1230 (push (eval eval-expression-arg lexical-binding) values) 1230 (push (eval eval-expression-arg lexical-binding) values)
1231 (setq new-value debug-on-error)) 1231 (setq new-value debug-on-error))
1232 ;; If evaled code has changed the value of debug-on-error, 1232 ;; If evalled code has changed the value of debug-on-error,
1233 ;; propagate that change to the global binding. 1233 ;; propagate that change to the global binding.
1234 (unless (eq old-value new-value) 1234 (unless (eq old-value new-value)
1235 (setq debug-on-error new-value)))) 1235 (setq debug-on-error new-value))))
@@ -4729,7 +4729,7 @@ To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
4729 (let ((line-move-visual nil)) 4729 (let ((line-move-visual nil))
4730 (line-move (1- arg) t))) 4730 (line-move (1- arg) t)))
4731 4731
4732 ;; Move to beginning-of-line, ignoring fields and invisibles. 4732 ;; Move to beginning-of-line, ignoring fields and invisible text.
4733 (skip-chars-backward "^\n") 4733 (skip-chars-backward "^\n")
4734 (while (and (not (bobp)) (invisible-p (1- (point)))) 4734 (while (and (not (bobp)) (invisible-p (1- (point))))
4735 (goto-char (previous-char-property-change (point))) 4735 (goto-char (previous-char-property-change (point)))
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 64dffe78d50..f2dba1575c2 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -243,7 +243,7 @@
243 (define-key map [(control ?=)] 'rst-adjust) ;; (Does not work on the Mac OSX.) 243 (define-key map [(control ?=)] 'rst-adjust) ;; (Does not work on the Mac OSX.)
244 ;; Display the hierarchy of decorations implied by the current document contents. 244 ;; Display the hierarchy of decorations implied by the current document contents.
245 (define-key map [(control c) (control h)] 'rst-display-decorations-hierarchy) 245 (define-key map [(control c) (control h)] 'rst-display-decorations-hierarchy)
246 ;; Homogeneize the decorations in the document. 246 ;; Homogenize the decorations in the document.
247 (define-key map [(control c) (control s)] 'rst-straighten-decorations) 247 (define-key map [(control c) (control s)] 'rst-straighten-decorations)
248;; (define-key map [(control c) (control s)] 'rst-straighten-deco-spacing) 248;; (define-key map [(control c) (control s)] 'rst-straighten-deco-spacing)
249 249
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index d674b3a397e..69d68a76d4b 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -1165,7 +1165,7 @@ error if the node is not the top node and a section is not found."
1165 "texinfo-specific-section-type: Chapter or section not found")))))) 1165 "texinfo-specific-section-type: Chapter or section not found"))))))
1166 1166
1167(defun texinfo-hierarchic-level () 1167(defun texinfo-hierarchic-level ()
1168 "Return the general hierarchal level of the next node in a texinfo file. 1168 "Return the general hierarchical level of the next node in a texinfo file.
1169Thus, a subheading or appendixsubsec is of type subsection." 1169Thus, a subheading or appendixsubsec is of type subsection."
1170 (let ((case-fold-search t)) 1170 (let ((case-fold-search t))
1171 (cadr (assoc 1171 (cadr (assoc
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 0516abbf024..7b90536a31b 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -216,7 +216,7 @@ highlighting the Log View buffer."
216 ((eq state ?R) 'removed) 216 ((eq state ?R) 'removed)
217 ((eq state ?!) 'missing) 217 ((eq state ?!) 'missing)
218 ((eq state ??) 'unregistered) 218 ((eq state ??) 'unregistered)
219 ((eq state ?C) 'up-to-date) ;; Older mercurials use this 219 ((eq state ?C) 'up-to-date) ;; Older mercurial versions use this.
220 (t 'up-to-date))))))) 220 (t 'up-to-date)))))))
221 221
222(defun vc-hg-working-revision (file) 222(defun vc-hg-working-revision (file)
diff --git a/src/ccl.c b/src/ccl.c
index 491b925d75c..65a6dcfcb85 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -210,8 +210,8 @@ static Lisp_Object Vccl_program_table;
210#define CCL_WriteArrayReadJump 0x0B /* Write an array element, read, and jump: 210#define CCL_WriteArrayReadJump 0x0B /* Write an array element, read, and jump:
211 1:A--D--D--R--E--S--S-rrrXXXXX 211 1:A--D--D--R--E--S--S-rrrXXXXX
212 2:LENGTH 212 2:LENGTH
213 3:ELEMENET[0] 213 3:ELEMENT[0]
214 4:ELEMENET[1] 214 4:ELEMENT[1]
215 ... 215 ...
216 N:A--D--D--R--E--S--S-rrrYYYYY 216 N:A--D--D--R--E--S--S-rrrYYYYY
217 ------------------------------ 217 ------------------------------
diff --git a/src/w32term.c b/src/w32term.c
index 532ff64fe66..29ac9d119b4 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3556,7 +3556,7 @@ x_scroll_bar_remove (struct scroll_bar *bar)
3556 /* Destroy the window. */ 3556 /* Destroy the window. */
3557 my_destroy_window (f, SCROLL_BAR_W32_WINDOW (bar)); 3557 my_destroy_window (f, SCROLL_BAR_W32_WINDOW (bar));
3558 3558
3559 /* Disassociate this scroll bar from its window. */ 3559 /* Dissociate this scroll bar from its window. */
3560 XWINDOW (bar->window)->vertical_scroll_bar = Qnil; 3560 XWINDOW (bar->window)->vertical_scroll_bar = Qnil;
3561 3561
3562 UNBLOCK_INPUT; 3562 UNBLOCK_INPUT;
diff --git a/src/xterm.c b/src/xterm.c
index 1f995b3c1a0..e2f356db7b0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5151,7 +5151,7 @@ x_scroll_bar_remove (struct scroll_bar *bar)
5151 XDestroyWindow (FRAME_X_DISPLAY (f), bar->x_window); 5151 XDestroyWindow (FRAME_X_DISPLAY (f), bar->x_window);
5152#endif 5152#endif
5153 5153
5154 /* Disassociate this scroll bar from its window. */ 5154 /* Dissociate this scroll bar from its window. */
5155 XWINDOW (bar->window)->vertical_scroll_bar = Qnil; 5155 XWINDOW (bar->window)->vertical_scroll_bar = Qnil;
5156 5156
5157 UNBLOCK_INPUT; 5157 UNBLOCK_INPUT;
diff --git a/test/indent/prolog.prolog b/test/indent/prolog.prolog
index 6cb5535fe8d..8af21877b59 100644
--- a/test/indent/prolog.prolog
+++ b/test/indent/prolog.prolog
@@ -200,7 +200,7 @@ elaborate(fix(F,T,B,E), Env, Ee) :-
200 elaborate(let(F,T,app(fix,lambda(F,T,B)),E), Env, Ee). 200 elaborate(let(F,T,app(fix,lambda(F,T,B)),E), Env, Ee).
201 201
202%% elab_bindings(+TS, +Env, -TS). 202%% elab_bindings(+TS, +Env, -TS).
203%% Applique `elaborate' sur l'environnment de type TS. 203%% Applique `elaborate' sur l'environnement de type TS.
204elab_tenv([], _, []). 204elab_tenv([], _, []).
205elab_tenv([(X,T)|TS], Env, [(X, Tg)|TSe]) :- 205elab_tenv([(X,T)|TS], Env, [(X, Tg)|TSe]) :-
206 elaborate(T, Env, Te), 206 elaborate(T, Env, Te),