aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorU. Ser2011-05-10 15:57:12 +0200
committerU. Ser2011-05-10 15:57:12 +0200
commit9b053e766d00b0c74e0c8a8e31af7d46aa880f32 (patch)
tree78d6d58095f772f7c2c78a6010ef25a9702e6117
parent296d197b34bfedb9ae5de8ffd615cdc428e60b8a (diff)
downloademacs-9b053e766d00b0c74e0c8a8e31af7d46aa880f32.tar.gz
emacs-9b053e766d00b0c74e0c8a8e31af7d46aa880f32.zip
fix many doubled-word typos
-rw-r--r--ChangeLog31
-rw-r--r--admin/notes/exit-value2
-rw-r--r--doc/lispref/minibuf.texi2
-rw-r--r--doc/misc/ede.texi2
-rw-r--r--etc/MH-E-NEWS2
-rw-r--r--etc/PROBLEMS2
-rw-r--r--lisp/cedet/ede.el2
-rw-r--r--lisp/cedet/ede/pmake.el2
-rw-r--r--lisp/cedet/semantic/complete.el2
-rw-r--r--lisp/gnus/shr.el2
-rw-r--r--lisp/international/quail.el2
-rw-r--r--lisp/kermit.el2
-rw-r--r--lisp/mh-e/mh-alias.el2
-rw-r--r--lisp/mh-e/mh-scan.el2
-rw-r--r--lisp/net/ldap.el2
-rw-r--r--lisp/org/org-agenda.el2
-rw-r--r--lisp/org/org-table.el2
-rw-r--r--lisp/org/org-wl.el2
-rw-r--r--lisp/org/org.el4
-rw-r--r--lisp/progmodes/js.el2
-rw-r--r--lisp/progmodes/vhdl-mode.el2
-rw-r--r--lisp/textmodes/artist.el4
-rw-r--r--lisp/textmodes/reftex-dcr.el2
-rw-r--r--src/xdisp.c4
24 files changed, 57 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index ee27f4c1492..044d48646eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
12011-05-10 Jim Meyering <meyering@redhat.com>
2
3 fix doubled-word typos
4 * admin/notes/exit-value: the the -> the
5 * doc/lispref/minibuf.texi: in in -> in
6 * doc/misc/ede.texi: or or -> or
7 * etc/MH-E-NEWS: the the -> the
8 * etc/PROBLEMS: Likewise.
9 * lisp/cedet/ede/pmake.el (ede-proj-makefile-garbage-patterns): Likewise.
10 * lisp/cedet/semantic/complete.el
11 (semantic-complete-read-tag-local-members): Likewise.
12 * lisp/cedet/ede.el (ede-auto-add-method): then then -> then
13 * lisp/gnus/shr.el (shr-colorize-region): on on -> on
14 * lisp/international/quail.el (quail-insert-kbd-layout): and and -> and
15 * lisp/kermit.el: and and -> and
16 * lisp/mh-e/mh-alias.el (mh-alias-minibuffer-confirm-address):
17 if if -> if it
18 * lisp/mh-e/mh-scan.el (mh-scan-destination-width): in in -> in
19 * lisp/net/ldap.el (ldap-search-internal): to to -> to
20 * lisp/org/org-agenda.el (org-agenda-entry-types): the the -> the
21 * lisp/org/org-table.el (org-table-get-remote-range): or or -> or
22 * lisp/org/org-wl.el (org-wl-folder-type): the the -> the
23 * lisp/org/org.el (org-goto, org-inside-LaTeX-fragment-p): Likewise.
24 * lisp/progmodes/vhdl-mode.el (vhdl-offsets-alist): Likewise.
25 * lisp/progmodes/js.el (js-mode): and and -> and
26 * lisp/textmodes/artist.el (artist-move-to-xy): at at -> at
27 (artist-draw-region-trim-line-endings): if if -> if
28 And Safetyc -> Safety.
29 * lisp/textmodes/reftex-dcr.el (reftex-view-crossref): at at -> at a
30 * src/xdisp.c (x_intersect_rectangles): the the -> the
31
12011-05-09 Teodor Zlatanov <tzz@lifelogs.com> 322011-05-09 Teodor Zlatanov <tzz@lifelogs.com>
2 33
3 * configure.in: Require GnuTLS 2.6.x or higher. 34 * configure.in: Require GnuTLS 2.6.x or higher.
diff --git a/admin/notes/exit-value b/admin/notes/exit-value
index e59bb614b9b..cad6862c8aa 100644
--- a/admin/notes/exit-value
+++ b/admin/notes/exit-value
@@ -10,7 +10,7 @@ different dispatch model that is not explained further here).
10From the point of view of the program, nowadays stdlib.h on both type of 10From the point of view of the program, nowadays stdlib.h on both type of
11systems provides macros `EXIT_SUCCESS' and `EXIT_FAILURE' that should DTRT. 11systems provides macros `EXIT_SUCCESS' and `EXIT_FAILURE' that should DTRT.
12 12
13NB: The numerical values of these macros DO NOT need to fulfill the the exit 13NB: The numerical values of these macros DO NOT need to fulfill the exit
14value requirements outlined in the first paragraph! That is the job of the 14value requirements outlined in the first paragraph! That is the job of the
15`exit' function. Thus, this kind of construct shows misunderstanding: 15`exit' function. Thus, this kind of construct shows misunderstanding:
16 16
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index acc68b0aafa..d2bb8da962f 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1691,7 +1691,7 @@ match for some possibility; @code{nil} otherwise.
1691@item 1691@item
1692@code{(boundaries . SUFFIX)} specifies @code{completion-boundaries}. 1692@code{(boundaries . SUFFIX)} specifies @code{completion-boundaries}.
1693The function should return a value of the form @code{(boundaries 1693The function should return a value of the form @code{(boundaries
1694START . END)} where START is the position of the beginning boundary in 1694START . END)} where START is the position of the beginning boundary
1695in the string to complete, and END is the position of the end boundary 1695in the string to complete, and END is the position of the end boundary
1696in SUFFIX. 1696in SUFFIX.
1697@end itemize 1697@end itemize
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 67df955ca8f..13b640a09fe 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -241,7 +241,7 @@ To add the current file to an existing target, type @kbd{C-c . a}
241You can add a file to more than one target; this is OK. 241You can add a file to more than one target; this is OK.
242 242
243To remove the current file from a target, type @kbd{C-c . d} 243To remove the current file from a target, type @kbd{C-c . d}
244(@code{ede-remove-file}), or or use the @samp{Remove File} menu item 244(@code{ede-remove-file}), or use the @samp{Remove File} menu item
245in the @samp{Target Options} submenu. If the file belongs to multiple 245in the @samp{Target Options} submenu. If the file belongs to multiple
246targets, this command prompts for each target it could be removed 246targets, this command prompts for each target it could be removed
247from. 247from.
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 27b6d40bd89..aaafe76990b 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -320,7 +320,7 @@ changes for MH-E functions are listed here.
320 320
321Most of the changes have to do with the renaming of the functions with 321Most of the changes have to do with the renaming of the functions with
322"mhn" in them to "mh" because nmh doesn't use `mhn'. The names were 322"mhn" in them to "mh" because nmh doesn't use `mhn'. The names were
323also made consistent with the the family of "mml" functions. 323also made consistent with the family of "mml" functions.
324 324
325The type of signing or encryption has been generalized so the method 325The type of signing or encryption has been generalized so the method
326is now an option rather than a part of the function's name. The option 326is now an option rather than a part of the function's name. The option
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 15d4ea227d0..2f344955cb2 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1217,7 +1217,7 @@ be carried out at the same time:
12172) If the connection is very slow, you might also want to consider 12172) If the connection is very slow, you might also want to consider
1218 switching off scroll bars, menu bar, and tool bar. Adding the 1218 switching off scroll bars, menu bar, and tool bar. Adding the
1219 following forms to your .emacs file will accomplish that, but only 1219 following forms to your .emacs file will accomplish that, but only
1220 after the the initial frame is displayed: 1220 after the initial frame is displayed:
1221 1221
1222 (scroll-bar-mode -1) 1222 (scroll-bar-mode -1)
1223 (menu-bar-mode -1) 1223 (menu-bar-mode -1)
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 67b648a44bb..307ccfdadd7 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -80,7 +80,7 @@ project file, all targets are queried to see if it should be added.
80If the value is 'always, then the new file is added to the first 80If the value is 'always, then the new file is added to the first
81target encountered. If the value is 'multi-ask, then if more than one 81target encountered. If the value is 'multi-ask, then if more than one
82target wants the file, the user is asked. If only one target wants 82target wants the file, the user is asked. If only one target wants
83the file, then then it is automatically added to that target. If the 83the file, then it is automatically added to that target. If the
84value is 'ask, then the user is always asked, unless there is no 84value is 'ask, then the user is always asked, unless there is no
85target willing to take the file. 'never means never perform the check." 85target willing to take the file. 'never means never perform the check."
86 :group 'ede 86 :group 'ede
diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index 52a1d485324..d78e95af27f 100644
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -478,7 +478,7 @@ These are removed with make clean."
478(defmethod ede-proj-makefile-garbage-patterns ((this ede-proj-target)) 478(defmethod ede-proj-makefile-garbage-patterns ((this ede-proj-target))
479 "Return a list of patterns that are considered garbage to THIS. 479 "Return a list of patterns that are considered garbage to THIS.
480These are removed with make clean." 480These are removed with make clean."
481 ;; Get the the source object from THIS, and use the specified garbage. 481 ;; Get the source object from THIS, and use the specified garbage.
482 (let ((src (ede-target-sourcecode this)) 482 (let ((src (ede-target-sourcecode this))
483 (garb nil)) 483 (garb nil))
484 (while src 484 (while src
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 47cb722e005..18c7b5a1a50 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1825,7 +1825,7 @@ HISTORY is a symbol representing a variable to store the history in."
1825 initial-input 1825 initial-input
1826 history) 1826 history)
1827 "Ask for a tag by name from the local type members. 1827 "Ask for a tag by name from the local type members.
1828Available tags are from the the current scope. 1828Available tags are from the current scope.
1829Completion options are presented in a traditional way, with highlighting 1829Completion options are presented in a traditional way, with highlighting
1830to resolve same-name collisions. 1830to resolve same-name collisions.
1831PROMPT is a string to prompt with. 1831PROMPT is a string to prompt with.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index bf5b06ccb56..75c6d5d9ce7 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -643,7 +643,7 @@ ones, in case fg and bg are nil."
643 (shr-put-color start end :background (car new-colors)))) 643 (shr-put-color start end :background (car new-colors))))
644 new-colors))) 644 new-colors)))
645 645
646;; Put a color in the region, but avoid putting colors on on blank 646;; Put a color in the region, but avoid putting colors on blank
647;; text at the start of the line, and the newline at the end, to avoid 647;; text at the start of the line, and the newline at the end, to avoid
648;; ugliness. Also, don't overwrite any existing color information, 648;; ugliness. Also, don't overwrite any existing color information,
649;; since this can be called recursively, and we want the "inner" color 649;; since this can be called recursively, and we want the "inner" color
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 2174beb19c9..51a0dcace14 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -818,7 +818,7 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
818 (bar "|") 818 (bar "|")
819 lower upper row) 819 lower upper row)
820 ;; Make table without horizontal lines. Each column for a key 820 ;; Make table without horizontal lines. Each column for a key
821 ;; has the form "| LU |" where L is for lower key and and U is 821 ;; has the form "| LU |" where L is for lower key and U is
822 ;; for a upper key. If width of L (U) is greater than 1, 822 ;; for a upper key. If width of L (U) is greater than 1,
823 ;; preceding (following) space is not inserted. 823 ;; preceding (following) space is not inserted.
824 (put-text-property 0 1 'face 'bold bar) 824 (put-text-property 0 1 'face 'bold bar)
diff --git a/lisp/kermit.el b/lisp/kermit.el
index b91dbb00cfa..3c8f52db0cd 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -63,7 +63,7 @@
63;; the -c (connect) command line option, which means you also have to specify a 63;; the -c (connect) command line option, which means you also have to specify a
64;; line and baud on the command line, as in "kermit -l /dev/tty53 -b 9600 -c". 64;; line and baud on the command line, as in "kermit -l /dev/tty53 -b 9600 -c".
65;; However, this will cause kermit to exit when the connection is closed. So 65;; However, this will cause kermit to exit when the connection is closed. So
66;; in order to do a file transfer, you have to think ahead and and add -r 66;; in order to do a file transfer, you have to think ahead and add -r
67;; (receive) to the command line. This means that you can't use the server 67;; (receive) to the command line. This means that you can't use the server
68;; feature. The only fix I can see is to muck around with the source code for 68;; feature. The only fix I can see is to muck around with the source code for
69;; kermit, although this probably wouldn't be too hard. What is needed is an 69;; kermit, although this probably wouldn't be too hard. What is needed is an
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 449a8782d0c..c93aaeb70da 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -286,7 +286,7 @@ Blind aliases or users from /etc/passwd are not expanded."
286 (the-name (buffer-substring-no-properties beg (point)))) 286 (the-name (buffer-substring-no-properties beg (point))))
287 (if (mh-assoc-string the-name mh-alias-alist t) 287 (if (mh-assoc-string the-name mh-alias-alist t)
288 (message "%s -> %s" the-name (mh-alias-expand the-name)) 288 (message "%s -> %s" the-name (mh-alias-expand the-name))
289 ;; Check if if was a single word likely to be an alias 289 ;; Check if it was a single word likely to be an alias
290 (if (and (equal mh-alias-flash-on-comma 1) 290 (if (and (equal mh-alias-flash-on-comma 1)
291 (not (string-match " " the-name))) 291 (not (string-match " " the-name)))
292 (message "No alias for %s" the-name)))))) 292 (message "No alias for %s" the-name))))))
diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el
index 656bcb65011..8a3e1632e2e 100644
--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@@ -308,7 +308,7 @@ This column will have one of \" \", \"%\", \"-\", \"t\", \"c\", \"b\", or \"n\"
308in it. 308in it.
309 309
310 \" \" blank space is the default character. 310 \" \" blank space is the default character.
311 \"%\" indicates that the message in in a named MH sequence. 311 \"%\" indicates that the message in a named MH sequence.
312 \"-\" indicates that the message has been annotated with a replied field. 312 \"-\" indicates that the message has been annotated with a replied field.
313 \"t\" indicates that the message contains mymbox in the To: field. 313 \"t\" indicates that the message contains mymbox in the To: field.
314 \"c\" indicates that the message contains mymbox in the Cc: field. 314 \"c\" indicates that the message contains mymbox in the Cc: field.
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 2caf8dec30f..a45cc5500c2 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -498,7 +498,7 @@ but if you have more than one in your netrc file, only the first
498matching one will be used. Note the \"port ldap\" part is NOT 498matching one will be used. Note the \"port ldap\" part is NOT
499required. 499required.
500 500
501 `host' is a string naming one or more (blank-separated) LDAP servers to 501 `host' is a string naming one or more (blank-separated) LDAP servers
502to try to connect to. Each host name may optionally be of the form HOST:PORT. 502to try to connect to. Each host name may optionally be of the form HOST:PORT.
503 `filter' is a filter string for the search as described in RFC 1558. 503 `filter' is a filter string for the search as described in RFC 1558.
504 `attributes' is a list of strings indicating which attributes to retrieve 504 `attributes' is a list of strings indicating which attributes to retrieve
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 9adc180b28e..8aeb4c4e5b2 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -3370,7 +3370,7 @@ By default, all four types are turned on.
3370 3370
3371Never set this variable globally using `setq', because then it 3371Never set this variable globally using `setq', because then it
3372will apply to all future agenda commands. Instead, bind it with 3372will apply to all future agenda commands. Instead, bind it with
3373`let' to scope it dynamically into the the agenda-constructing 3373`let' to scope it dynamically into the agenda-constructing
3374command. A good way to set it is through options in 3374command. A good way to set it is through options in
3375`org-agenda-custom-commands'. For a more flexible (though 3375`org-agenda-custom-commands'. For a more flexible (though
3376somewhat less efficient) way of determining what is included in 3376somewhat less efficient) way of determining what is included in
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index c99b5bf681a..b56dc6b77c3 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -4341,7 +4341,7 @@ a \"#+TBLNAME:\" directive. The first table following this line
4341will then be used. Alternatively, it may be an ID referring to 4341will then be used. Alternatively, it may be an ID referring to
4342any entry, also in a different file. In this case, the first table 4342any entry, also in a different file. In this case, the first table
4343in that entry will be referenced. 4343in that entry will be referenced.
4344FORM is a field or range descriptor like \"@2$3\" or or \"B3\" or 4344FORM is a field or range descriptor like \"@2$3\" or \"B3\" or
4345\"@I$2..@II$2\". All the references must be absolute, not relative. 4345\"@I$2..@II$2\". All the references must be absolute, not relative.
4346 4346
4347The return value is either a single string for a single field, or a 4347The return value is either a single string for a single field, or a
diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index 2a16d047b33..f1616f8001d 100644
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -118,7 +118,7 @@ googlegroups otherwise."
118(defun org-wl-folder-type (folder) 118(defun org-wl-folder-type (folder)
119 "Return symbol that indicates the type of FOLDER. 119 "Return symbol that indicates the type of FOLDER.
120FOLDER is the wanderlust folder name. The first character of the 120FOLDER is the wanderlust folder name. The first character of the
121folder name determines the the folder type." 121folder name determines the folder type."
122 (let* ((indicator (substring folder 0 1)) 122 (let* ((indicator (substring folder 0 1))
123 (type (cdr (assoc indicator org-wl-folder-types)))) 123 (type (cdr (assoc indicator org-wl-folder-types))))
124 ;; maybe access or file folder 124 ;; maybe access or file folder
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 076df5f0d07..4b316ab60ab 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -6496,7 +6496,7 @@ in an indirect buffer, in overview mode. You can dive into the tree in
6496that copy, use org-occur and incremental search to find a location. 6496that copy, use org-occur and incremental search to find a location.
6497When pressing RET or `Q', the command returns to the original buffer in 6497When pressing RET or `Q', the command returns to the original buffer in
6498which the visibility is still unchanged. After RET is will also jump to 6498which the visibility is still unchanged. After RET is will also jump to
6499the location selected in the indirect buffer and expose the 6499the location selected in the indirect buffer and expose
6500the headline hierarchy above." 6500the headline hierarchy above."
6501 (interactive "P") 6501 (interactive "P")
6502 (let* ((org-refile-targets `((nil . (:maxlevel . ,org-goto-max-level)))) 6502 (let* ((org-refile-targets `((nil . (:maxlevel . ,org-goto-max-level))))
@@ -15746,7 +15746,7 @@ sequence appearing also before point.
15746Even though the matchers for math are configurable, this function assumes 15746Even though the matchers for math are configurable, this function assumes
15747that \\begin, \\(, \\[, and $$ are always used. Only the single dollar 15747that \\begin, \\(, \\[, and $$ are always used. Only the single dollar
15748delimiters are skipped when they have been removed by customization. 15748delimiters are skipped when they have been removed by customization.
15749The return value is nil, or a cons cell with the delimiter and 15749The return value is nil, or a cons cell with the delimiter
15750and the position of this delimiter. 15750and the position of this delimiter.
15751 15751
15752This function does a reasonably good job, but can locally be fooled by 15752This function does a reasonably good job, but can locally be fooled by
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index cd382d4e78d..a0437ccf9ae 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3347,7 +3347,7 @@ If one hasn't been set, or if it's stale, prompt for a new one."
3347 ;; Important to fontify the whole buffer syntactically! If we don't, 3347 ;; Important to fontify the whole buffer syntactically! If we don't,
3348 ;; then we might have regular expression literals that aren't marked 3348 ;; then we might have regular expression literals that aren't marked
3349 ;; as strings, which will screw up parse-partial-sexp, scan-lists, 3349 ;; as strings, which will screw up parse-partial-sexp, scan-lists,
3350 ;; etc. and and produce maddening "unbalanced parenthesis" errors. 3350 ;; etc. and produce maddening "unbalanced parenthesis" errors.
3351 ;; When we attempt to find the error and scroll to the portion of 3351 ;; When we attempt to find the error and scroll to the portion of
3352 ;; the buffer containing the problem, JIT-lock will apply the 3352 ;; the buffer containing the problem, JIT-lock will apply the
3353 ;; correct syntax to the regular expresion literal and the problem 3353 ;; correct syntax to the regular expresion literal and the problem
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 75b706b74ec..9aaf3059b78 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -1937,7 +1937,7 @@ Here is the current list of valid syntactic element symbols:
1937 comment -- a line containing only a comment 1937 comment -- a line containing only a comment
1938 arglist-intro -- the first line in an argument list 1938 arglist-intro -- the first line in an argument list
1939 arglist-cont -- subsequent argument list lines when no 1939 arglist-cont -- subsequent argument list lines when no
1940 arguments follow on the same line as the 1940 arguments follow on the same line as
1941 the arglist opening paren 1941 the arglist opening paren
1942 arglist-cont-nonempty -- subsequent argument list lines when at 1942 arglist-cont-nonempty -- subsequent argument list lines when at
1943 least one argument follows on the same 1943 least one argument follows on the same
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index 5fbc8a643d8..2325d7b26ff 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -1942,7 +1942,7 @@ Return a list (RETURN-CODE STDOUT STDERR)."
1942 ;; 1942 ;;
1943 ;; Example: In the figure below, the `X' is the very last 1943 ;; Example: In the figure below, the `X' is the very last
1944 ;; character in the buffer ("a non-empty line at the 1944 ;; character in the buffer ("a non-empty line at the
1945 ;; end"). Suppose point is at at P. Then (forward-line 1) 1945 ;; end"). Suppose point is at P. Then (forward-line 1)
1946 ;; returns 0 and puts point after the `X'. 1946 ;; returns 0 and puts point after the `X'.
1947 ;; 1947 ;;
1948 ;; --------top of buffer-------- 1948 ;; --------top of buffer--------
@@ -4030,7 +4030,7 @@ The 2-point shape SHAPE is drawn from X1, Y1 to X2, Y2."
4030(defun artist-draw-region-trim-line-endings (min-y max-y) 4030(defun artist-draw-region-trim-line-endings (min-y max-y)
4031 "Trim lines in current draw-region from MIN-Y to MAX-Y. 4031 "Trim lines in current draw-region from MIN-Y to MAX-Y.
4032Trimming here means removing white space at end of a line." 4032Trimming here means removing white space at end of a line."
4033 ;; Safetyc check: switch min-y and max-y if if max-y is smaller 4033 ;; Safety check: switch min-y and max-y if max-y is smaller
4034 (if (< max-y min-y) 4034 (if (< max-y min-y)
4035 (let ((tmp min-y)) 4035 (let ((tmp min-y))
4036 (setq min-y max-y) 4036 (setq min-y max-y)
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index 68202440e1d..9b924ba7ad9 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -34,7 +34,7 @@
34 34
35(defun reftex-view-crossref (&optional arg auto-how fail-quietly) 35(defun reftex-view-crossref (&optional arg auto-how fail-quietly)
36 "View cross reference of macro at point. Point must be on the KEY 36 "View cross reference of macro at point. Point must be on the KEY
37argument. When at at `\\ref' macro, show corresponding `\\label' 37argument. When at a `\\ref' macro, show corresponding `\\label'
38definition, also in external documents (`xr'). When on a label, show 38definition, also in external documents (`xr'). When on a label, show
39a locations where KEY is referenced. Subsequent calls find additional 39a locations where KEY is referenced. Subsequent calls find additional
40locations. When on a `\\cite', show the associated `\\bibitem' macro or 40locations. When on a `\\cite', show the associated `\\bibitem' macro or
diff --git a/src/xdisp.c b/src/xdisp.c
index 88353e37925..66e51ac2c32 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -254,7 +254,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
254 still left to right, i.e. the iterator "thinks" the first character 254 still left to right, i.e. the iterator "thinks" the first character
255 is at the leftmost pixel position. The iterator does not know that 255 is at the leftmost pixel position. The iterator does not know that
256 PRODUCE_GLYPHS reverses the order of the glyphs that the iterator 256 PRODUCE_GLYPHS reverses the order of the glyphs that the iterator
257 delivers. This is important when functions from the the move_it_* 257 delivers. This is important when functions from the move_it_*
258 family are used to get to certain screen position or to match 258 family are used to get to certain screen position or to match
259 screen coordinates with buffer coordinates: these functions use the 259 screen coordinates with buffer coordinates: these functions use the
260 iterator geometry, which is left to right even in R2L paragraphs. 260 iterator geometry, which is left to right even in R2L paragraphs.
@@ -26254,7 +26254,7 @@ x_intersect_rectangles (XRectangle *r1, XRectangle *r2, XRectangle *result)
26254 { 26254 {
26255 result->x = right->x; 26255 result->x = right->x;
26256 26256
26257 /* The right end of the intersection is the minimum of the 26257 /* The right end of the intersection is the minimum of
26258 the right ends of left and right. */ 26258 the right ends of left and right. */
26259 result->width = (min (left->x + left->width, right->x + right->width) 26259 result->width = (min (left->x + left->width, right->x + right->width)
26260 - result->x); 26260 - result->x);