aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2011-11-13 22:27:12 -0800
committerPaul Eggert2011-11-13 22:27:12 -0800
commit09e80d9fb9fe7239d0fa301973920845831366d3 (patch)
tree771e73119b2ad9bf6cbf1fbff92a5f4cb1bf03ed /lisp
parent56632ce4cd8616f0613e8734d62ec5e2f833c7dc (diff)
downloademacs-09e80d9fb9fe7239d0fa301973920845831366d3.tar.gz
emacs-09e80d9fb9fe7239d0fa301973920845831366d3.zip
Spelling fixes.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.103
-rw-r--r--lisp/ChangeLog.79
-rw-r--r--lisp/ChangeLog.93
-rw-r--r--lisp/allout-widgets.el2
-rw-r--r--lisp/allout.el2
-rw-r--r--lisp/cedet/ede/makefile-edit.el2
-rw-r--r--lisp/cedet/ede/proj-misc.el2
-rw-r--r--lisp/cedet/semantic/bovine.el2
-rw-r--r--lisp/cedet/semantic/bovine/c.el2
-rw-r--r--lisp/cedet/semantic/db-find.el2
-rw-r--r--lisp/cedet/semantic/imenu.el2
-rw-r--r--lisp/cedet/srecode/insert.el2
-rw-r--r--lisp/cedet/srecode/srt-mode.el2
-rw-r--r--lisp/emacs-lisp/byte-opt.el2
-rw-r--r--lisp/emacs-lisp/smie.el2
-rw-r--r--lisp/emacs-lisp/tabulated-list.el2
-rw-r--r--lisp/erc/erc-notify.el3
-rw-r--r--lisp/generic-x.el2
-rw-r--r--lisp/gnus/gnus-topic.el2
-rw-r--r--lisp/image-mode.el2
-rw-r--r--lisp/international/mule-diag.el2
-rw-r--r--lisp/language/european.el8
-rw-r--r--lisp/language/romanian.el2
-rw-r--r--lisp/ldefs-boot.el2
-rw-r--r--lisp/mail/mail-extr.el2
-rw-r--r--lisp/mh-e/mh-comp.el2
-rw-r--r--lisp/mh-e/mh-e.el2
-rw-r--r--lisp/net/browse-url.el2
-rw-r--r--lisp/net/secrets.el18
-rw-r--r--lisp/progmodes/cc-vars.el6
-rw-r--r--lisp/progmodes/ebnf2ps.el2
-rw-r--r--lisp/progmodes/fortran.el4
-rw-r--r--lisp/progmodes/vhdl-mode.el2
-rw-r--r--lisp/speedbar.el2
-rw-r--r--lisp/startup.el2
-rw-r--r--lisp/textmodes/artist.el2
-rw-r--r--lisp/textmodes/bibtex.el2
-rw-r--r--lisp/textmodes/reftex-global.el24
-rw-r--r--lisp/vc/ediff-init.el2
39 files changed, 67 insertions, 71 deletions
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 1c2f2b5b015..a1cba0a9cd9 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -9383,7 +9383,7 @@
9383 9383
93842002-10-06 Glenn Morris <gmorris@ast.cam.ac.uk> 93842002-10-06 Glenn Morris <gmorris@ast.cam.ac.uk>
9385 9385
9386 * progmodes/fortran.el (fortran-beginning-do): Ignore labelled DO 9386 * progmodes/fortran.el (fortran-beginning-do): Ignore labeled DO
9387 loops. 9387 loops.
9388 9388
93892002-10-05 Stefan Monnier <monnier@cs.yale.edu> 93892002-10-05 Stefan Monnier <monnier@cs.yale.edu>
@@ -23550,4 +23550,3 @@ See ChangeLog.9 for earlier changes.
23550 23550
23551 You should have received a copy of the GNU General Public License 23551 You should have received a copy of the GNU General Public License
23552 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 23552 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
23553
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 7ef7fe9dffc..ed7ee443c4c 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -4923,10 +4923,10 @@
4923 (fortran-blink-matching-if, fortran-blink-matching-do) 4923 (fortran-blink-matching-if, fortran-blink-matching-do)
4924 (fortran-indent-new-line): Bind case-fold-search. 4924 (fortran-indent-new-line): Bind case-fold-search.
4925 (fortran-end-do, fortran-beginning-do, fortran-end-if) 4925 (fortran-end-do, fortran-beginning-do, fortran-end-if)
4926 (fortran-beginning-if): Bind case-fold-search. Allow labelled blocks. 4926 (fortran-beginning-if): Bind case-fold-search. Allow labeled blocks.
4927 Use fortran-end-prog-re. 4927 Use fortran-end-prog-re.
4928 (fortran-if-start-re): New variable. 4928 (fortran-if-start-re): New variable.
4929 (fortran-calculate-indent): Allow labelled blocks. Simplify the conds. 4929 (fortran-calculate-indent): Allow labeled blocks. Simplify the conds.
4930 Make select case indentation work. 4930 Make select case indentation work.
4931 (fortran-is-in-string-p): Ignore Emacs 18 bug kluge. 4931 (fortran-is-in-string-p): Ignore Emacs 18 bug kluge.
4932 (fortran-fill): Allow double quotes in check for string. 4932 (fortran-fill): Allow double quotes in check for string.
@@ -21766,9 +21766,9 @@
21766 21766
21767 * f90.el (f90-no-block-limit): Fixed bug for indentation of 21767 * f90.el (f90-no-block-limit): Fixed bug for indentation of
21768 elsewhere and elseif. 21768 elsewhere and elseif.
21769 (f90-looking-at-where-or-forall): Now allows for labelled forall 21769 (f90-looking-at-where-or-forall): Now allows for labeled forall
21770 and where statements. 21770 and where statements.
21771 (f90-font-lock-keywords-2): New highlighting for labelled where 21771 (f90-font-lock-keywords-2): New highlighting for labeled where
21772 and forall. Fixed small bug with else highlighting. 21772 and forall. Fixed small bug with else highlighting.
21773 (f90-fill-region): Moved indentation to f90-break-line. 21773 (f90-fill-region): Moved indentation to f90-break-line.
21774 (f90-break-line): Will now always indent the second line. 21774 (f90-break-line): Will now always indent the second line.
@@ -23123,4 +23123,3 @@ See ChangeLog.6 for earlier changes.
23123 23123
23124 You should have received a copy of the GNU General Public License 23124 You should have received a copy of the GNU General Public License
23125 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 23125 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
23126
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index edfe26fbc03..d2d6409cdd3 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -14191,7 +14191,7 @@
14191 14191
14192 * international/ja-dic-cnv.el: Renamed from skkdic-cnv.el. 14192 * international/ja-dic-cnv.el: Renamed from skkdic-cnv.el.
14193 Provide ja-dic-cnv instead of skkdic-cnv. 14193 Provide ja-dic-cnv instead of skkdic-cnv.
14194 (ja-dic-filename): Renamed from skkdic-filename. Referers changed. 14194 (ja-dic-filename): Renamed from skkdic-filename. Referrers changed.
14195 (iso-2022-7bit-short): Add safe-charsets property. 14195 (iso-2022-7bit-short): Add safe-charsets property.
14196 (skkdic-convert-postfix): Search Japanese chou-on character in 14196 (skkdic-convert-postfix): Search Japanese chou-on character in
14197 addition to Hiragana character. 14197 addition to Hiragana character.
@@ -20709,4 +20709,3 @@ See ChangeLog.8 for earlier changes.
20709 20709
20710 You should have received a copy of the GNU General Public License 20710 You should have received a copy of the GNU General Public License
20711 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 20711 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
20712
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 162da1f4815..472615039bb 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -1632,7 +1632,7 @@ We return the item-widget corresponding to the item at point."
1632(defun allout-redecorate-item (item-widget) 1632(defun allout-redecorate-item (item-widget)
1633 "Resituate ITEM-WIDGET decorations, disregarding context. 1633 "Resituate ITEM-WIDGET decorations, disregarding context.
1634 1634
1635Use this to redecorate only the item, when you know that it's 1635Use this to redecorate only the item, when you know that its
1636situation with respect to siblings, parent, and offspring is 1636situation with respect to siblings, parent, and offspring is
1637unchanged from its last decoration. Use 1637unchanged from its last decoration. Use
1638`allout-decorate-item-and-context' instead to reassess and adjust 1638`allout-decorate-item-and-context' instead to reassess and adjust
diff --git a/lisp/allout.el b/lisp/allout.el
index 18cc3c80dc6..6b1542cd3f8 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -5473,7 +5473,7 @@ header and body. The elements of that list are:
5473 "invalid format" format)))) 5473 "invalid format" format))))
5474 (list depth prefix strings)) 5474 (list depth prefix strings))
5475 result)) 5475 result))
5476 ;; Reasses format, if any: 5476 ;; Reassess format, if any:
5477 (if (and format (listp format)) 5477 (if (and format (listp format))
5478 (cond ((= new-depth depth) 5478 (cond ((= new-depth depth)
5479 (setq format (cons (1+ (car format)) 5479 (setq format (cons (1+ (car format))
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 63991c54e7f..718fdf58b11 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -71,7 +71,7 @@
71 (end-of-line) 71 (end-of-line)
72 (= (preceding-char) ?\\))) 72 (= (preceding-char) ?\\)))
73 73
74;;; Programatic editing of a Makefile 74;;; Programmatic editing of a Makefile
75;; 75;;
76(defun makefile-move-to-macro (macro &optional next) 76(defun makefile-move-to-macro (macro &optional next)
77 "Move to the definition of MACRO. Return t if found. 77 "Move to the definition of MACRO. Return t if found.
diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el
index 4d68e1544a7..1c9b9bea0f4 100644
--- a/lisp/cedet/ede/proj-misc.el
+++ b/lisp/cedet/ede/proj-misc.el
@@ -50,7 +50,7 @@ All listed sources are included in the distribution.")
50 50
51(defvar ede-misc-source 51(defvar ede-misc-source
52 (ede-sourcecode "ede-misc-source" 52 (ede-sourcecode "ede-misc-source"
53 :name "Miscelaneous" 53 :name "Miscellaneous"
54 :sourcepattern ".*") 54 :sourcepattern ".*")
55 "Miscellaneous field definition.") 55 "Miscellaneous field definition.")
56 56
diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el
index 1dfbb72d416..036a6f38724 100644
--- a/lisp/cedet/semantic/bovine.el
+++ b/lisp/cedet/semantic/bovine.el
@@ -240,7 +240,7 @@ list of semantic tokens found."
240 matchlist nil) ;;generate exit condition 240 matchlist nil) ;;generate exit condition
241 (if (not end) 241 (if (not end)
242 (setq out nil))) 242 (setq out nil)))
243 ;; Nothin? 243 ;; Nothing?
244 )) 244 ))
245 (setq result 245 (setq result
246 (if (eq s starting-stream) 246 (if (eq s starting-stream)
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 1076402ac91..af293a10348 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -1092,7 +1092,7 @@ Optional argument STAR and REF indicate the number of * and & in the typedef."
1092 ;; `throws' as a common name for things that toss 1092 ;; `throws' as a common name for things that toss
1093 ;; exceptions about. 1093 ;; exceptions about.
1094 :throws (nth 5 tokenpart) 1094 :throws (nth 5 tokenpart)
1095 ;; Reemtrant is a C++ thingy. Add it here 1095 ;; Reentrant is a C++ thingy. Add it here
1096 :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t) 1096 :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t)
1097 ;; A function post-const is funky. Try stuff 1097 ;; A function post-const is funky. Try stuff
1098 :methodconst-flag (if (member "const" (nth 6 tokenpart)) t) 1098 :methodconst-flag (if (member "const" (nth 6 tokenpart)) t)
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 34718d1fdd2..74c4d8e3788 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -862,7 +862,7 @@ instead."
862 (let ((tab (car (car tmp))) 862 (let ((tab (car (car tmp)))
863 (tags (cdr (car tmp)))) 863 (tags (cdr (car tmp))))
864 (dolist (T tags) 864 (dolist (T tags)
865 ;; Normilzation gives specialty database tables a chance 865 ;; Normalization gives specialty database tables a chance
866 ;; to convert into a more stable tag format. 866 ;; to convert into a more stable tag format.
867 (let* ((norm (semanticdb-normalize-one-tag tab T)) 867 (let* ((norm (semanticdb-normalize-one-tag tab T))
868 (ntab (car norm)) 868 (ntab (car norm))
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index e7e1da55ce3..35d9ff04a2a 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -96,7 +96,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil."
96(defcustom semantic-imenu-bucketize-type-members t 96(defcustom semantic-imenu-bucketize-type-members t
97 "*Non-nil if members of a type should be grouped into buckets. 97 "*Non-nil if members of a type should be grouped into buckets.
98A nil value means to keep them in the same order. 98A nil value means to keep them in the same order.
99Overriden to nil if `semantic-imenu-bucketize-file' is nil." 99Overridden to nil if `semantic-imenu-bucketize-file' is nil."
100 :group 'semantic-imenu 100 :group 'semantic-imenu
101 :type 'boolean) 101 :type 'boolean)
102(make-variable-buffer-local 'semantic-imenu-bucketize-type-members) 102(make-variable-buffer-local 'semantic-imenu-bucketize-type-members)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 84964a9e8b4..cccfe099e74 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -255,7 +255,7 @@ ST can be a class, or an object."
255 (let ((c (oref st code))) 255 (let ((c (oref st code)))
256 (srecode-push st) 256 (srecode-push st)
257 (srecode-insert-code-stream c dictionary)) 257 (srecode-insert-code-stream c dictionary))
258 ;; Poping the stack is protected 258 ;; Popping the stack is protected.
259 (srecode-pop st))) 259 (srecode-pop st)))
260 260
261(defun srecode-insert-code-stream (code dictionary) 261(defun srecode-insert-code-stream (code dictionary)
diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el
index 5a407aad135..0a99b7869e8 100644
--- a/lisp/cedet/srecode/srt-mode.el
+++ b/lisp/cedet/srecode/srt-mode.el
@@ -483,7 +483,7 @@ section or ? for an ask variable."
483 483
484 (if (> start (point)) 484 (if (> start (point))
485 ;; If our starting point is after the found point, that 485 ;; If our starting point is after the found point, that
486 ;; means we are not inside the macro. Retur nil. 486 ;; means we are not inside the macro. Return nil.
487 nil 487 nil
488 ;; We are inside the macro, extract the text so far. 488 ;; We are inside the macro, extract the text so far.
489 (let* ((macroend (match-beginning 0)) 489 (let* ((macroend (match-beginning 0))
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 7b98ade2422..0630f5f4e4e 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -527,7 +527,7 @@
527 ;; However, don't actually bother calling `ignore'. 527 ;; However, don't actually bother calling `ignore'.
528 `(prog1 nil . ,(mapcar 'byte-optimize-form (cdr form)))) 528 `(prog1 nil . ,(mapcar 'byte-optimize-form (cdr form))))
529 529
530 ;; Neeeded as long as we run byte-optimize-form after cconv. 530 ;; Needed as long as we run byte-optimize-form after cconv.
531 ((eq fn 'internal-make-closure) form) 531 ((eq fn 'internal-make-closure) form)
532 532
533 ((byte-code-function-p fn) 533 ((byte-code-function-p fn)
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index cad7c8419b2..95d93eb113d 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -759,7 +759,7 @@ Possible return values:
759 (indirect-function 'smie-op-left) 759 (indirect-function 'smie-op-left)
760 halfsexp)) 760 halfsexp))
761 761
762;;; Miscellanous commands using the precedence parser. 762;;; Miscellaneous commands using the precedence parser.
763 763
764(defun smie-backward-sexp-command (&optional n) 764(defun smie-backward-sexp-command (&optional n)
765 "Move backward through N logical elements." 765 "Move backward through N logical elements."
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index 75c9a01323d..e16970c6804 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -321,7 +321,7 @@ This mode is usually not used directly; instead, other major
321modes are derived from it, using `define-derived-mode'. 321modes are derived from it, using `define-derived-mode'.
322 322
323In this major mode, the buffer is divided into multiple columns, 323In this major mode, the buffer is divided into multiple columns,
324which are labelled using the header line. Each non-empty line 324which are labeled using the header line. Each non-empty line
325belongs to one \"entry\", and the entries can be sorted according 325belongs to one \"entry\", and the entries can be sorted according
326to their column values. 326to their column values.
327 327
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index 1b245ec2e33..7ae15307a55 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -88,7 +88,7 @@ strings."
88(defun erc-notify-install-message-catalogs () 88(defun erc-notify-install-message-catalogs ()
89 (erc-define-catalog 89 (erc-define-catalog
90 'english 90 'english
91 '((notify_current . "Notificated people online: %l") 91 '((notify_current . "Notified people online: %l")
92 (notify_list . "Current notify list: %l") 92 (notify_list . "Current notify list: %l")
93 (notify_on . "Detected %n on IRC network %m") 93 (notify_on . "Detected %n on IRC network %m")
94 (notify_off . "%n has left IRC network %m")))) 94 (notify_off . "%n has left IRC network %m"))))
@@ -250,4 +250,3 @@ with args, toggle notify status of people."
250;; indent-tabs-mode: t 250;; indent-tabs-mode: t
251;; tab-width: 8 251;; tab-width: 8
252;; End: 252;; End:
253
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 2c00229c76e..b0ef0439404 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1446,7 +1446,7 @@ like an INI file. You can add this hook to `find-file-hook'."
1446 "REGDB_STRING" 1446 "REGDB_STRING"
1447 "REGDB_UNINSTALL_NAME" 1447 "REGDB_UNINSTALL_NAME"
1448 "REMOTE_DRIVE" 1448 "REMOTE_DRIVE"
1449 "REMOVALE_DRIVE" 1449 "REMOVEABLE_DRIVE"
1450 "REPLACE_ITEM" 1450 "REPLACE_ITEM"
1451 "REPLACE" 1451 "REPLACE"
1452 "RESET" 1452 "RESET"
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index f1a2ed43e26..17af1a38333 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -430,7 +430,7 @@ inheritance."
430 regexp list-topic topic-level) 430 regexp list-topic topic-level)
431 "List all newsgroups with unread articles of level LEVEL or lower. 431 "List all newsgroups with unread articles of level LEVEL or lower.
432Use the `gnus-group-topics' to sort the groups. 432Use the `gnus-group-topics' to sort the groups.
433If PREDICTE is a function, list groups that the function returns non-nil; 433If PREDICATE is a function, list groups that the function returns non-nil;
434if it is t, list groups that have no unread articles. 434if it is t, list groups that have no unread articles.
435If LOWEST is non-nil, list all newsgroups of level LOWEST or higher." 435If LOWEST is non-nil, list all newsgroups of level LOWEST or higher."
436 (set-buffer gnus-group-buffer) 436 (set-buffer gnus-group-buffer)
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 30223e69ae0..f3e7caab174 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -638,7 +638,7 @@ These properties are determined by the Image mode variables
638`image-transform-resize' and `image-transform-rotation'. The 638`image-transform-resize' and `image-transform-rotation'. The
639return value is suitable for appending to an image spec. 639return value is suitable for appending to an image spec.
640 640
641Recaling and rotation properties only take effect if Emacs is 641Rescaling and rotation properties only take effect if Emacs is
642compiled with ImageMagick support." 642compiled with ImageMagick support."
643 (when (or image-transform-resize 643 (when (or image-transform-resize
644 (not (equal image-transform-rotation 0.0))) 644 (not (equal image-transform-rotation 0.0)))
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index cccf65b8051..efb910a3ef6 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -958,7 +958,7 @@ the current buffer."
958 (insert "\n ---<fallback to the default of the default fontset>---") 958 (insert "\n ---<fallback to the default of the default fontset>---")
959 (put-text-property (line-beginning-position) (point) 'face 'highlight))) 959 (put-text-property (line-beginning-position) (point) 'face 'highlight)))
960 (if (and start1 end2) 960 (if (and start1 end2)
961 ;; Reoder the printed information to match with the font 961 ;; Reorder the printed information to match with the font
962 ;; searching strategy; i.e. FONTSET, the default fontset, 962 ;; searching strategy; i.e. FONTSET, the default fontset,
963 ;; default of FONTSET, default of the default fontset. 963 ;; default of FONTSET, default of the default fontset.
964 (transpose-regions start1 end1 start2 end2)) 964 (transpose-regions start1 end1 start2 end2))
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 6dfc03d0f5f..5bdec6dec7b 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -146,8 +146,8 @@ These languages are supported with the Latin-3 (ISO-8859-3) character set:
146 (input-method . "latin-4-postfix") 146 (input-method . "latin-4-postfix")
147 (documentation . "\ 147 (documentation . "\
148These languages are supported with the Latin-4 (ISO-8859-4) character set: 148These languages are supported with the Latin-4 (ISO-8859-4) character set:
149 Danish, English, Estonian, Finnish, German, Greenlandic, Lappish, 149 Danish, English, Estonian, Finnish, German, Greenlandic, Latvian,
150 Latvian, Lithuanian, and Norwegian.")) 150 Lithuanian, Norwegian, and Sami."))
151 '("European")) 151 '("European"))
152 152
153 153
@@ -226,7 +226,7 @@ See also the Turkish environment."))
226 "ISO 2022 based 8-bit encoding for Latin-8 (MIME:ISO-8859-14)." 226 "ISO 2022 based 8-bit encoding for Latin-8 (MIME:ISO-8859-14)."
227 :coding-type 'charset 227 :coding-type 'charset
228 ;; `W' for `Welsh', since `C' for `Celtic' is taken. 228 ;; `W' for `Welsh', since `C' for `Celtic' is taken.
229 :mnemonic ?W 229 :mnemonic ?W
230 :charset-list '(iso-8859-14) 230 :charset-list '(iso-8859-14)
231 :mime-charset 'iso-8859-14) 231 :mime-charset 'iso-8859-14)
232 232
@@ -610,7 +610,7 @@ method and applying Turkish case rules for the characters i, I, $(D)E(B, $(D*
610(define-coding-system 'mac-roman 610(define-coding-system 'mac-roman
611 "Mac Roman Encoding (MIME:MACINTOSH)." 611 "Mac Roman Encoding (MIME:MACINTOSH)."
612 :coding-type 'charset 612 :coding-type 'charset
613 :mnemonic ?M 613 :mnemonic ?M
614 :charset-list '(mac-roman) 614 :charset-list '(mac-roman)
615 :mime-charset 'macintosh) 615 :mime-charset 'macintosh)
616 616
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index b9c250fd700..25a10633a28 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -35,7 +35,7 @@
35 (unibyte-display . iso-8859-2) 35 (unibyte-display . iso-8859-2)
36 (tutorial . "TUTORIAL.ro") 36 (tutorial . "TUTORIAL.ro")
37 (sample-text . "Bunã ziua, bine aþi venit!") 37 (sample-text . "Bunã ziua, bine aþi venit!")
38 (documentation . "Rmoanian environment using Latin-2 encoding. 38 (documentation . "Romanian environment using Latin-2 encoding.
39An environment for generic Latin-10 encoding is also available.")) 39An environment for generic Latin-10 encoding is also available."))
40 '("European")) 40 '("European"))
41 41
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 0ce53fcb9a3..8847c16bfb4 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -27789,7 +27789,7 @@ This mode is usually not used directly; instead, other major
27789modes are derived from it, using `define-derived-mode'. 27789modes are derived from it, using `define-derived-mode'.
27790 27790
27791In this major mode, the buffer is divided into multiple columns, 27791In this major mode, the buffer is divided into multiple columns,
27792which are labelled using the header line. Each non-empty line 27792which are labeled using the header line. Each non-empty line
27793belongs to one \"entry\", and the entries can be sorted according 27793belongs to one \"entry\", and the entries can be sorted according
27794to their column values. 27794to their column values.
27795 27795
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index c3a7da41823..12826001d86 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1961,7 +1961,7 @@ place. It affects how `mail-extract-address-components' works."
1961 ("gw" "Guinea-Bissau") 1961 ("gw" "Guinea-Bissau")
1962 ("gy" "Guyana") 1962 ("gy" "Guyana")
1963 ("hk" "Hong Kong") 1963 ("hk" "Hong Kong")
1964 ("hm" "Heard Island and Mcdonald Islands") 1964 ("hm" "Heard Island and McDonald Islands")
1965 ("hn" "Honduras") 1965 ("hn" "Honduras")
1966 ("hr" "Croatia" "Croatia (Hrvatska)") 1966 ("hr" "Croatia" "Croatia (Hrvatska)")
1967 ("ht" "Haiti") 1967 ("ht" "Haiti")
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 882a8771e28..eceb7a5fe3a 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -504,7 +504,7 @@ See also `mh-compose-forward-as-mime-flag',
504 folder msg) 504 folder msg)
505 ;; Was inserted before us, move to end of file to preserve order 505 ;; Was inserted before us, move to end of file to preserve order
506 (goto-char (point-max))))))) 506 (goto-char (point-max)))))))
507 ;; Postition just before forwarded message 507 ;; Position just before forwarded message.
508 (if (re-search-forward "^------- Forwarded Message" nil t) 508 (if (re-search-forward "^------- Forwarded Message" nil t)
509 (forward-line -1) 509 (forward-line -1)
510 (goto-char (mh-mail-header-end)) 510 (goto-char (mh-mail-header-end))
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 458993ca8f1..b614cdb7991 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2478,7 +2478,7 @@ of citations entirely, choose \"None\"."
2478 "Original-NNTP-" ; mail to news 2478 "Original-NNTP-" ; mail to news
2479 "Original-Path:" ; mail to news 2479 "Original-Path:" ; mail to news
2480 "Original-Received:" ; mail to news 2480 "Original-Received:" ; mail to news
2481 "Original-Recipt:" ; RFC 2298 2481 "Original-Recipient:" ; RFC 2298
2482 "Original-To:" ; mail to news 2482 "Original-To:" ; mail to news
2483 "Original-X-" ; mail to news 2483 "Original-X-" ; mail to news
2484 "Origination-Client:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ 2484 "Origination-Client:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 10a1fa5afc5..89948a2c81a 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -389,7 +389,7 @@ Defaults to the value of `browse-url-epiphany-arguments' at the time
389 :type '(repeat (string :tag "Argument")) 389 :type '(repeat (string :tag "Argument"))
390 :group 'browse-url) 390 :group 'browse-url)
391 391
392;; GNOME means of invoking either Mozilla or Netrape. 392;; GNOME means of invoking either Mozilla or Netscape.
393(defvar browse-url-gnome-moz-program "gnome-moz-remote") 393(defvar browse-url-gnome-moz-program "gnome-moz-remote")
394 394
395(defcustom browse-url-gnome-moz-arguments '() 395(defcustom browse-url-gnome-moz-arguments '()
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 9fa5eb32d43..88deef46862 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -431,7 +431,7 @@ returned, and it will be stored in `secrets-session-path'."
431 (secrets-get-collections))) 431 (secrets-get-collections)))
432 432
433(defun secrets-collection-path (collection) 433(defun secrets-collection-path (collection)
434 "Return the object path of collection labelled COLLECTION. 434 "Return the object path of collection labeled COLLECTION.
435If COLLECTION is nil, return the session collection path. 435If COLLECTION is nil, return the session collection path.
436If there is no such COLLECTION, return nil." 436If there is no such COLLECTION, return nil."
437 (or 437 (or
@@ -454,7 +454,7 @@ If there is no such COLLECTION, return nil."
454 (throw 'collection-found collection-path)))))) 454 (throw 'collection-found collection-path))))))
455 455
456(defun secrets-create-collection (collection) 456(defun secrets-create-collection (collection)
457 "Create collection labelled COLLECTION if it doesn't exist. 457 "Create collection labeled COLLECTION if it doesn't exist.
458Return the D-Bus object path for collection." 458Return the D-Bus object path for collection."
459 (let ((collection-path (secrets-collection-path collection))) 459 (let ((collection-path (secrets-collection-path collection)))
460 ;; Create the collection. 460 ;; Create the collection.
@@ -480,7 +480,7 @@ For the time being, only the alias \"default\" is supported."
480 "Label")) 480 "Label"))
481 481
482(defun secrets-set-alias (collection alias) 482(defun secrets-set-alias (collection alias)
483 "Set ALIAS as alias of collection labelled COLLECTION. 483 "Set ALIAS as alias of collection labeled COLLECTION.
484For the time being, only the alias \"default\" is supported." 484For the time being, only the alias \"default\" is supported."
485 (let ((collection-path (secrets-collection-path collection))) 485 (let ((collection-path (secrets-collection-path collection)))
486 (unless (secrets-empty-path collection-path) 486 (unless (secrets-empty-path collection-path)
@@ -497,7 +497,7 @@ For the time being, only the alias \"default\" is supported."
497 alias :object-path secrets-empty-path)) 497 alias :object-path secrets-empty-path))
498 498
499(defun secrets-unlock-collection (collection) 499(defun secrets-unlock-collection (collection)
500 "Unlock collection labelled COLLECTION. 500 "Unlock collection labeled COLLECTION.
501If successful, return the object path of the collection." 501If successful, return the object path of the collection."
502 (let ((collection-path (secrets-collection-path collection))) 502 (let ((collection-path (secrets-collection-path collection)))
503 (unless (secrets-empty-path collection-path) 503 (unless (secrets-empty-path collection-path)
@@ -509,7 +509,7 @@ If successful, return the object path of the collection."
509 collection-path)) 509 collection-path))
510 510
511(defun secrets-delete-collection (collection) 511(defun secrets-delete-collection (collection)
512 "Delete collection labelled COLLECTION." 512 "Delete collection labeled COLLECTION."
513 (let ((collection-path (secrets-collection-path collection))) 513 (let ((collection-path (secrets-collection-path collection)))
514 (unless (secrets-empty-path collection-path) 514 (unless (secrets-empty-path collection-path)
515 (secrets-prompt 515 (secrets-prompt
@@ -636,7 +636,7 @@ The object path of the created item is returned."
636 (car result))))) 636 (car result)))))
637 637
638(defun secrets-item-path (collection item) 638(defun secrets-item-path (collection item)
639 "Return the object path of item labelled ITEM in COLLECTION. 639 "Return the object path of item labeled ITEM in COLLECTION.
640If there is no such item, return nil." 640If there is no such item, return nil."
641 (let ((collection-path (secrets-unlock-collection collection))) 641 (let ((collection-path (secrets-unlock-collection collection)))
642 (catch 'item-found 642 (catch 'item-found
@@ -645,7 +645,7 @@ If there is no such item, return nil."
645 (throw 'item-found item-path)))))) 645 (throw 'item-found item-path))))))
646 646
647(defun secrets-get-secret (collection item) 647(defun secrets-get-secret (collection item)
648 "Return the secret of item labelled ITEM in COLLECTION. 648 "Return the secret of item labeled ITEM in COLLECTION.
649If there is no such item, return nil." 649If there is no such item, return nil."
650 (let ((item-path (secrets-item-path collection item))) 650 (let ((item-path (secrets-item-path collection item)))
651 (unless (secrets-empty-path item-path) 651 (unless (secrets-empty-path item-path)
@@ -656,7 +656,7 @@ If there is no such item, return nil."
656 "GetSecret" :object-path secrets-session-path)))))) 656 "GetSecret" :object-path secrets-session-path))))))
657 657
658(defun secrets-get-attributes (collection item) 658(defun secrets-get-attributes (collection item)
659 "Return the lookup attributes of item labelled ITEM in COLLECTION. 659 "Return the lookup attributes of item labeled ITEM in COLLECTION.
660If there is no such item, or the item has no attributes, return nil." 660If there is no such item, or the item has no attributes, return nil."
661 (unless (stringp collection) (setq collection "default")) 661 (unless (stringp collection) (setq collection "default"))
662 (let ((item-path (secrets-item-path collection item))) 662 (let ((item-path (secrets-item-path collection item)))
@@ -669,7 +669,7 @@ If there is no such item, or the item has no attributes, return nil."
669 secrets-interface-item "Attributes"))))) 669 secrets-interface-item "Attributes")))))
670 670
671(defun secrets-get-attribute (collection item attribute) 671(defun secrets-get-attribute (collection item attribute)
672 "Return the value of ATTRIBUTE of item labelled ITEM in COLLECTION. 672 "Return the value of ATTRIBUTE of item labeled ITEM in COLLECTION.
673If there is no such item, or the item doesn't own this attribute, return nil." 673If there is no such item, or the item doesn't own this attribute, return nil."
674 (cdr (assoc attribute (secrets-get-attributes collection item)))) 674 (cdr (assoc attribute (secrets-get-attributes collection item))))
675 675
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 24361e3667a..c7e78cb282a 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1327,7 +1327,7 @@ Here is the current list of valid syntactic element symbols:
1327 statement-case-open -- The first line in a case block starting with brace. 1327 statement-case-open -- The first line in a case block starting with brace.
1328 substatement -- The first line after an if/while/for/do/else. 1328 substatement -- The first line after an if/while/for/do/else.
1329 substatement-open -- The brace that opens a substatement block. 1329 substatement-open -- The brace that opens a substatement block.
1330 substatement-label -- Labelled line after an if/while/for/do/else. 1330 substatement-label -- Labeled line after an if/while/for/do/else.
1331 case-label -- A \"case\" or \"default\" label. 1331 case-label -- A \"case\" or \"default\" label.
1332 access-label -- C++ private/protected/public access label. 1332 access-label -- C++ private/protected/public access label.
1333 label -- Any ordinary label. 1333 label -- Any ordinary label.
@@ -1625,7 +1625,7 @@ names)."))
1625(defvar c-macro-with-semi-re nil 1625(defvar c-macro-with-semi-re nil
1626 ;; Regular expression which matches a (#define'd) symbol whose expansion 1626 ;; Regular expression which matches a (#define'd) symbol whose expansion
1627 ;; ends with a semicolon. 1627 ;; ends with a semicolon.
1628 ;; 1628 ;;
1629 ;; This variable should be set by `c-make-macros-with-semi-re' rather than 1629 ;; This variable should be set by `c-make-macros-with-semi-re' rather than
1630 ;; directly. 1630 ;; directly.
1631) 1631)
@@ -1651,7 +1651,7 @@ names)."))
1651 (t (error "c-make-macro-with-semi-re: invalid \ 1651 (t (error "c-make-macro-with-semi-re: invalid \
1652c-macro-names-with-semicolon: %s" 1652c-macro-names-with-semicolon: %s"
1653 c-macro-names-with-semicolon)))))) 1653 c-macro-names-with-semicolon))))))
1654 1654
1655(defvar c-macro-names-with-semicolon 1655(defvar c-macro-names-with-semicolon
1656 '("Q_OBJECT" "Q_PROPERTY" "Q_DECLARE" "Q_ENUMS") 1656 '("Q_OBJECT" "Q_PROPERTY" "Q_DECLARE" "Q_ENUMS")
1657 "List of #defined symbols whose expansion ends with a semicolon. 1657 "List of #defined symbols whose expansion ends with a semicolon.
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index c027b2b7454..597d84619ab 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -5037,7 +5037,7 @@ killed after process termination."
5037 (when gen-func 5037 (when gen-func
5038 (setq error-msg "EMPTY RULES" 5038 (setq error-msg "EMPTY RULES"
5039 tree (ebnf-eliminate-empty-rules tree)) 5039 tree (ebnf-eliminate-empty-rules tree))
5040 (setq error-msg "OPTMIZE" 5040 (setq error-msg "OPTIMIZE"
5041 tree (ebnf-optimize tree)) 5041 tree (ebnf-optimize tree))
5042 (setq error-msg "DIMENSIONS" 5042 (setq error-msg "DIMENSIONS"
5043 tree (ebnf-dimensions tree)) 5043 tree (ebnf-dimensions tree))
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index fd3d42685f0..cb0b02ff350 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -1462,7 +1462,7 @@ Return point or nil."
1462 1462
1463(defun fortran-beginning-do () 1463(defun fortran-beginning-do ()
1464 "Search backwards for first unmatched DO [WHILE]. 1464 "Search backwards for first unmatched DO [WHILE].
1465Return point or nil. Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)." 1465Return point or nil. Ignores labeled DO loops (ie DO 10 ... 10 CONTINUE)."
1466 (let ((case-fold-search t) 1466 (let ((case-fold-search t)
1467 (dostart-re "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]")) 1467 (dostart-re "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]"))
1468 (if (save-excursion 1468 (if (save-excursion
@@ -1482,7 +1482,7 @@ Return point or nil. Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)."
1482 (skip-chars-forward " \t0-9") 1482 (skip-chars-forward " \t0-9")
1483 (cond ((looking-at dostart-re) 1483 (cond ((looking-at dostart-re)
1484 (setq count (1- count))) 1484 (setq count (1- count)))
1485 ;; Note labelled loop ends not considered. 1485 ;; Note labeled loop ends not considered.
1486 ((looking-at "end[ \t]*do\\b") 1486 ((looking-at "end[ \t]*do\\b")
1487 (setq count (1+ count))))) 1487 (setq count (1+ count)))))
1488 (and (zerop count) 1488 (and (zerop count)
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 2f06afaa5ef..a8ff759717e 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -3117,7 +3117,7 @@ STRING are replaced by `-' and substrings are converted to lower case."
3117 3117
3118 3118
3119;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 3119;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3120;;; Menues 3120;;; Menus
3121;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 3121;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
3122 3122
3123;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 3123;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 3e707ff3832..31609232884 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -2100,7 +2100,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )."
2100 (if (= index 0) 2100 (if (= index 0)
2101 ;; If the shown files variable has extra directories, then 2101 ;; If the shown files variable has extra directories, then
2102 ;; it is our responsibility to redraw them all 2102 ;; it is our responsibility to redraw them all
2103 ;; Luckilly, the nature of inserting items into this list means 2103 ;; Luckily, the nature of inserting items into this list means
2104 ;; that by reversing it, we can easilly go in the right order 2104 ;; that by reversing it, we can easilly go in the right order
2105 (let ((sf (cdr (reverse speedbar-shown-directories)))) 2105 (let ((sf (cdr (reverse speedbar-shown-directories))))
2106 (setq speedbar-shown-directories 2106 (setq speedbar-shown-directories
diff --git a/lisp/startup.el b/lisp/startup.el
index 842548577c5..877ba1987f6 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1132,7 +1132,7 @@ the `--debug-init' option to view a complete error backtrace."
1132 (eq orig-enable-multibyte (default-value 1132 (eq orig-enable-multibyte (default-value
1133 'enable-multibyte-characters))) 1133 'enable-multibyte-characters)))
1134 ;; Init file changed to unibyte. Reset existing multibyte 1134 ;; Init file changed to unibyte. Reset existing multibyte
1135 ;; buffers (probably *scratch*, *Messages*, *Minibuff-0*). 1135 ;; buffers (probably *scratch*, *Messages*, *Minibuf-0*).
1136 ;; Arguably this should only be done if they're free of 1136 ;; Arguably this should only be done if they're free of
1137 ;; multibyte characters. 1137 ;; multibyte characters.
1138 (mapc (lambda (buffer) 1138 (mapc (lambda (buffer)
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index 2325d7b26ff..be14e90e000 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -2437,7 +2437,7 @@ in the coord."
2437 point-list)) 2437 point-list))
2438 2438
2439;; artist-save-chars-under-point-list 2439;; artist-save-chars-under-point-list
2440;; Remebers the chars that were there before we did draw the line. 2440;; Remembers the chars that were there before we did draw the line.
2441;; Returns point-list. 2441;; Returns point-list.
2442;; 2442;;
2443(defun artist-save-chars-under-point-list (point-list) 2443(defun artist-save-chars-under-point-list (point-list)
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 741b6cd904c..4459ac10098 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -3941,7 +3941,7 @@ If `bibtex-files' is non-nil, search all these files.
3941Otherwise the search is limited to the current buffer. 3941Otherwise the search is limited to the current buffer.
3942Return position of entry if CROSSREF-KEY is found or nil otherwise. 3942Return position of entry if CROSSREF-KEY is found or nil otherwise.
3943If CROSSREF-KEY is in the same buffer like current entry but before it 3943If CROSSREF-KEY is in the same buffer like current entry but before it
3944an error is signaled. If NOERRER is non-nil this error is suppressed. 3944an error is signaled. If NOERROR is non-nil this error is suppressed.
3945Optional arg PNT is the position of the referencing entry. It defaults 3945Optional arg PNT is the position of the referencing entry. It defaults
3946to position of point. If optional arg SPLIT is non-nil, split window 3946to position of point. If optional arg SPLIT is non-nil, split window
3947so that both the referencing and the crossrefed entry are displayed. 3947so that both the referencing and the crossrefed entry are displayed.
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index ccdab49750b..6a3a7bef244 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -139,7 +139,7 @@ No active TAGS table is required."
139 (set (make-local-variable 'TeX-master) master) 139 (set (make-local-variable 'TeX-master) master)
140 (erase-buffer) 140 (erase-buffer)
141 (insert " MULTIPLE LABELS IN CURRENT DOCUMENT:\n") 141 (insert " MULTIPLE LABELS IN CURRENT DOCUMENT:\n")
142 (insert 142 (insert
143 " Move point to label and type `r' to run a query-replace on the label\n" 143 " Move point to label and type `r' to run a query-replace on the label\n"
144 " and its references. Type `q' to exit this buffer.\n\n") 144 " and its references. Type `q' to exit this buffer.\n\n")
145 (insert " LABEL FILE\n") 145 (insert " LABEL FILE\n")
@@ -190,15 +190,15 @@ This command should be used with care, in particular in multifile
190documents. You should not use it if another document refers to this 190documents. You should not use it if another document refers to this
191one with the `xr' package." 191one with the `xr' package."
192 (interactive) 192 (interactive)
193 ;; Resan the entire document 193 ;; Rescan the entire document
194 (reftex-access-scan-info 1) 194 (reftex-access-scan-info 1)
195 ;; Get some insurance 195 ;; Get some insurance
196 (if (and (reftex-is-multi) 196 (if (and (reftex-is-multi)
197 (not (yes-or-no-p "Replacing all simple labels in multiple files is risky. Continue? "))) 197 (not (yes-or-no-p "Replacing all simple labels in multiple files is risky. Continue? ")))
198 (error "Abort")) 198 (error "Abort"))
199 ;; Make the translation list 199 ;; Make the translation list
200 (let* ((re-core (concat "\\(" 200 (let* ((re-core (concat "\\("
201 (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|") 201 (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|")
202 "\\)")) 202 "\\)"))
203 (label-re (concat "\\`" re-core "\\([0-9]+\\)\\'")) 203 (label-re (concat "\\`" re-core "\\([0-9]+\\)\\'"))
204 (search-re (concat "[{,]\\(" re-core "\\([0-9]+\\)\\)[,}]")) 204 (search-re (concat "[{,]\\(" re-core "\\([0-9]+\\)\\)[,}]"))
@@ -231,11 +231,11 @@ one with the `xr' package."
231 (reftex-save-all-document-buffers) 231 (reftex-save-all-document-buffers)
232 232
233 ;; First test to check for erros 233 ;; First test to check for erros
234 (setq n (reftex-translate 234 (setq n (reftex-translate
235 files search-re translate-alist error-fmt 'test)) 235 files search-re translate-alist error-fmt 'test))
236 236
237 ;; Now the real thing. 237 ;; Now the real thing.
238 (if (yes-or-no-p 238 (if (yes-or-no-p
239 (format "Replace %d items at %d places in %d files? " 239 (format "Replace %d items at %d places in %d files? "
240 (length translate-alist) n (length files))) 240 (length translate-alist) n (length files)))
241 (progn 241 (progn
@@ -253,9 +253,9 @@ one with the `xr' package."
253 253
254(defun reftex-translate (files search-re translate-alist error-fmt test) 254(defun reftex-translate (files search-re translate-alist error-fmt test)
255 ;; In FILES, look for SEARCH-RE and replace match 1 of it with 255 ;; In FILES, look for SEARCH-RE and replace match 1 of it with
256 ;; its association in TRANSLATE-ALSIT. 256 ;; its association in TRANSLATE-ALSIT.
257 ;; If we do not find an association and TEST is non-nil, query 257 ;; If we do not find an association and TEST is non-nil, query
258 ;; to ignore the problematic string. 258 ;; to ignore the problematic string.
259 ;; If TEST is nil, it is ignored without query. 259 ;; If TEST is nil, it is ignored without query.
260 ;; Return the number of replacements. 260 ;; Return the number of replacements.
261 (let ((n 0) file label match-data buf macro pos cell) 261 (let ((n 0) file label match-data buf macro pos cell)
@@ -281,7 +281,7 @@ one with the `xr' package."
281 (or (looking-at "\\\\ref") 281 (or (looking-at "\\\\ref")
282 (looking-at "\\\\[a-zA-Z]*ref\\(range\\)?[^a-zA-Z]") 282 (looking-at "\\\\[a-zA-Z]*ref\\(range\\)?[^a-zA-Z]")
283 (looking-at "\\\\ref[a-zA-Z]*[^a-zA-Z]") 283 (looking-at "\\\\ref[a-zA-Z]*[^a-zA-Z]")
284 (looking-at (format 284 (looking-at (format
285 reftex-find-label-regexp-format 285 reftex-find-label-regexp-format
286 (regexp-quote label))))) 286 (regexp-quote label)))))
287 ;; OK, we should replace it. 287 ;; OK, we should replace it.
@@ -351,7 +351,7 @@ Also checks if buffers visiting the files are in read-only mode."
351 351
352(defun reftex-isearch-wrap-function () 352(defun reftex-isearch-wrap-function ()
353 (if (not isearch-word) 353 (if (not isearch-word)
354 (switch-to-buffer 354 (switch-to-buffer
355 (funcall isearch-next-buffer-function (current-buffer) t))) 355 (funcall isearch-next-buffer-function (current-buffer) t)))
356 (goto-char (if isearch-forward (point-min) (point-max)))) 356 (goto-char (if isearch-forward (point-min) (point-max))))
357 357
@@ -435,7 +435,7 @@ With no argument, this command toggles
435`reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off." 435`reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off."
436 (interactive "P") 436 (interactive "P")
437 (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode)) 437 (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode))
438 (setq reftex-isearch-minor-mode 438 (setq reftex-isearch-minor-mode
439 (not (or (and (null arg) reftex-isearch-minor-mode) 439 (not (or (and (null arg) reftex-isearch-minor-mode)
440 (<= (prefix-numeric-value arg) 0)))) 440 (<= (prefix-numeric-value arg) 0))))
441 (unless (eq reftex-isearch-minor-mode old-reftex-isearch-minor-mode) 441 (unless (eq reftex-isearch-minor-mode old-reftex-isearch-minor-mode)
@@ -471,7 +471,7 @@ With no argument, this command toggles
471 ;; Force modeline redisplay. 471 ;; Force modeline redisplay.
472 (set-buffer-modified-p (buffer-modified-p)))) 472 (set-buffer-modified-p (buffer-modified-p))))
473 473
474(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil 474(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil
475 'reftex-isearch-minor-mode) 475 'reftex-isearch-minor-mode)
476 476
477;;; reftex-global.el ends here 477;;; reftex-global.el ends here
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index eeaa2cfa927..787a8b7c0f1 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -81,7 +81,7 @@ that Ediff doesn't know about.")
81;; so that `kill-all-local-variables' (called by major-mode setting 81;; so that `kill-all-local-variables' (called by major-mode setting
82;; commands) won't destroy Ediff control variables. 82;; commands) won't destroy Ediff control variables.
83;; 83;;
84;; Plagiarised from `emerge-defvar-local' for XEmacs. 84;; Plagiarized from `emerge-defvar-local' for XEmacs.
85(defmacro ediff-defvar-local (var value doc) 85(defmacro ediff-defvar-local (var value doc)
86 "Defines VAR as a local variable." 86 "Defines VAR as a local variable."
87 (declare (indent defun)) 87 (declare (indent defun))