aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-11-14 23:55:13 -0800
committerPaul Eggert2011-11-14 23:55:13 -0800
commitda6062e6ea440f6cd68db251390fcb91450103ba (patch)
tree8643e5ab1b5045cfb22e254412632f671658645f
parent672b871d9838335ac12faaf62793a811f1269a66 (diff)
downloademacs-da6062e6ea440f6cd68db251390fcb91450103ba.tar.gz
emacs-da6062e6ea440f6cd68db251390fcb91450103ba.zip
Spelling fixes.
-rw-r--r--admin/charsets/mapfiles/README2
-rw-r--r--admin/charsets/mapfiles/Uni2JIS2
-rw-r--r--doc/lispref/internals.texi2
-rw-r--r--doc/lispref/spellfile2
-rw-r--r--doc/misc/dbus.texi2
-rw-r--r--doc/misc/ede.texi4
-rw-r--r--doc/misc/emacs-mime.texi2
-rw-r--r--doc/misc/gnus.texi2
-rw-r--r--doc/misc/org.texi4
-rw-r--r--etc/ERC-NEWS5
-rw-r--r--etc/NEWS.1-172
-rw-r--r--etc/NEWS.212
-rw-r--r--etc/NEXTSTEP8
-rw-r--r--leim/CXTERM-DIC/README2
-rw-r--r--leim/MISC-DIC/README2
-rw-r--r--leim/quail/cyrillic.el4
-rw-r--r--leim/quail/ipa.el32
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/allout-widgets.el2
-rw-r--r--lisp/calc/calc-units.el36
-rw-r--r--lisp/calendar/todo-mode.el4
-rw-r--r--lisp/cedet/data-debug.el2
-rw-r--r--lisp/cedet/ede/custom.el2
-rw-r--r--lisp/cedet/ede/generic.el4
-rw-r--r--lisp/cedet/ede/project-am.el2
-rw-r--r--lisp/cedet/ede/speedbar.el2
-rw-r--r--lisp/cedet/semantic.el2
-rw-r--r--lisp/cedet/semantic/analyze.el2
-rw-r--r--lisp/cedet/semantic/analyze/complete.el2
-rw-r--r--lisp/cedet/semantic/bovine/c.el2
-rw-r--r--lisp/cedet/semantic/bovine/el.el2
-rw-r--r--lisp/cedet/semantic/edit.el2
-rw-r--r--lisp/cedet/semantic/find.el2
-rw-r--r--lisp/cedet/semantic/lex.el2
-rw-r--r--lisp/cedet/semantic/sb.el2
-rw-r--r--lisp/cedet/semantic/tag-ls.el2
-rw-r--r--lisp/cedet/srecode/compile.el4
-rw-r--r--lisp/cedet/srecode/document.el2
-rw-r--r--lisp/dired.el2
-rw-r--r--lisp/emacs-lisp/testcover.el2
-rw-r--r--lisp/eshell/esh-arg.el2
-rw-r--r--lisp/faces.el2
-rw-r--r--lisp/follow.el6
-rw-r--r--lisp/gnus/ChangeLog22
-rw-r--r--lisp/gnus/gmm-utils.el2
-rw-r--r--lisp/gnus/smime.el2
-rw-r--r--lisp/ibuffer.el2
-rw-r--r--lisp/ido.el4
-rw-r--r--lisp/international/characters.el2
-rw-r--r--lisp/iswitchb.el2
-rw-r--r--lisp/mail/feedmail.el4
-rw-r--r--lisp/mh-e/mh-compat.el2
-rw-r--r--lisp/mh-e/mh-search.el2
-rw-r--r--lisp/net/eudc-hotlist.el2
-rw-r--r--lisp/net/secrets.el2
-rw-r--r--lisp/nxml/nxml-outln.el2
-rw-r--r--lisp/obsolete/pgg-gpg.el2
-rw-r--r--lisp/org/org.el4
-rw-r--r--lisp/progmodes/cc-engine.el2
-rw-r--r--lisp/progmodes/cc-fonts.el2
-rw-r--r--lisp/progmodes/grep.el2
-rw-r--r--lisp/progmodes/idlw-shell.el2
-rw-r--r--lisp/progmodes/idlwave.el2
-rw-r--r--lisp/progmodes/js.el2
-rw-r--r--lisp/progmodes/mixal-mode.el2
-rw-r--r--lisp/progmodes/prolog.el2
-rw-r--r--lisp/progmodes/verilog-mode.el2
-rw-r--r--lisp/speedbar.el8
-rw-r--r--lisp/term/internal.el2
-rw-r--r--lisp/textmodes/flyspell.el2
-rw-r--r--lisp/textmodes/rst.el2
-rw-r--r--lisp/textmodes/table.el2
-rw-r--r--lisp/textmodes/tex-mode.el2
-rw-r--r--lisp/thumbs.el2
-rw-r--r--lisp/url/url-dav.el2
-rw-r--r--lisp/url/url-http.el4
-rw-r--r--lisp/url/url.el4
-rw-r--r--lisp/vc/ediff-ptch.el2
-rw-r--r--lisp/vc/vc-hooks.el6
-rw-r--r--lisp/vc/vc-svn.el2
-rw-r--r--lisp/whitespace.el2
-rw-r--r--lisp/wid-edit.el2
-rw-r--r--lisp/x-dnd.el4
-rw-r--r--src/ChangeLog.72
-rw-r--r--src/buffer.c2
-rw-r--r--src/character.c2
-rw-r--r--src/composite.h2
-rw-r--r--src/font.h2
-rw-r--r--src/fontset.c2
-rw-r--r--src/frame.h2
-rw-r--r--src/gtkutil.c2
-rw-r--r--src/indent.h4
-rw-r--r--src/nsterm.m2
-rw-r--r--src/process.c4
-rw-r--r--src/syssignal.h2
-rw-r--r--src/xdisp.c2
-rw-r--r--src/xfaces.c4
-rw-r--r--src/xselect.c2
-rw-r--r--src/xsettings.c2
-rw-r--r--src/xsmfns.c2
-rw-r--r--test/cedet/semantic-tests.el3
101 files changed, 168 insertions, 172 deletions
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README
index c1804af98cd..e87d548cf31 100644
--- a/admin/charsets/mapfiles/README
+++ b/admin/charsets/mapfiles/README
@@ -6,7 +6,7 @@ See the end of the file for license conditions.
6 6
7 The charset map files directory 7 The charset map files directory
8 8
9This directory contains two kinds of charse map files; verbatim copies 9This directory contains two kinds of charset map files; verbatim copies
10(or their compressed versions) of files freely available in the 10(or their compressed versions) of files freely available in the
11Internet, and newly created files based on freely available 11Internet, and newly created files based on freely available
12information. 12information.
diff --git a/admin/charsets/mapfiles/Uni2JIS b/admin/charsets/mapfiles/Uni2JIS
index b81d10c6ae2..e3c8a25db17 100644
--- a/admin/charsets/mapfiles/Uni2JIS
+++ b/admin/charsets/mapfiles/Uni2JIS
@@ -26,7 +26,7 @@
26# where XXXX is the code point. Including all these 26# where XXXX is the code point. Including all these
27# names in this file increases its size substantially 27# names in this file increases its size substantially
28# and needlessly. The token "<CJK>" is used for the 28# and needlessly. The token "<CJK>" is used for the
29# name of these chracters. If necessary, it can be 29# name of these characters. If necessary, it can be
30# expanded algorithmically by a parser or editor. 30# expanded algorithmically by a parser or editor.
31# 31#
32# The entries are in Unicode order. 32# The entries are in Unicode order.
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index 5cdd983f40d..0168c564e34 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -887,7 +887,7 @@ known to be unchanged since the last complete redisplay.
887@item unchanged_modified 887@item unchanged_modified
888@itemx overlay_unchanged_modified 888@itemx overlay_unchanged_modified
889The values of @code{modiff} and @code{overlay_modiff}, respectively, 889The values of @code{modiff} and @code{overlay_modiff}, respectively,
890after the last compelete redisplay. If their current values match 890after the last complete redisplay. If their current values match
891@code{modiff} or @code{overlay_modiff}, that means 891@code{modiff} or @code{overlay_modiff}, that means
892@code{beg_unchanged} and @code{end_unchanged} contain no useful 892@code{beg_unchanged} and @code{end_unchanged} contain no useful
893information. 893information.
diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile
index b373d00bebf..f8e136f6bd9 100644
--- a/doc/lispref/spellfile
+++ b/doc/lispref/spellfile
@@ -240,7 +240,7 @@ correct'
240counterintuitive 240counterintuitive
241cr 241cr
242creatable 242creatable
243customie 243customize
244deactivate 244deactivate
245deactivated 245deactivated
246deassigns 246deassigns
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index e6fb00d3482..79c7ada3b0b 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -553,7 +553,7 @@ data from a running system:
553@node Methods and Signal 553@node Methods and Signal
554@section Applying the functionality. 554@section Applying the functionality.
555 555
556Methods and signals are the communicatione means to D-Bus. The 556Methods and signals are the communication means to D-Bus. The
557following functions return their specifications. 557following functions return their specifications.
558 558
559@defun dbus-introspect-get-method-names bus service path interface 559@defun dbus-introspect-get-method-names bus service path interface
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index fc85f325a54..55dc7f9a822 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -518,7 +518,7 @@ It would look like this:
518(defun MY-LOAD (dir) 518(defun MY-LOAD (dir)
519 "Load a project of type `cpp-root' for the directory DIR. 519 "Load a project of type `cpp-root' for the directory DIR.
520Return nil if there isn't one." 520Return nil if there isn't one."
521 ;; Use your preferred constructin method here. 521 ;; Use your preferred construction method here.
522 (ede-cpp-root-project "NAME" :file (expand-file-name "FILE" dir) 522 (ede-cpp-root-project "NAME" :file (expand-file-name "FILE" dir)
523 :locate-fcn 'MYFCN) 523 :locate-fcn 'MYFCN)
524 ) 524 )
@@ -3370,7 +3370,7 @@ Type: @code{(or null string)} @*
3370Default Value: @code{nil} 3370Default Value: @code{nil}
3371 3371
3372Emacs regex matching auxiliary source code this target accepts. 3372Emacs regex matching auxiliary source code this target accepts.
3373Aux source are source code files needed for compilation, which are not comiled 3373Aux source are source code files needed for compilation, which are not compiled
3374themselves. 3374themselves.
3375@refill 3375@refill
3376 3376
diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index a9d80d868b6..c44cc1c9b09 100644
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1048,7 +1048,7 @@ occurs.
1048 1048
1049You can customize the value of the @code{mml-enable-flowed} variable 1049You can customize the value of the @code{mml-enable-flowed} variable
1050to enable or disable the flowed encoding usage when newline 1050to enable or disable the flowed encoding usage when newline
1051characteres are present in the buffer. 1051characters are present in the buffer.
1052 1052
1053On decoding flowed text, lines with soft newline characters are filled 1053On decoding flowed text, lines with soft newline characters are filled
1054together and wrapped after the column decided by 1054together and wrapped after the column decided by
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 6d9ffaf17d8..03c457d519a 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -7665,7 +7665,7 @@ has its own article buffer.
7665This implies that it's not possible to have more than one article buffer 7665This implies that it's not possible to have more than one article buffer
7666in a group at a time. But sometimes you might want to display all the 7666in a group at a time. But sometimes you might want to display all the
7667latest emails from your mother, your father, your aunt, your uncle and 7667latest emails from your mother, your father, your aunt, your uncle and
7668your 17 cousins to coordinate the next christmas party. 7668your 17 cousins to coordinate the next Christmas party.
7669 7669
7670That's where sticky articles come in handy. A sticky article buffer 7670That's where sticky articles come in handy. A sticky article buffer
7671basically is a normal article buffer, but it won't be reused when you 7671basically is a normal article buffer, but it won't be reused when you
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 9d164999b7c..f690576417a 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -36,7 +36,7 @@
36 36
37@c orgkey{key} A key item 37@c orgkey{key} A key item
38@c orgcmd{key,cmd} Key with command name 38@c orgcmd{key,cmd} Key with command name
39@c xorgcmd{key,cmmand} Key with command name as @itemx 39@c xorgcmd{key,command} Key with command name as @itemx
40@c orgcmdnki{key,cmd} Like orgcmd, but do not index the key 40@c orgcmdnki{key,cmd} Like orgcmd, but do not index the key
41@c orgcmdtkc{text,key,cmd} Like orgcmd,special text instead of key 41@c orgcmdtkc{text,key,cmd} Like orgcmd,special text instead of key
42@c orgcmdkkc{key1,key2,cmd} Two keys with one command name, use "or" 42@c orgcmdkkc{key1,key2,cmd} Two keys with one command name, use "or"
@@ -9421,7 +9421,7 @@ the web, while the XOXO format provides a solid base for exchange with a
9421broad range of other applications. @LaTeX{} export lets you use Org-mode and 9421broad range of other applications. @LaTeX{} export lets you use Org-mode and
9422its structured editing functions to easily create @LaTeX{} files. DocBook 9422its structured editing functions to easily create @LaTeX{} files. DocBook
9423export makes it possible to convert Org files to many other formats using 9423export makes it possible to convert Org files to many other formats using
9424DocBook tools. OpenDocumentText export allows seamless colloboration across 9424DocBook tools. OpenDocumentText export allows seamless collaboration across
9425organizational boundaries. For project management you can create gantt and 9425organizational boundaries. For project management you can create gantt and
9426resource charts by using TaskJuggler export. To incorporate entries with 9426resource charts by using TaskJuggler export. To incorporate entries with
9427associated times like deadlines or appointments into a desktop calendar 9427associated times like deadlines or appointments into a desktop calendar
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 17bf4fc3877..04084b58488 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -852,7 +852,7 @@ Only the macros in cl-macs.el are used.
852** If possible, re-use channel buffers when reconnecting to a server. 852** If possible, re-use channel buffers when reconnecting to a server.
853 853
854** Text in ERC buffers is now read-only by default. 854** Text in ERC buffers is now read-only by default.
855To get the previous behavior, 855To get the previous behavior,
856 856
857** Changes and additions to modules 857** Changes and additions to modules
858 858
@@ -1280,7 +1280,7 @@ in XEmacs.
1280 the variable `erc-modules' and define once and for all which 1280 the variable `erc-modules' and define once and for all which
1281 extension modules you want to use. This unfortunately may require 1281 extension modules you want to use. This unfortunately may require
1282 you to change your current erc initialisation code a bit, if you 1282 you to change your current erc initialisation code a bit, if you
1283 have some existing customsations. On the other hand, this change 1283 have some existing customizations. On the other hand, this change
1284 makes the configuration of extension modules a lot easier for new 1284 makes the configuration of extension modules a lot easier for new
1285 users. In theory, you should be able to configure all aspects of 1285 users. In theory, you should be able to configure all aspects of
1286 ERC by using the customize interface, you should no longer really 1286 ERC by using the customize interface, you should no longer really
@@ -1342,4 +1342,3 @@ GNU General Public License for more details.
1342 1342
1343You should have received a copy of the GNU General Public License 1343You should have received a copy of the GNU General Public License
1344along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 1344along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
1345
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index d835cd6f33e..2ffd5e1e15b 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1090,7 +1090,7 @@ the messages should have.
1090* Interface to MH mail system. 1090* Interface to MH mail system.
1091 1091
1092mh-e is a front end for GNU emacs and the MH mail system. It 1092mh-e is a front end for GNU emacs and the MH mail system. It
1093provides a friendly and convient interface to the MH commands. 1093provides a friendly and convenient interface to the MH commands.
1094 1094
1095To read mail, invoke mh-rmail. This will inc new mail and display the 1095To read mail, invoke mh-rmail. This will inc new mail and display the
1096scan listing on the screen. To see a summary of the mh-e commands, 1096scan listing on the screen. To see a summary of the mh-e commands,
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 47f61a13e3b..ca5f9fb9403 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -850,7 +850,7 @@ default).
850*** If Emacs was invoked with the `-q' or `--no-init-file' options, it 850*** If Emacs was invoked with the `-q' or `--no-init-file' options, it
851does not allow you to save customizations in your `~/.emacs' init 851does not allow you to save customizations in your `~/.emacs' init
852file. This is because saving customizations from such a session would 852file. This is because saving customizations from such a session would
853wipe out all the other customizationss you might have on your init 853wipe out all the other customizations you might have on your init
854file. 854file.
855 855
856** If Emacs was invoked with the `-q' or `--no-init-file' options, it 856** If Emacs was invoked with the `-q' or `--no-init-file' options, it
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP
index fcde9727dff..4aa1dca93f2 100644
--- a/etc/NEXTSTEP
+++ b/etc/NEXTSTEP
@@ -38,7 +38,7 @@ meantime.
38Release History 38Release History
39--------------- 39---------------
40 40
411990-1992 1.0-3.0 (?) Michael Brouwer's socket/terminal communication 411990-1992 1.0-3.0 (?) Michael Brouwer's socket/terminal communication
42 based version (GUI ran as a separate process.) 42 based version (GUI ran as a separate process.)
43 43
441993/10/25 3.0.1 Last (?) release of Brouwer version. Supports 441993/10/25 3.0.1 Last (?) release of Brouwer version. Supports
@@ -126,7 +126,7 @@ Release History
126 rendering for synthetic italic fonts. Further 126 rendering for synthetic italic fonts. Further
127 improved menu parsing. Use system highlight 127 improved menu parsing. Use system highlight
128 color. Added previous- and next-mark history 128 color. Added previous- and next-mark history
129 navigation commmands bound to M-p,M-n. 129 navigation commands bound to M-p,M-n.
130 Miscellaneous bug fixes. 130 Miscellaneous bug fixes.
131 131
1322005/08/04 8.0-rc5 All internal string handling changed to UTF-8. 1322005/08/04 8.0-rc5 All internal string handling changed to UTF-8.
@@ -146,7 +146,7 @@ Release History
146 handling now added. Transparency (e.g., M-x 146 handling now added. Transparency (e.g., M-x
147 set-background-color ARGB88FFFFFF) improved: 147 set-background-color ARGB88FFFFFF) improved:
148 only the background is made transparent. 148 only the background is made transparent.
149 Cursor drawing glitches fixed. Preferences 149 Cursor drawing glitches fixed. Preferences
150 handling improved. Fixed some portability 150 handling improved. Fixed some portability
151 problems on Tiger and Puma. 151 problems on Tiger and Puma.
152 152
@@ -185,7 +185,7 @@ Release History
185 rendering, pasting, Color panel. Added function 185 rendering, pasting, Color panel. Added function
186 ns-set-background-alpha to work around 186 ns-set-background-alpha to work around
187 inability to customize with numeric colors. 187 inability to customize with numeric colors.
188 188
1892006/12/24 9.0-rc1 Reworked font handling and text rendering to 1892006/12/24 9.0-rc1 Reworked font handling and text rendering to
190 use Kenichi Handa's new font back-end system. 190 use Kenichi Handa's new font back-end system.
191 Font sets are now supported and automatically 191 Font sets are now supported and automatically
diff --git a/leim/CXTERM-DIC/README b/leim/CXTERM-DIC/README
index d8731740a79..34853091cf5 100644
--- a/leim/CXTERM-DIC/README
+++ b/leim/CXTERM-DIC/README
@@ -1,5 +1,5 @@
1All *.tit files in this directory are dictionary files to use with 1All *.tit files in this directory are dictionary files to use with
2the program cxterm. Their source and copyright status are categorised 2the program cxterm. Their source and copyright status are categorized
3into these four groups. 3into these four groups.
4 4
5(1) QJ-b5.tit (renamed from .../cxterm/dict/big5/QJ.tit) 5(1) QJ-b5.tit (renamed from .../cxterm/dict/big5/QJ.tit)
diff --git a/leim/MISC-DIC/README b/leim/MISC-DIC/README
index 95efbd4d27b..cea30b350fe 100644
--- a/leim/MISC-DIC/README
+++ b/leim/MISC-DIC/README
@@ -1,5 +1,5 @@
1The source and copyright status of dictionary files in this directory 1The source and copyright status of dictionary files in this directory
2are categorised into these three groups. 2are categorized into these three groups.
3 3
4(1) cangjie-table.b5 4(1) cangjie-table.b5
5 cangjie-table.cns 5 cangjie-table.cns
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 824048534e0..88be0a3b7d0 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -42,7 +42,7 @@
42;; in typewriters for ages but it has been superseded on desktops by 42;; in typewriters for ages but it has been superseded on desktops by
43;; a variation of this layout, implemented in M$ Windows software. 43;; a variation of this layout, implemented in M$ Windows software.
44;; The Windows layout is greatly preferred because of the comma and 44;; The Windows layout is greatly preferred because of the comma and
45;; period being placed more conviniently and, of course, because of 45;; period being placed more conveniently and, of course, because of
46;; the popularity of Windows software. This layout is a common option 46;; the popularity of Windows software. This layout is a common option
47;; in X Windows and console layouts for GNU/Linux. [See 47;; in X Windows and console layouts for GNU/Linux. [See
48;; `russian-computer' below.] 48;; `russian-computer' below.]
@@ -163,7 +163,7 @@
163;; commented out because quail-update-leim-list-file ignores 163;; commented out because quail-update-leim-list-file ignores
164;; commented-out lines. 164;; commented-out lines.
165(if nil 165(if nil
166 (quail-define-package 166 (quail-define-package
167 "cyrillic-jcuken" "Russian" ",L69(B" nil 167 "cyrillic-jcuken" "Russian" ",L69(B" nil
168 ",L9FC:5=(B Russian typewriter layout (ISO 8859-5 encoding).")) 168 ",L9FC:5=(B Russian typewriter layout (ISO 8859-5 encoding)."))
169 169
diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el
index a41cf53c377..559841e8905 100644
--- a/leim/quail/ipa.el
+++ b/leim/quail/ipa.el
@@ -149,8 +149,8 @@ incorrectly, as separate from the modified glyphs.")
149 ("P" "ɸ") ;; Voiceless bilabial fricative U+0278 149 ("P" "ɸ") ;; Voiceless bilabial fricative U+0278
150 ("Q" "ɣ") ;; Voiced velar fricative U+0263 150 ("Q" "ɣ") ;; Voiced velar fricative U+0263
151 ("R" ["ʀ" ;; Alveolar trill U+0280 151 ("R" ["ʀ" ;; Alveolar trill U+0280
152 "ɚ"]) ;; Rhotacised schwa U+025A 152 "ɚ"]) ;; Rhotacized schwa U+025A
153 ("@<r>" "ɚ") ;; Mid central rhotacised vowel U+025A 153 ("@<r>" "ɚ") ;; Mid central rhotacized vowel U+025A
154 ("S" "ʃ") ;; Voiceless postalveolar fricative U+0283 154 ("S" "ʃ") ;; Voiceless postalveolar fricative U+0283
155 ("tS" ["ʧ" ;; Voiceless postalveolar affricate U+02A7 155 ("tS" ["ʧ" ;; Voiceless postalveolar affricate U+02A7
156 "tʃ" ;; U+0074 U+0283 156 "tʃ" ;; U+0074 U+0283
@@ -176,13 +176,13 @@ incorrectly, as separate from the modified glyphs.")
176 ("." "̣") ;; +Retroflex modifier U+0323 176 ("." "̣") ;; +Retroflex modifier U+0323
177 ("`" "ʼ") ;; +Ejective modifier U+02BC 177 ("`" "ʼ") ;; +Ejective modifier U+02BC
178 ("[" "̪") ;; +Dental modifier U+032A 178 ("[" "̪") ;; +Dental modifier U+032A
179 (";" "ʲ") ;; +Palatalised modifier U+02B2 179 (";" "ʲ") ;; +Palatalized modifier U+02B2
180 ("<H>" "̴") ;; +Pharyngealised modifier U+0334 180 ("<H>" "̴") ;; +Pharyngealized modifier U+0334
181 ("<h>" "ʰ") ;; +Aspirated modifier U+02B0 181 ("<h>" "ʰ") ;; +Aspirated modifier U+02B0
182 ("<o>" ["̥" ;; +Voiceless modifier U+0325 182 ("<o>" ["̥" ;; +Voiceless modifier U+0325
183 "˚"]) ;; +Unexploded modifier U+02DA 183 "˚"]) ;; +Unexploded modifier U+02DA
184 ("<r>" "ʳ") ;; +Rhotacised modifier U+02B3 184 ("<r>" "ʳ") ;; +Rhotacized modifier U+02B3
185 ("<w>" "ʷ") ;; +Labialised modifier U+02B7 185 ("<w>" "ʷ") ;; +Labialized modifier U+02B7
186 ("<?>" "ʱ") ;; +Murmured modififer U+02B1 186 ("<?>" "ʱ") ;; +Murmured modififer U+02B1
187 187
188 ("b<trl>" "ʙ") ;; Bilabial trill U+0299 188 ("b<trl>" "ʙ") ;; Bilabial trill U+0299
@@ -237,7 +237,7 @@ incorrectly, as separate from the modified glyphs.")
237 ("u\"" "ʉ") ;; High central rounded vowel U+0289 237 ("u\"" "ʉ") ;; High central rounded vowel U+0289
238 ("@<umd>" "ɘ") ;; Upper-mid central unrounded vowel U+0258 238 ("@<umd>" "ɘ") ;; Upper-mid central unrounded vowel U+0258
239 239
240 ("R<umd>" "ɝ") ;; Upper-mid central rhotacised vowel U+025D 240 ("R<umd>" "ɝ") ;; Upper-mid central rhotacized vowel U+025D
241 241
242 ("@." "ɵ") ;; Mid central rounded vowel U+0275 242 ("@." "ɵ") ;; Mid central rounded vowel U+0275
243 ("V\"" "ɜ") ;; Lower-mid central unrounded vowel U+025C 243 ("V\"" "ɜ") ;; Lower-mid central unrounded vowel U+025C
@@ -416,7 +416,7 @@ displays them, incorrectly, as separate from the modified glyphs.")
416 (":\\" "ˑ") ;; Half-long U+02D1 416 (":\\" "ˑ") ;; Half-long U+02D1
417 ("@" "ə") ;; Schwa U+0259 417 ("@" "ə") ;; Schwa U+0259
418 ("@\\" "ɘ") ;; Close-mid central unrounded vowel U+0258 418 ("@\\" "ɘ") ;; Close-mid central unrounded vowel U+0258
419 ("@`" "ɚ") ;; Rhotacised schwa U+025A 419 ("@`" "ɚ") ;; Rhotacized schwa U+025A
420 ("{" "æ") ;; Near-open front unrounded vowel U+00E6 420 ("{" "æ") ;; Near-open front unrounded vowel U+00E6
421 ("}" "ʉ") ;; Close central rounded vowel U+0289 421 ("}" "ʉ") ;; Close central rounded vowel U+0289
422 ("1" "ɨ") ;; Close central unrounded vowel U+0268 422 ("1" "ɨ") ;; Close central unrounded vowel U+0268
@@ -424,7 +424,7 @@ displays them, incorrectly, as separate from the modified glyphs.")
424 ("3" "ɜ") ;; Open-mid central unrounded vowel U+025C 424 ("3" "ɜ") ;; Open-mid central unrounded vowel U+025C
425 ("3\\" "ɞ") ;; Open-mid central rounded vowel U+025E 425 ("3\\" "ɞ") ;; Open-mid central rounded vowel U+025E
426 ("4" "ɾ") ;; Alveolar flap U+027E 426 ("4" "ɾ") ;; Alveolar flap U+027E
427 ("5" "ɫ") ;; Velarised alveolar lateral approximant U+026B 427 ("5" "ɫ") ;; Velarized alveolar lateral approximant U+026B
428 ("6" "ɐ") ;; Near-open central vowel U+0250 428 ("6" "ɐ") ;; Near-open central vowel U+0250
429 ("7" "ɤ") ;; Close-mid back unrounded vowel U+0264 429 ("7" "ɤ") ;; Close-mid back unrounded vowel U+0264
430 ("8" "ɵ") ;; Close-mid central rounded vowel U+0275 430 ("8" "ɵ") ;; Close-mid central rounded vowel U+0275
@@ -459,7 +459,7 @@ displays them, incorrectly, as separate from the modified glyphs.")
459 ("_=" "̩") ;; Syllabic U+0329 459 ("_=" "̩") ;; Syllabic U+0329
460 ("=" "̩") ;; Syllabic U+0329 460 ("=" "̩") ;; Syllabic U+0329
461 ("_>" "ʼ") ;; Ejective U+02BC 461 ("_>" "ʼ") ;; Ejective U+02BC
462 ("_?\\" "ˤ") ;; Pharyngealised U+02E4 462 ("_?\\" "ˤ") ;; Pharyngealized U+02E4
463 ("_\\" "ˆ") ;; Falling Tone U+02C6 463 ("_\\" "ˆ") ;; Falling Tone U+02C6
464 ("_^" "̯") ;; Non-syllabic U+032F 464 ("_^" "̯") ;; Non-syllabic U+032F
465 ("_}" "̚") ;; No audible release U+031A 465 ("_}" "̚") ;; No audible release U+031A
@@ -473,17 +473,17 @@ displays them, incorrectly, as separate from the modified glyphs.")
473 ;; _B_L omitted, no Unicode code point for "low rising tone." 473 ;; _B_L omitted, no Unicode code point for "low rising tone."
474 ("_c" "̜") ;; Less rounded U+031C 474 ("_c" "̜") ;; Less rounded U+031C
475 ("_d" "̪") ;; Dental U+032A 475 ("_d" "̪") ;; Dental U+032A
476 ("_e" "̴") ;; Velarised or pharyngeal U+0334 476 ("_e" "̴") ;; Velarized or pharyngeal U+0334
477 477
478 ("<F>" "↙") ;; Global fall; SOUTH EAST ARROW; may be a bit smaller than 478 ("<F>" "↙") ;; Global fall; SOUTH EAST ARROW; may be a bit smaller than
479 ;; intended. 479 ;; intended.
480 ("_F" "̂") ;; Falling tone U+0302 480 ("_F" "̂") ;; Falling tone U+0302
481 ("_G" "ˠ") ;; Velarised U+02E0 481 ("_G" "ˠ") ;; Velarized U+02E0
482 ("_H" "́") ;; High tone U+0301 482 ("_H" "́") ;; High tone U+0301
483 ;; "_H_T omitted, no Unicode code point for "high rising tone" 483 ;; "_H_T omitted, no Unicode code point for "high rising tone"
484 ("_h" "ʰ") ;; Aspirated U+02B0 484 ("_h" "ʰ") ;; Aspirated U+02B0
485 ("_j" "ʲ") ;; Palatalised U+02B2 485 ("_j" "ʲ") ;; Palatalized U+02B2
486 ("'" "ʲ") ;; Palatalised U+02B2 486 ("'" "ʲ") ;; Palatalized U+02B2
487 ("_k" "̰") ;; Creaky voice U+0330 487 ("_k" "̰") ;; Creaky voice U+0330
488 ("_L" "̀") ;; Low tone U+0300 488 ("_L" "̀") ;; Low tone U+0300
489 ("_l" "ˡ") ;; Lateral release U+02E1 489 ("_l" "ˡ") ;; Lateral release U+02E1
@@ -501,9 +501,9 @@ displays them, incorrectly, as separate from the modified glyphs.")
501 ("_T" "̋") ;; Extra high tone U+030B 501 ("_T" "̋") ;; Extra high tone U+030B
502 ("_t" "̤") ;; Breathy voice U+0324 502 ("_t" "̤") ;; Breathy voice U+0324
503 ("_v" "̬") ;; Voiced U+032C 503 ("_v" "̬") ;; Voiced U+032C
504 ("_w" "ʷ") ;; Labialised U+02B7 504 ("_w" "ʷ") ;; Labialized U+02B7
505 ("_X" "̆") ;; Extra-short U+0306 505 ("_X" "̆") ;; Extra-short U+0306
506 ("_x" "̽")) ;; Mid-centralised U+033D 506 ("_x" "̽")) ;; Mid-centralized U+033D
507 507
508;; Putting in place rules for the implosives like for the others above 508;; Putting in place rules for the implosives like for the others above
509;; breaks the "_<diacritic>" rules for b, d, g, G and J a little--you need 509;; breaks the "_<diacritic>" rules for b, d, g, G and J a little--you need
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d4f228dbdd..95834e81a8d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3535,7 +3535,7 @@
3535 Also clean up the code slightly. 3535 Also clean up the code slightly.
3536 3536
3537 * progmodes/grep.el (rgrep): Don't bind `process-connection-type', 3537 * progmodes/grep.el (rgrep): Don't bind `process-connection-type',
3538 because that makes the colours go away. 3538 because that makes the colors go away.
3539 3539
3540 * mail/sendmail.el (send-mail-function): Change the default to 3540 * mail/sendmail.el (send-mail-function): Change the default to
3541 `sendmail-query-once'. 3541 `sendmail-query-once'.
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index c165886aeed..da21244b7b1 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -1245,7 +1245,7 @@ Optional FROM-DEPTH is for internal use."
1245(defun allout-range-overlaps (from to ranges) 1245(defun allout-range-overlaps (from to ranges)
1246 "Return a pair indicating overlap of FROM and TO subtree range in RANGES. 1246 "Return a pair indicating overlap of FROM and TO subtree range in RANGES.
1247 1247
1248First element of result indicates whether candadate range FROM, TO 1248First element of result indicates whether candidate range FROM, TO
1249overlapped any of the existing ranges. 1249overlapped any of the existing ranges.
1250 1250
1251Second element of result is a new version of RANGES incorporating the 1251Second element of result is a new version of RANGES incorporating the
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 43cb5828e85..86e8cbbc73a 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1598,7 +1598,7 @@ In symbolic mode, return the list (^ a b)."
1598 (or (math-lessp acoeff bcoeff) 1598 (or (math-lessp acoeff bcoeff)
1599 (math-equal acoeff bcoeff))) 1599 (math-equal acoeff bcoeff)))
1600 (calc-record-why "*Improper coefficients" nil) 1600 (calc-record-why "*Improper coefficients" nil)
1601 (math-mul 1601 (math-mul
1602 (if (equal aunit '(var dB var-dB)) 1602 (if (equal aunit '(var dB var-dB))
1603 (let ((coef (if power 10 20))) 1603 (let ((coef (if power 10 20)))
1604 (math-mul coef 1604 (math-mul coef
@@ -1681,7 +1681,7 @@ In symbolic mode, return the list (^ a b)."
1681 (math-simplify 1681 (math-simplify
1682 (math-mul 1682 (math-mul
1683 (math-add 1683 (math-add
1684 coef 1684 coef
1685 (math-mul (if power 10 20) 1685 (math-mul (if power 10 20)
1686 (math-conditional-apply 'calcFunc-log10 number))) 1686 (math-conditional-apply 'calcFunc-log10 number)))
1687 units))) 1687 units)))
@@ -1689,7 +1689,7 @@ In symbolic mode, return the list (^ a b)."
1689 (math-simplify 1689 (math-simplify
1690 (math-mul 1690 (math-mul
1691 (math-add 1691 (math-add
1692 coef 1692 coef
1693 (math-div (math-conditional-apply 'calcFunc-ln number) (if power 2 1))) 1693 (math-div (math-conditional-apply 'calcFunc-ln number) (if power 2 1)))
1694 units)))) 1694 units))))
1695 (calc-record-why "*Improper units" nil)))) 1695 (calc-record-why "*Improper units" nil))))
@@ -1707,7 +1707,7 @@ In symbolic mode, return the list (^ a b)."
1707 (math-simplify 1707 (math-simplify
1708 (math-mul 1708 (math-mul
1709 (math-sub 1709 (math-sub
1710 coef 1710 coef
1711 (math-mul (if power 10 20) 1711 (math-mul (if power 10 20)
1712 (math-conditional-apply 'calcFunc-log10 b))) 1712 (math-conditional-apply 'calcFunc-log10 b)))
1713 units))) 1713 units)))
@@ -1715,7 +1715,7 @@ In symbolic mode, return the list (^ a b)."
1715 (math-simplify 1715 (math-simplify
1716 (math-mul 1716 (math-mul
1717 (math-sub 1717 (math-sub
1718 coef 1718 coef
1719 (math-div (math-conditional-apply 'calcFunc-ln b) (if power 2 1))) 1719 (math-div (math-conditional-apply 'calcFunc-ln b) (if power 2 1)))
1720 units))))))))) 1720 units)))))))))
1721 1721
@@ -1762,17 +1762,17 @@ In symbolic mode, return the list (^ a b)."
1762 (coeff (math-simplify (math-div val units)))) 1762 (coeff (math-simplify (math-div val units))))
1763 (math-mul 1763 (math-mul
1764 (if (equal lunit '(var dB var-dB)) 1764 (if (equal lunit '(var dB var-dB))
1765 (math-mul 1765 (math-mul
1766 ref 1766 ref
1767 (math-conditional-pow 1767 (math-conditional-pow
1768 10 1768 10
1769 (math-div 1769 (math-div
1770 coeff 1770 coeff
1771 (if power 10 20)))) 1771 (if power 10 20))))
1772 (math-mul 1772 (math-mul
1773 ref 1773 ref
1774 (math-conditional-apply 'calcFunc-exp 1774 (math-conditional-apply 'calcFunc-exp
1775 (if power 1775 (if power
1776 (math-mul 2 coeff) 1776 (math-mul 2 coeff)
1777 coeff)))) 1777 coeff))))
1778 runits))))) 1778 runits)))))
@@ -1869,7 +1869,7 @@ In symbolic mode, return the list (^ a b)."
1869 (let* ((n (math-round num)) 1869 (let* ((n (math-round num))
1870 (diff (math-abs 1870 (diff (math-abs
1871 (math-sub num n)))) 1871 (math-sub num n))))
1872 (if (< (math-compare diff 1872 (if (< (math-compare diff
1873 (math-div (math-read-expr calc-note-threshold) 100)) 0) 1873 (math-div (math-read-expr calc-note-threshold) 100)) 0)
1874 n 1874 n
1875 num))) 1875 num)))
@@ -1927,10 +1927,10 @@ If non-nil, return a list consisting of the note and the cents coefficient."
1927 (assoc (nth 1 note) math-notes) 1927 (assoc (nth 1 note) math-notes)
1928 (integerp (nth 2 note)) 1928 (integerp (nth 2 note))
1929 (setq rnote note) 1929 (setq rnote note)
1930 (or 1930 (or
1931 (not cents) 1931 (not cents)
1932 (Math-numberp (setq rcents 1932 (Math-numberp (setq rcents
1933 (math-simplify 1933 (math-simplify
1934 (math-div cents '(var cents var-cents))))))) 1934 (math-div cents '(var cents var-cents)))))))
1935 (list rnote rcents)) 1935 (list rnote rcents))
1936 ((and ;; CENTS is a note, NOTE is cents. 1936 ((and ;; CENTS is a note, NOTE is cents.
@@ -1938,10 +1938,10 @@ If non-nil, return a list consisting of the note and the cents coefficient."
1938 (assoc (nth 1 cents) math-notes) 1938 (assoc (nth 1 cents) math-notes)
1939 (integerp (nth 2 cents)) 1939 (integerp (nth 2 cents))
1940 (setq rnote cents) 1940 (setq rnote cents)
1941 (or 1941 (or
1942 (not note) 1942 (not note)
1943 (Math-numberp (setq rcents 1943 (Math-numberp (setq rcents
1944 (math-simplify 1944 (math-simplify
1945 (math-div note '(var cents var-cents))))))) 1945 (math-div note '(var cents var-cents)))))))
1946 (list rnote rcents))))) 1946 (list rnote rcents)))))
1947 1947
@@ -1972,7 +1972,7 @@ If non-nil, return a list consisting of the note and the cents coefficient."
1972 "Return the scientific pitch notation corresponding to midi number MIDI." 1972 "Return the scientific pitch notation corresponding to midi number MIDI."
1973 (let (midin cents) 1973 (let (midin cents)
1974 (if (math-integerp midi) 1974 (if (math-integerp midi)
1975 (setq midin midi 1975 (setq midin midi
1976 cents nil) 1976 cents nil)
1977 (setq midin (math-floor midi) 1977 (setq midin (math-floor midi)
1978 cents (math-mul 100 (math-sub midi midin)))) 1978 cents (math-mul 100 (math-sub midi midin))))
@@ -1989,7 +1989,7 @@ If non-nil, return a list consisting of the note and the cents coefficient."
1989 (n (math-sub (car nr) 1)) 1989 (n (math-sub (car nr) 1))
1990 (note (car (rassoc (cdr nr) math-notes)))) 1990 (note (car (rassoc (cdr nr) math-notes))))
1991 (if cents 1991 (if cents
1992 (list '+ (list 'calcFunc-subscr note n) 1992 (list '+ (list 'calcFunc-subscr note n)
1993 (list '* cents '(var cents var-cents))) 1993 (list '* cents '(var cents var-cents)))
1994 (list 'calcFunc-subscr note n))))) 1994 (list 'calcFunc-subscr note n)))))
1995 1995
@@ -2005,7 +2005,7 @@ If non-nil, return a list consisting of the note and the cents coefficient."
2005 440 2005 440
2006 (math-pow 2006 (math-pow
2007 2 2007 2
2008 (math-div 2008 (math-div
2009 (math-sub 2009 (math-sub
2010 midi 2010 midi
2011 69) 2011 69)
@@ -2018,7 +2018,7 @@ If non-nil, return a list consisting of the note and the cents coefficient."
2018 2018
2019(defun calcFunc-spn (expr) 2019(defun calcFunc-spn (expr)
2020 "Return EXPR written as scientific pitch notation + cents." 2020 "Return EXPR written as scientific pitch notation + cents."
2021 ;; Get the coeffecient of Hz 2021 ;; Get the coefficient of Hz
2022 (let (note) 2022 (let (note)
2023 (cond 2023 (cond
2024 ((setq note (math-freqp expr)) 2024 ((setq note (math-freqp expr))
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 4c59e2634ae..b0c7f125982 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -31,7 +31,7 @@
31;; TODO is a major mode for EMACS which offers functionality to 31;; TODO is a major mode for EMACS which offers functionality to
32;; treat most lines in one buffer as a list of items one has to 32;; treat most lines in one buffer as a list of items one has to
33;; do. There are facilities to add new items, which are 33;; do. There are facilities to add new items, which are
34;; categorised, to edit or even delete items from the buffer. 34;; categorized, to edit or even delete items from the buffer.
35;; The buffer contents are currently compatible with the diary, 35;; The buffer contents are currently compatible with the diary,
36;; so that the list of todo-items will show up in the FANCY diary 36;; so that the list of todo-items will show up in the FANCY diary
37;; mode. 37;; mode.
@@ -536,7 +536,7 @@ Use `todo-categories' instead.")
536 (unless (zerop (buffer-size buf)) 536 (unless (zerop (buffer-size buf))
537 (and (null todo-categories) 537 (and (null todo-categories)
538 (null todo-cats) 538 (null todo-cats)
539 (error "Error in %s: File is non-empty but contains no category" 539 (error "Error in %s: File is non-empty but contains no category"
540 todo-file-do))) 540 todo-file-do)))
541 (unless cat (setq cat (read-from-minibuffer prompt))) 541 (unless cat (setq cat (read-from-minibuffer prompt)))
542 (with-current-buffer buf 542 (with-current-buffer buf
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index cd910f35a6a..e50e9993af0 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -955,7 +955,7 @@ we move to."
955 955
956(defun data-debug-line-expandable-p () 956(defun data-debug-line-expandable-p ()
957 "Return non-nil if the current line is expandable. 957 "Return non-nil if the current line is expandable.
958Lines that are not expandable are assumed to not be contractable." 958Lines that are not expandable are assumed to not be contractible."
959 (not (get-text-property (point) 'ddebug-noexpand))) 959 (not (get-text-property (point) 'ddebug-noexpand)))
960 960
961(defun data-debug-expand-current-line () 961(defun data-debug-expand-current-line ()
diff --git a/lisp/cedet/ede/custom.el b/lisp/cedet/ede/custom.el
index fed1a1b2155..ac0907e8e7f 100644
--- a/lisp/cedet/ede/custom.el
+++ b/lisp/cedet/ede/custom.el
@@ -40,7 +40,7 @@
40 40
41;;; Customization Commands 41;;; Customization Commands
42;; 42;;
43;; These commands initialize custoization of EDE control objects. 43;; These commands initialize customization of EDE control objects.
44 44
45;;;###autoload 45;;;###autoload
46(defun ede-customize-project () 46(defun ede-customize-project ()
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 5ed83b39163..8cf82d9f29c 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -46,7 +46,7 @@
46;; Since these projects are all so increadibly generic, a user will 46;; Since these projects are all so increadibly generic, a user will
47;; need to configure some aspects of the project by hand. In order to 47;; need to configure some aspects of the project by hand. In order to
48;; enable this without configuring the project objects directly (which 48;; enable this without configuring the project objects directly (which
49;; are auto-generated) a special ede-generic-confg object is defined to 49;; are auto-generated) a special ede-generic-config object is defined to
50;; hold the basics. Generic projects will identify and use these 50;; hold the basics. Generic projects will identify and use these
51;; config files. 51;; config files.
52;; 52;;
@@ -105,7 +105,7 @@
105 :group (default build) 105 :group (default build)
106 :documentation 106 :documentation
107 "Command used for debugging this project.") 107 "Command used for debugging this project.")
108 ;; C target customixations 108 ;; C target customizations
109 (c-include-path :initarg :c-include-path 109 (c-include-path :initarg :c-include-path
110 :initform nil 110 :initform nil
111 :type list 111 :type list
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index c1e656e8459..216138d0ba8 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -428,7 +428,7 @@ Argument COMMAND is the command to use for compiling the target."
428If a given set of projects has already been loaded, then do nothing 428If a given set of projects has already been loaded, then do nothing
429but return the project for the directory given. 429but return the project for the directory given.
430Optional ROOTPROJ is the root EDE project." 430Optional ROOTPROJ is the root EDE project."
431 (let* ((ede-constructiong t) 431 (let* ((ede-constructing t)
432 (amo (object-assoc (expand-file-name "Makefile.am" directory) 432 (amo (object-assoc (expand-file-name "Makefile.am" directory)
433 'file ede-projects))) 433 'file ede-projects)))
434 (when (not amo) 434 (when (not amo)
diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el
index 252ce47df67..fdf61b51b68 100644
--- a/lisp/cedet/ede/speedbar.el
+++ b/lisp/cedet/ede/speedbar.el
@@ -297,7 +297,7 @@ INDENT is the current indentation level."
297 (let ((file (ede-find-nearest-file-line))) 297 (let ((file (ede-find-nearest-file-line)))
298 (speedbar-find-file-in-frame file) 298 (speedbar-find-file-in-frame file)
299 (save-excursion (speedbar-stealthy-updates)) 299 (save-excursion (speedbar-stealthy-updates))
300 ;; Reset the timer with a new timeout when cliking a file 300 ;; Reset the timer with a new timeout when clicking a file
301 ;; in case the user was navigating directories, we can cancel 301 ;; in case the user was navigating directories, we can cancel
302 ;; that other timer. 302 ;; that other timer.
303; (speedbar-set-timer speedbar-update-speed) 303; (speedbar-set-timer speedbar-update-speed)
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 34d886b6807..639b46ad2cf 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1015,7 +1015,7 @@ Throw away all the old tags, and recreate the tag database."
1015 :visible semantic-mode 1015 :visible semantic-mode
1016 :button (:toggle . global-semanticdb-minor-mode)))) 1016 :button (:toggle . global-semanticdb-minor-mode))))
1017 1017
1018;; The `semantic-mode' command, in conjuction with the 1018;; The `semantic-mode' command, in conjunction with the
1019;; `semantic-default-submodes' variable, toggles Semantic's various 1019;; `semantic-default-submodes' variable, toggles Semantic's various
1020;; auxiliary minor modes. 1020;; auxiliary minor modes.
1021 1021
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 636ac30b166..525086022d3 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -106,7 +106,7 @@ called in a dereference sequence.")
106 (prefixclass :initarg :prefixclass 106 (prefixclass :initarg :prefixclass
107 :type list 107 :type list
108 :documentation "Tag classes expected at this context. 108 :documentation "Tag classes expected at this context.
109These are clases for tags, such as 'function, or 'variable.") 109These are classes for tags, such as 'function, or 'variable.")
110 (prefixtypes :initarg :prefixtypes 110 (prefixtypes :initarg :prefixtypes
111 :type list 111 :type list
112 :documentation "List of tags defining types for :prefix. 112 :documentation "List of tags defining types for :prefix.
diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el
index ae993a743d6..89937f45ec8 100644
--- a/lisp/cedet/semantic/analyze/complete.el
+++ b/lisp/cedet/semantic/analyze/complete.el
@@ -188,7 +188,7 @@ FLAGS can be any number of:
188 ;; Reset c. 188 ;; Reset c.
189 (setq c nil) 189 (setq c nil)
190 190
191 ;; Loop over all the found matches, and catagorize them 191 ;; Loop over all the found matches, and categorize them
192 ;; as being possible features. 192 ;; as being possible features.
193 (while (and loopc do-typeconstraint) 193 (while (and loopc do-typeconstraint)
194 194
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 49323d24d6a..d8b004df1bd 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -1128,7 +1128,7 @@ Optional PARENT and COLOR are ignored."
1128 1128
1129(define-mode-local-override semantic-format-tag-canonical-name 1129(define-mode-local-override semantic-format-tag-canonical-name
1130 c-mode (tag &optional parent color) 1130 c-mode (tag &optional parent color)
1131 "Create a cannonical name for TAG. 1131 "Create a canonical name for TAG.
1132PARENT specifies a parent class. 1132PARENT specifies a parent class.
1133COLOR indicates that the text should be type colorized. 1133COLOR indicates that the text should be type colorized.
1134Enhances the base class to search for the entire parent 1134Enhances the base class to search for the entire parent
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 666624db929..c19df6aed77 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -463,7 +463,7 @@ Return a bovination list to use."
463 ;; Try an Emacs 22 fcn. This throws errors. 463 ;; Try an Emacs 22 fcn. This throws errors.
464 (find-library-name (semantic-tag-name tag)) 464 (find-library-name (semantic-tag-name tag))
465 (error 465 (error
466 (message "semantic: connot find source file %s" 466 (message "semantic: cannot find source file %s"
467 (semantic-tag-name tag)))) 467 (semantic-tag-name tag))))
468 ;; No handy function available. (Older Emacsen) 468 ;; No handy function available. (Older Emacsen)
469 (let* ((lib (locate-library (semantic-tag-name tag))) 469 (let* ((lib (locate-library (semantic-tag-name tag)))
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 307071e743c..e7ed8c5ee47 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -595,7 +595,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
595 ;; Feb 06 - 595 ;; Feb 06 -
596 ;; IDed when the first cache-list tag is after 596 ;; IDed when the first cache-list tag is after
597 ;; our change, meaning there is nothing before 597 ;; our change, meaning there is nothing before
598 ;; the chnge. 598 ;; the change.
599 ((> (semantic-tag-start (car cache-list)) 599 ((> (semantic-tag-start (car cache-list))
600 (semantic-overlay-end (car changes))) 600 (semantic-overlay-end (car changes)))
601 (setq last-cond "Beginning of buffer") 601 (setq last-cond "Beginning of buffer")
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index c2d07fbcc35..b4d94321bc1 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -574,7 +574,7 @@ FUNCTION must return non-nil if an element of STREAM will be included
574in the new list. 574in the new list.
575 575
576If optional argument SEARCH-PARTS is non-nil, all sub-parts of tags 576If optional argument SEARCH-PARTS is non-nil, all sub-parts of tags
577are searched. The overloadable function `semantic-tag-componenets' is 577are searched. The overloadable function `semantic-tag-components' is
578used for the searching child lists. If SEARCH-PARTS is the symbol 578used for the searching child lists. If SEARCH-PARTS is the symbol
579'positiononly, then only children that have positional information are 579'positiononly, then only children that have positional information are
580searched. 580searched.
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index a9a5ab586d0..87a436fbc3d 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -1677,7 +1677,7 @@ When the lexer encounters the open-paren delimiter \"(\":
1677;;; Lexical Safety 1677;;; Lexical Safety
1678;; 1678;;
1679;; The semantic lexers, unlike other lexers, can throw errors on 1679;; The semantic lexers, unlike other lexers, can throw errors on
1680;; unbalanced syntax. Since editing is all about changeging test 1680;; unbalanced syntax. Since editing is all about changing text
1681;; we need to provide a convenient way to protect against syntactic 1681;; we need to provide a convenient way to protect against syntactic
1682;; inequalities. 1682;; inequalities.
1683 1683
diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el
index 88b0cc33d43..3fe3f05f1fb 100644
--- a/lisp/cedet/semantic/sb.el
+++ b/lisp/cedet/semantic/sb.el
@@ -313,7 +313,7 @@ TEXT TOKEN and INDENT are the details."
313 (save-excursion (speedbar-stealthy-updates)) 313 (save-excursion (speedbar-stealthy-updates))
314 (semantic-go-to-tag token parent) 314 (semantic-go-to-tag token parent)
315 (switch-to-buffer (current-buffer)) 315 (switch-to-buffer (current-buffer))
316 ;; Reset the timer with a new timeout when cliking a file 316 ;; Reset the timer with a new timeout when clicking a file
317 ;; in case the user was navigating directories, we can cancel 317 ;; in case the user was navigating directories, we can cancel
318 ;; that other timer. 318 ;; that other timer.
319 ;; (speedbar-set-timer dframe-update-speed) 319 ;; (speedbar-set-timer dframe-update-speed)
diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el
index 72c14141166..3d8ed2c5b80 100644
--- a/lisp/cedet/semantic/tag-ls.el
+++ b/lisp/cedet/semantic/tag-ls.el
@@ -221,7 +221,7 @@ something without an implementation."
221 221
222(define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer) 222(define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer)
223 "Return the fully qualified name of TAG in the package hierarchy. 223 "Return the fully qualified name of TAG in the package hierarchy.
224STREAM-OR-BUFFER can be anything convertable by `semantic-something-to-stream', 224STREAM-OR-BUFFER can be anything convertible by `semantic-something-to-stream',
225but must be a toplevel semantic tag stream that contains TAG. 225but must be a toplevel semantic tag stream that contains TAG.
226A Package Hierarchy is defined in UML by the way classes and methods 226A Package Hierarchy is defined in UML by the way classes and methods
227are organized on disk. Some language use this concept such that a 227are organized on disk. Some language use this concept such that a
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 052999bf7c8..d65cd2b8d88 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -66,7 +66,7 @@
66The compiled template can contain lists of section dictionaries, 66The compiled template can contain lists of section dictionaries,
67or values that are expected to be passed down into different 67or values that are expected to be passed down into different
68section macros. The template section dictionaries are merged in with 68section macros. The template section dictionaries are merged in with
69any incomming dictionaries values.") 69any incoming dictionaries values.")
70 (binding :initarg :binding 70 (binding :initarg :binding
71 :documentation 71 :documentation
72 "Preferred keybinding for this template in `srecode-minor-mode-map'.") 72 "Preferred keybinding for this template in `srecode-minor-mode-map'.")
@@ -552,7 +552,7 @@ A list of defined variables VARS provides a variable table."
552 (when (not hs) 552 (when (not hs)
553 (setq hs (make-hash-table :test 'equal :size 20)) 553 (setq hs (make-hash-table :test 'equal :size 20))
554 (puthash context hs contexthash)) 554 (puthash context hs contexthash))
555 ;; Put into that contenxt's hash. 555 ;; Put into that context's hash.
556 (puthash objname (car lp) hs) 556 (puthash objname (car lp) hs)
557 ) 557 )
558 558
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index 61cbab19998..e297f5dffda 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -167,7 +167,7 @@ doesn't always work correctly."
167 ("str\\(ing\\)?" . "string") 167 ("str\\(ing\\)?" . "string")
168 ("use?r" . "user") 168 ("use?r" . "user")
169 ("num\\(ber\\)?" . "number") 169 ("num\\(ber\\)?" . "number")
170 ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;commen sylable 170 ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;common sylable
171 ) 171 )
172 "List of common English abbreviations or full words. 172 "List of common English abbreviations or full words.
173These are nouns (as opposed to verbs) for use in creating expanded 173These are nouns (as opposed to verbs) for use in creating expanded
diff --git a/lisp/dired.el b/lisp/dired.el
index 90cf610116a..6264df148b6 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2533,7 +2533,7 @@ instead of `dired-actual-switches'."
2533 (if (and (> count 1) (called-interactively-p 'interactive)) 2533 (if (and (> count 1) (called-interactively-p 'interactive))
2534 (message "Buffer includes %d directories" count))) 2534 (message "Buffer includes %d directories" count)))
2535 ;; We don't need to sort it because it is in buffer order per 2535 ;; We don't need to sort it because it is in buffer order per
2536 ;; constructionem. Return new alist: 2536 ;; construction. Return new alist:
2537 dired-subdir-alist)) 2537 dired-subdir-alist))
2538 2538
2539(defun dired-alist-add-1 (dir new-marker) 2539(defun dired-alist-add-1 (dir new-marker)
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 4c83e7e2e0d..8f991575eda 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -509,7 +509,7 @@ eliminated by adding more test cases."
509 (set-buffer-modified-p changed)))) 509 (set-buffer-modified-p changed))))
510 510
511(defun testcover-mark-all (&optional buffer) 511(defun testcover-mark-all (&optional buffer)
512 "Mark all forms in BUFFER that did not get completley tested during 512 "Mark all forms in BUFFER that did not get completely tested during
513coverage tests. This function creates many overlays." 513coverage tests. This function creates many overlays."
514 (interactive "bMark forms in buffer: ") 514 (interactive "bMark forms in buffer: ")
515 (if buffer 515 (if buffer
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 1fb8b7f4c32..dcb23967645 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -311,7 +311,7 @@ special character that is not itself a backslash."
311 (char-to-string (char-before)))) 311 (char-to-string (char-before))))
312 ;; allow \\<RET> to mean a literal "\" character followed by a 312 ;; allow \\<RET> to mean a literal "\" character followed by a
313 ;; normal return, rather than a backslash followed by a line 313 ;; normal return, rather than a backslash followed by a line
314 ;; continuator (i.e., "\\ + \n" rather than "\ + \\n"). This 314 ;; continuation (i.e., "\\ + \n" rather than "\ + \\n"). This
315 ;; is necessary because backslashes in Eshell are not special 315 ;; is necessary because backslashes in Eshell are not special
316 ;; unless they either precede something special, or precede a 316 ;; unless they either precede something special, or precede a
317 ;; backslash that precedes something special. (Mainly this is 317 ;; backslash that precedes something special. (Mainly this is
diff --git a/lisp/faces.el b/lisp/faces.el
index 45173eb35da..7bc103ca699 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2457,7 +2457,7 @@ It is used for characters of no fonts too."
2457;;; Manipulating font names. 2457;;; Manipulating font names.
2458;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 2458;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2459 2459
2460;; This is here for compatibilty with Emacs 20.2. For example, 2460;; This is here for compatibility with Emacs 20.2. For example,
2461;; international/fontset.el uses x-resolve-font-name. The following 2461;; international/fontset.el uses x-resolve-font-name. The following
2462;; functions are not used in the face implementation itself. 2462;; functions are not used in the face implementation itself.
2463 2463
diff --git a/lisp/follow.el b/lisp/follow.el
index b387427a47f..a0e363aea2a 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -118,7 +118,7 @@
118;; (setq pixel-vertical-clip-threshold 30) 118;; (setq pixel-vertical-clip-threshold 30)
119 119
120 120
121;; The correct way to configurate Follow mode, or any other mode for 121;; The correct way to configure Follow mode, or any other mode for
122;; that matter, is to create one or more functions that do 122;; that matter, is to create one or more functions that do
123;; whatever you would like to do. These functions are then added to 123;; whatever you would like to do. These functions are then added to
124;; a hook. 124;; a hook.
@@ -894,7 +894,7 @@ Returns (end-pos end-of-buffer-p)"
894 (save-restriction 894 (save-restriction
895 ;; Fix a mis-feature in `vertical-motion': 895 ;; Fix a mis-feature in `vertical-motion':
896 ;; The start of the window is assumed to 896 ;; The start of the window is assumed to
897 ;; coinside with the start of a line. 897 ;; coincide with the start of a line.
898 (narrow-to-region (point) (point-max)) 898 (narrow-to-region (point) (point-max))
899 (not (= height (vertical-motion height)))))) 899 (not (= height (vertical-motion height))))))
900 (list (point) buffer-end-p)))))) 900 (list (point) buffer-end-p))))))
@@ -1064,7 +1064,7 @@ Return the selected window."
1064;; it wasn't just moved here. (I.e. M-> shall not unconditionally place 1064;; it wasn't just moved here. (I.e. M-> shall not unconditionally place
1065;; the point in the selected window.) 1065;; the point in the selected window.)
1066;; 1066;;
1067;; (Compatibility cludge: in Emacs `window-end' is equal to `point-max'; 1067;; (Compatibility kludge: in Emacs `window-end' is equal to `point-max';
1068;; in XEmacs, it is equal to `point-max + 1'. Should I really bother 1068;; in XEmacs, it is equal to `point-max + 1'. Should I really bother
1069;; checking `window-end' now when I check `end-of-buffer' explicitly?) 1069;; checking `window-end' now when I check `end-of-buffer' explicitly?)
1070 1070
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 77f2235e790..5c4ca40b204 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2565,7 +2565,7 @@
2565 * gnus-sum.el (gnus-user-date): Rename back from 2565 * gnus-sum.el (gnus-user-date): Rename back from
2566 gnus-summary-user-date since user code refers to it. 2566 gnus-summary-user-date since user code refers to it.
2567 2567
2568 * shr.el (shr-render-td): Store the actual background colour used. 2568 * shr.el (shr-render-td): Store the actual background color used.
2569 2569
2570 * message.el (message-setup-1): Don't bind the constant 2570 * message.el (message-setup-1): Don't bind the constant
2571 -forbidden-properties. 2571 -forbidden-properties.
@@ -2653,9 +2653,9 @@
2653 2653
26542011-02-01 Lars Ingebrigtsen <larsi@gnus.org> 26542011-02-01 Lars Ingebrigtsen <larsi@gnus.org>
2655 2655
2656 * shr.el (shr-render-td): Only do colours at the final rendering. 2656 * shr.el (shr-render-td): Only do colors at the final rendering.
2657 Should be slightly faster. 2657 Should be slightly faster.
2658 (shr-insert-table): Fix up TD background colours when doing the 2658 (shr-insert-table): Fix up TD background colors when doing the
2659 vertical padding. 2659 vertical padding.
2660 2660
2661 * gnus-art.el (article-date-ut): Protect against articles with no Date 2661 * gnus-art.el (article-date-ut): Protect against articles with no Date
@@ -2783,7 +2783,7 @@
2783 2783
27842011-01-27 Lars Ingebrigtsen <larsi@gnus.org> 27842011-01-27 Lars Ingebrigtsen <larsi@gnus.org>
2785 2785
2786 * shr.el (shr-put-color): Special-case background colours: Do put them 2786 * shr.el (shr-put-color): Special-case background colors: Do put them
2787 at the blank parts at the front of the lines. 2787 at the blank parts at the front of the lines.
2788 2788
2789 * gnus-draft.el (gnus-draft-clear-marks): New function to be run as an 2789 * gnus-draft.el (gnus-draft-clear-marks): New function to be run as an
@@ -3788,7 +3788,7 @@
3788 3788
37892010-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org> 37892010-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
3790 3790
3791 * shr-color.el (shr-color-visible): Don't bug out if the colour names 3791 * shr-color.el (shr-color-visible): Don't bug out if the color names
3792 don't exist. 3792 don't exist.
3793 3793
37942010-11-25 Katsumi Yamaoka <yamaoka@jpl.org> 37942010-11-25 Katsumi Yamaoka <yamaoka@jpl.org>
@@ -3860,7 +3860,7 @@
3860 3860
38612010-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org> 38612010-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
3862 3862
3863 * shr.el (shr-color-check): Protect against non-existent colour names. 3863 * shr.el (shr-color-check): Protect against non-existent color names.
3864 3864
38652010-11-24 Julien Danjou <julien@danjou.info> 38652010-11-24 Julien Danjou <julien@danjou.info>
3866 3866
@@ -3886,7 +3886,7 @@
38862010-11-23 Lars Magne Ingebrigtsen <larsi@gnus.org> 38862010-11-23 Lars Magne Ingebrigtsen <larsi@gnus.org>
3887 3887
3888 * shr.el (shr-insert-color-overlay): Split stuff like 3888 * shr.el (shr-insert-color-overlay): Split stuff like
3889 "#444444 !important" to find the real colour. 3889 "#444444 !important" to find the real color.
3890 (shr-tag-font): Resurrect shr-tag-font again, since it's needed to 3890 (shr-tag-font): Resurrect shr-tag-font again, since it's needed to
3891 parse <font color="red"> entries. 3891 parse <font color="red"> entries.
3892 3892
@@ -5997,15 +5997,15 @@
5997 highlight again, so that the highlight is correct. 5997 highlight again, so that the highlight is correct.
5998 5998
5999 * gnus-picon.el (gnus-picon): Remove again. 5999 * gnus-picon.el (gnus-picon): Remove again.
6000 (gnus-picon-create-glyph): Set the background XPM colour explicitly. 6000 (gnus-picon-create-glyph): Set the background XPM color explicitly.
6001 6001
6002 * gnus-art.el (gnus-treatment-function-alist): Insert picons after 6002 * gnus-art.el (gnus-treatment-function-alist): Insert picons after
6003 doing the header highlightling, so that the background colour of the 6003 doing the header highlightling, so that the background color of the
6004 picon is correct. 6004 picon is correct.
6005 6005
6006 * gnus-picon.el (gnus-picon-xbm): Remove obsolete face. 6006 * gnus-picon.el (gnus-picon-xbm): Remove obsolete face.
6007 (gnus-picon): Ditto. 6007 (gnus-picon): Ditto.
6008 (gnus-picon): Reinstate. The background colour for picons is white. 6008 (gnus-picon): Reinstate. The background color for picons is white.
6009 (gnus-picon-insert-glyph): Make the background white. 6009 (gnus-picon-insert-glyph): Make the background white.
6010 6010
6011 * nnml.el (nnml-open-nov): Don't return dead buffers. 6011 * nnml.el (nnml-open-nov): Don't return dead buffers.
@@ -7417,7 +7417,7 @@
7417 UTF-8. This seems to fix problems with some German web feeds. 7417 UTF-8. This seems to fix problems with some German web feeds.
7418 7418
7419 * gnus.el (gnus-group-startup-message): Put the xpm version of the logo 7419 * gnus.el (gnus-group-startup-message): Put the xpm version of the logo
7420 at the top so that the proper colours are applied. 7420 at the top so that the proper colors are applied.
7421 7421
7422 * gnus-art.el (gnus-article-view-part): Doc fix. 7422 * gnus-art.el (gnus-article-view-part): Doc fix.
7423 7423
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 8deb27379a3..f913ddb5378 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -140,7 +140,7 @@ This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
140;; :mouse-2 command-on-mouse-2-press 140;; :mouse-2 command-on-mouse-2-press
141;; :mouse-3 command-on-mouse-3-press) ;; typically a menu of related commands 141;; :mouse-3 command-on-mouse-3-press) ;; typically a menu of related commands
142;; 142;;
143;; Combinations of mouse-[23] plus shift and/or controll might be overkill. 143;; Combinations of mouse-[23] plus shift and/or control might be overkill.
144;; 144;;
145;; Then use (plist-get rs-command :none), (plist-get rs-command :shift) 145;; Then use (plist-get rs-command :none), (plist-get rs-command :shift)
146 146
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index f0951b7b803..128bda6f516 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -588,7 +588,7 @@ A string or a list of strings is returned."
588 (filter &optional host attributes attrsonly withdn)) 588 (filter &optional host attributes attrsonly withdn))
589 589
590(defun smime-cert-by-ldap-1 (mail host) 590(defun smime-cert-by-ldap-1 (mail host)
591 "Get cetificate for MAIL from the ldap server at HOST." 591 "Get certificate for MAIL from the ldap server at HOST."
592 (let ((ldapresult 592 (let ((ldapresult
593 (funcall 593 (funcall
594 (if (featurep 'xemacs) 594 (if (featurep 'xemacs)
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 17ddddbd17a..3f3b0b7a843 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2504,7 +2504,7 @@ Other commands:
2504 2504
2505** Information on Filtering: 2505** Information on Filtering:
2506 2506
2507 You can filter your ibuffer view via different critera. Each Ibuffer 2507 You can filter your ibuffer view via different criteria. Each Ibuffer
2508buffer has its own stack of active filters. For example, suppose you 2508buffer has its own stack of active filters. For example, suppose you
2509are working on an Emacs Lisp project. You can create an Ibuffer 2509are working on an Emacs Lisp project. You can create an Ibuffer
2510buffer displays buffers in just `emacs-lisp' modes via 2510buffer displays buffers in just `emacs-lisp' modes via
diff --git a/lisp/ido.el b/lisp/ido.el
index fda4c0316f7..6af431a2882 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -258,7 +258,7 @@
258;; The highlighting of matching items is controlled via ido-use-faces. 258;; The highlighting of matching items is controlled via ido-use-faces.
259;; The faces used are ido-first-match, ido-only-match and 259;; The faces used are ido-first-match, ido-only-match and
260;; ido-subdir. 260;; ido-subdir.
261;; Colouring of the matching item was suggested by 261;; Coloring of the matching item was suggested by
262;; Carsten Dominik (dominik@strw.leidenuniv.nl). 262;; Carsten Dominik (dominik@strw.leidenuniv.nl).
263 263
264;; Replacement for read-buffer and read-file-name 264;; Replacement for read-buffer and read-file-name
@@ -3152,7 +3152,7 @@ for first matching file."
3152;;; CREATE LIST OF ALL CURRENT FILES 3152;;; CREATE LIST OF ALL CURRENT FILES
3153 3153
3154(defun ido-all-completions () 3154(defun ido-all-completions ()
3155 ;; Return unsorted list of all competions. 3155 ;; Return unsorted list of all completions.
3156 (let ((ido-process-ignore-lists nil) 3156 (let ((ido-process-ignore-lists nil)
3157 (ido-directory-too-big nil)) 3157 (ido-directory-too-big nil))
3158 (cond 3158 (cond
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 47426784e51..94237a0a489 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -466,7 +466,7 @@ with L, LRE, or LRO Unicode bidi character type.")
466 466
467;; Tai Viet 467;; Tai Viet
468(let ((deflist '(;; chars syntax category 468(let ((deflist '(;; chars syntax category
469 ((?ꪀ. ?ꪯ) "w" ?0) ; cosonant 469 ((?ꪀ. ?ꪯ) "w" ?0) ; consonant
470 ("ꪱꪵꪶ" "w" ?1) ; vowel base 470 ("ꪱꪵꪶ" "w" ?1) ; vowel base
471 ((?ꪹ . ?ꪽ) "w" ?1) ; vowel base 471 ((?ꪹ . ?ꪽ) "w" ?1) ; vowel base
472 ("ꪰꪲꪳꪷꪸꪾ" "w" ?2) ; vowel upper 472 ("ꪰꪲꪳꪷꪸꪾ" "w" ?2) ; vowel upper
diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el
index a7d3328526a..e8860cba595 100644
--- a/lisp/iswitchb.el
+++ b/lisp/iswitchb.el
@@ -163,7 +163,7 @@
163;; Font-Lock 163;; Font-Lock
164 164
165;; font-lock is used to highlight the first matching buffer. To 165;; font-lock is used to highlight the first matching buffer. To
166;; switch this off, set (setq iswitchb-use-faces nil). Colouring of 166;; switch this off, set (setq iswitchb-use-faces nil). Coloring of
167;; the matching buffer name was suggested by Carsten Dominik 167;; the matching buffer name was suggested by Carsten Dominik
168;; (dominik@strw.leidenuniv.nl) 168;; (dominik@strw.leidenuniv.nl)
169 169
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index d0907b078ac..1ba8ec9f821 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -336,7 +336,7 @@
336;; for FQM files if you're a VM user 336;; for FQM files if you're a VM user
337;; change buffer-substring calls to buffer-substring-no-properties for 337;; change buffer-substring calls to buffer-substring-no-properties for
338;; speed-up (suggested by Howard Melman <howard@silverstream.com>) 338;; speed-up (suggested by Howard Melman <howard@silverstream.com>)
339;; feedmail-sendmail-f-doesnt-sell-me-out to contol "-f" in call to sendmail 339;; feedmail-sendmail-f-doesnt-sell-me-out to control "-f" in call to sendmail
340;; in feedmail-buffer-to-sendmail 340;; in feedmail-buffer-to-sendmail
341;; better trapping of odd conditions during the running of the queue; 341;; better trapping of odd conditions during the running of the queue;
342;; thanks to Yigal Hochberg for helping me test much of this by remote 342;; thanks to Yigal Hochberg for helping me test much of this by remote
@@ -2410,7 +2410,7 @@ mapped to mostly alphanumerics for safety."
2410 (a-re-dtcb "^\\(To\\|Cc\\|Bcc\\):") 2410 (a-re-dtcb "^\\(To\\|Cc\\|Bcc\\):")
2411 (a-re-dtc "^\\(To\\|Cc\\):") 2411 (a-re-dtc "^\\(To\\|Cc\\):")
2412 (a-re-db "^Bcc:") 2412 (a-re-db "^Bcc:")
2413 ;; to get a temporary changable copy 2413 ;; to get a temporary changeable copy
2414 (mail-header-separator mail-header-separator) 2414 (mail-header-separator mail-header-separator)
2415 ) 2415 )
2416 (unwind-protect 2416 (unwind-protect
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index 07c558f60cc..88a6ed84055 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -1,4 +1,4 @@
1;;; mh-compat.el --- make MH-E compatibile with various versions of Emacs 1;;; mh-compat.el --- make MH-E compatible with various versions of Emacs
2 2
3;; Copyright (C) 2006-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
4 4
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index a547dd8d80a..c8f2440e276 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1791,7 +1791,7 @@ PROC is used to convert the value to actual data."
1791;; To add support for your favorite checksum program add a clause to 1791;; To add support for your favorite checksum program add a clause to
1792;; the cond statement in mh-checksum-choose. This should set the 1792;; the cond statement in mh-checksum-choose. This should set the
1793;; variable mh-checksum-cmd to the command line needed to run the 1793;; variable mh-checksum-cmd to the command line needed to run the
1794;; checsum program and should set mh-checksum-parser to a function 1794;; checksum program and should set mh-checksum-parser to a function
1795;; which returns a cons cell containing the message number and 1795;; which returns a cons cell containing the message number and
1796;; checksum string. 1796;; checksum string.
1797 1797
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 64b2d34af9c..1f6c4464808 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -53,7 +53,7 @@ These are the special commands of this mode:
53 s -- Select the server at point. 53 s -- Select the server at point.
54 t -- Transpose the server at point and the previous one 54 t -- Transpose the server at point and the previous one
55 q -- Commit the changes and quit. 55 q -- Commit the changes and quit.
56 x -- Quit without commiting the changes." 56 x -- Quit without committing the changes."
57 (interactive) 57 (interactive)
58 (kill-all-local-variables) 58 (kill-all-local-variables)
59 (setq major-mode 'eudc-hotlist-mode) 59 (setq major-mode 'eudc-hotlist-mode)
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index 88deef46862..173ba9c3d20 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -78,7 +78,7 @@
78;; (secrets-create-collection "my collection") 78;; (secrets-create-collection "my collection")
79 79
80;; There exists a special collection called "session", which has the 80;; There exists a special collection called "session", which has the
81;; lifetime of the corrresponding client session (aka Emacs' 81;; lifetime of the corresponding client session (aka Emacs'
82;; lifetime). It is created automatically when Emacs uses the Secret 82;; lifetime). It is created automatically when Emacs uses the Secret
83;; Service interface, and it is deleted when Emacs is killed. 83;; Service interface, and it is deleted when Emacs is killed.
84;; Therefore, it can be used to store and retrieve secret items 84;; Therefore, it can be used to store and retrieve secret items
diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el
index 6a2a9daf7e4..53d2cabc2e5 100644
--- a/lisp/nxml/nxml-outln.el
+++ b/lisp/nxml/nxml-outln.el
@@ -60,7 +60,7 @@
60;; form. Single-line form is used when the outline state is hide-children 60;; form. Single-line form is used when the outline state is hide-children
61;; or there are no child sections; multi-line form is used otherwise. 61;; or there are no child sections; multi-line form is used otherwise.
62;; There are two flavors of single-line form: with children and without. 62;; There are two flavors of single-line form: with children and without.
63;; The with-childen flavor is used when there are child sections. 63;; The with-children flavor is used when there are child sections.
64;; Single line with children looks like 64;; Single line with children looks like
65;; <+section>A section title...</> 65;; <+section>A section title...</>
66;; Single line without children looks like 66;; Single line without children looks like
diff --git a/lisp/obsolete/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el
index 064985f4566..2eafc631e98 100644
--- a/lisp/obsolete/pgg-gpg.el
+++ b/lisp/obsolete/pgg-gpg.el
@@ -384,7 +384,7 @@ passphrase cache or user."
384 (pgg-process-when-success))) 384 (pgg-process-when-success)))
385 385
386(defun pgg-gpg-update-agent () 386(defun pgg-gpg-update-agent ()
387 "Try to connet to gpg-agent and send UPDATESTARTUPTTY." 387 "Try to connect to gpg-agent and send UPDATESTARTUPTTY."
388 (if (fboundp 'make-network-process) 388 (if (fboundp 'make-network-process)
389 (let* ((agent-info (getenv "GPG_AGENT_INFO")) 389 (let* ((agent-info (getenv "GPG_AGENT_INFO"))
390 (socket (and agent-info 390 (socket (and agent-info
diff --git a/lisp/org/org.el b/lisp/org/org.el
index a22cf4d6efc..5d988b3cecd 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -2924,7 +2924,7 @@ is better to limit inheritance to certain tags using the variables
2924 (const :tag "List them, indented with leading dots" indented))) 2924 (const :tag "List them, indented with leading dots" indented)))
2925 2925
2926(defcustom org-tags-sort-function nil 2926(defcustom org-tags-sort-function nil
2927 "When set, tags are sorted using this function as a comparator." 2927 "When set, tags are sorted using this comparison function."
2928 :group 'org-tags 2928 :group 'org-tags
2929 :type '(choice 2929 :type '(choice
2930 (const :tag "No sorting" nil) 2930 (const :tag "No sorting" nil)
@@ -5549,7 +5549,7 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'."
5549 5549
5550(defvar org-font-lock-set-keywords-hook nil 5550(defvar org-font-lock-set-keywords-hook nil
5551 "Functions that can manipulate `org-font-lock-extra-keywords'. 5551 "Functions that can manipulate `org-font-lock-extra-keywords'.
5552This is calles after `org-font-lock-extra-keywords' is defined, but before 5552This is called after `org-font-lock-extra-keywords' is defined, but before
5553it is installed to be used by font lock. This can be useful if something 5553it is installed to be used by font lock. This can be useful if something
5554needs to be inserted at a specific position in the font-lock sequence.") 5554needs to be inserted at a specific position in the font-lock sequence.")
5555 5555
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 81d1c0d2f32..6f3004e274a 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2331,7 +2331,7 @@ comment at the start of cc-engine.el for more info."
2331 ;; 2331 ;;
2332 ;; If there aren't enough opening paren/brace/brackets, return the position 2332 ;; If there aren't enough opening paren/brace/brackets, return the position
2333 ;; of the outermost one found, or HERE- if there are none. If there are no 2333 ;; of the outermost one found, or HERE- if there are none. If there are no
2334 ;; closeing p/b/bs between HERE+ and TOP, return HERE-. HERE-/+ and TOP 2334 ;; closing p/b/bs between HERE+ and TOP, return HERE-. HERE-/+ and TOP
2335 ;; must not be inside literals. Only the accessible portion of the buffer 2335 ;; must not be inside literals. Only the accessible portion of the buffer
2336 ;; will be scanned. 2336 ;; will be scanned.
2337 2337
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 2028a7c4675..a5a9582315b 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1103,7 +1103,7 @@ casts and declarations are fontified. Used on level 2 and higher."
1103 (<= (point) limit)) 1103 (<= (point) limit))
1104 1104
1105 ;; Search syntactically to the end of the declarator (";", 1105 ;; Search syntactically to the end of the declarator (";",
1106 ;; ",", a closen paren, eob etc) or to the beginning of an 1106 ;; ",", a closing paren, eob etc) or to the beginning of an
1107 ;; initializer or function prototype ("=" or "\\s\("). 1107 ;; initializer or function prototype ("=" or "\\s\(").
1108 ;; Note that the open paren will match array specs in 1108 ;; Note that the open paren will match array specs in
1109 ;; square brackets, and we treat them as initializers too. 1109 ;; square brackets, and we treat them as initializers too.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index ff192d5678e..dbffbc266e7 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -339,7 +339,7 @@ See `compilation-error-screen-columns'"
339 "The most recent grep buffer. 339 "The most recent grep buffer.
340A grep buffer becomes most recent when you select Grep mode in it. 340A grep buffer becomes most recent when you select Grep mode in it.
341Notice that using \\[next-error] or \\[compile-goto-error] modifies 341Notice that using \\[next-error] or \\[compile-goto-error] modifies
342`complation-last-buffer' rather than `grep-last-buffer'.") 342`compilation-last-buffer' rather than `grep-last-buffer'.")
343 343
344;;;###autoload 344;;;###autoload
345(defconst grep-regexp-alist 345(defconst grep-regexp-alist
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 453badfa46b..aa27427da67 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -925,7 +925,7 @@ IDL has currently stepped.")
925 \\[idlwave-shell-print] or \\[idlwave-shell-mouse-print] with the 925 \\[idlwave-shell-print] or \\[idlwave-shell-mouse-print] with the
926 mouse, help, \\[idlwave-shell-help-expression] or 926 mouse, help, \\[idlwave-shell-help-expression] or
927 \\[idlwave-shell-mouse-help] with the mouse, or with a 927 \\[idlwave-shell-mouse-help] with the mouse, or with a
928 configureable set of custom examine commands using 928 configurable set of custom examine commands using
929 \\[idlwave-shell-examine-select]. The mouse examine commands can 929 \\[idlwave-shell-examine-select]. The mouse examine commands can
930 also work by click and drag, to select an expression for 930 also work by click and drag, to select an expression for
931 examination. 931 examination.
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index d3770247c60..1233ee19ff6 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -605,7 +605,7 @@ The value of this variable may be nil to inhibit display, or an integer to
605indicate the maximum number of classes to display. 605indicate the maximum number of classes to display.
606 606
607On XEmacs, a full list of classes will also be placed into a `help-echo' 607On XEmacs, a full list of classes will also be placed into a `help-echo'
608property on the competion items, so that the list of classes for the current 608property on the completion items, so that the list of classes for the current
609item is displayed in the echo area. If the value of this variable is a 609item is displayed in the echo area. If the value of this variable is a
610negative integer, the `help-echo' property will be suppressed." 610negative integer, the `help-echo' property will be suppressed."
611 :group 'idlwave-completion 611 :group 'idlwave-completion
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 5505e8e94b2..4040a5c431e 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1295,7 +1295,7 @@ LIMIT defaults to point."
1295;; Like (up-list -1), but only considers lists that end nearby" 1295;; Like (up-list -1), but only considers lists that end nearby"
1296(defun js--up-nearby-list () 1296(defun js--up-nearby-list ()
1297 (save-restriction 1297 (save-restriction
1298 ;; Look at a very small region so our compuation time doesn't 1298 ;; Look at a very small region so our computation time doesn't
1299 ;; explode in pathological cases. 1299 ;; explode in pathological cases.
1300 (narrow-to-region (max (point-min) (- (point) 500)) (point)) 1300 (narrow-to-region (max (point-min) (- (point) 500)) (point))
1301 (up-list -1))) 1301 (up-list -1)))
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 103c7be7d3c..7d1f12595ab 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1058,7 +1058,7 @@ EXECUTION-TIME holds info about the time it takes, number or string.")
1058 (list 1058 (list
1059 (let* ((completion-ignore-case t) 1059 (let* ((completion-ignore-case t)
1060 ;; we already have a list, but it is not in the right format 1060 ;; we already have a list, but it is not in the right format
1061 ;; transform it to a valid table so completition can use it 1061 ;; transform it to a valid table so completion can use it
1062 (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil)) 1062 (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil))
1063 mixal-operation-codes-alist)) 1063 mixal-operation-codes-alist))
1064 ;; prompt is different depending on we are close to a valid op-code 1064 ;; prompt is different depending on we are close to a valid op-code
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 93d27042dc8..ef0905bb2a8 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -116,7 +116,7 @@
116;; Version 1.22: 116;; Version 1.22:
117;; o Allowed both 'swipl' and 'pl' as names for the SWI Prolog 117;; o Allowed both 'swipl' and 'pl' as names for the SWI Prolog
118;; interpreter. 118;; interpreter.
119;; o Atoms that start a line are not blindly coloured as 119;; o Atoms that start a line are not blindly colored as
120;; predicates. Instead we check that they are followed by ( or 120;; predicates. Instead we check that they are followed by ( or
121;; :- first. Patch suggested by Guy Wiener. 121;; :- first. Patch suggested by Guy Wiener.
122;; Version 1.21: 122;; Version 1.21:
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 00466b8b1e7..3a3c7f0baa3 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -1847,7 +1847,7 @@ find the errors."
1847 )) 1847 ))
1848 1848
1849(defconst verilog-auto-end-comment-lines-re 1849(defconst verilog-auto-end-comment-lines-re
1850 ;; Matches to names in this list cause auto-end-commentation 1850 ;; Matches to names in this list cause auto-end-commenting
1851 (concat "\\(" 1851 (concat "\\("
1852 verilog-directive-re "\\)\\|\\(" 1852 verilog-directive-re "\\)\\|\\("
1853 (eval-when-compile 1853 (eval-when-compile
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 31609232884..00f68a0b45f 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -632,7 +632,7 @@ with `.' followed by extensions, followed by full-filenames."
632 (setq regex2 (concat regex2 (if regex2 "\\|" "") (car extlist)))) 632 (setq regex2 (concat regex2 (if regex2 "\\|" "") (car extlist))))
633 (setq extlist (cdr extlist))) 633 (setq extlist (cdr extlist)))
634 ;; concat all the sub-exressions together, making sure all types 634 ;; concat all the sub-exressions together, making sure all types
635 ;; of parts exist during concatination. 635 ;; of parts exist during concatenation.
636 (concat "\\(" 636 (concat "\\("
637 (if regex1 (concat "\\(\\.\\(" regex1 "\\)\\)") "") 637 (if regex1 (concat "\\(\\.\\(" regex1 "\\)\\)") "")
638 (if (and regex1 regex2) "\\|" "") 638 (if (and regex1 regex2) "\\|" "")
@@ -2219,7 +2219,7 @@ passes some tests."
2219 ;; Go through all our bins Stick singles into our 2219 ;; Go through all our bins Stick singles into our
2220 ;; junk-list, everything else as sublsts in work-list. 2220 ;; junk-list, everything else as sublsts in work-list.
2221 ;; If two neighboring lists are both small, make a grouped 2221 ;; If two neighboring lists are both small, make a grouped
2222 ;; group combinding those two sub-lists. 2222 ;; group combining those two sub-lists.
2223 (setq diff-idx 0) 2223 (setq diff-idx 0)
2224 (while (> 256 diff-idx) 2224 (while (> 256 diff-idx)
2225 ;; The bins contents are currently in forward order. 2225 ;; The bins contents are currently in forward order.
@@ -3327,7 +3327,7 @@ current indentation level."
3327 (speedbar-find-file-in-frame (concat cdd text)) 3327 (speedbar-find-file-in-frame (concat cdd text))
3328 (speedbar-stealthy-updates) 3328 (speedbar-stealthy-updates)
3329 (run-hooks 'speedbar-visiting-file-hook) 3329 (run-hooks 'speedbar-visiting-file-hook)
3330 ;; Reset the timer with a new timeout when cliking a file 3330 ;; Reset the timer with a new timeout when clicking a file
3331 ;; in case the user was navigating directories, we can cancel 3331 ;; in case the user was navigating directories, we can cancel
3332 ;; that other timer. 3332 ;; that other timer.
3333 (speedbar-set-timer dframe-update-speed)) 3333 (speedbar-set-timer dframe-update-speed))
@@ -3447,7 +3447,7 @@ INDENT is the current indentation level."
3447 (select-frame f)) 3447 (select-frame f))
3448 (speedbar-find-file-in-frame file) 3448 (speedbar-find-file-in-frame file)
3449 (save-excursion (speedbar-stealthy-updates)) 3449 (save-excursion (speedbar-stealthy-updates))
3450 ;; Reset the timer with a new timeout when cliking a file 3450 ;; Reset the timer with a new timeout when clicking a file
3451 ;; in case the user was navigating directories, we can cancel 3451 ;; in case the user was navigating directories, we can cancel
3452 ;; that other timer. 3452 ;; that other timer.
3453 (speedbar-set-timer dframe-update-speed) 3453 (speedbar-set-timer dframe-update-speed)
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index 43b799df1c9..a43864e36d6 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -68,7 +68,7 @@
68;; MULE charset, Emacs can display a single MULE charset with the 68;; MULE charset, Emacs can display a single MULE charset with the
69;; glyphs of the current codepage. When Emacs starts on DOS, it 69;; glyphs of the current codepage. When Emacs starts on DOS, it
70;; automatically sets its default coding systems for file I/O and 70;; automatically sets its default coding systems for file I/O and
71;; terminal output according to the currend DOS codepage, given by 71;; terminal output according to the current DOS codepage, given by
72;; the `dos-codepage' variable. 72;; the `dos-codepage' variable.
73;; 73;;
74;; This leaves us with the problem of displaying character sets 74;; This leaves us with the problem of displaying character sets
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index a5099311307..db536c100f3 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1446,7 +1446,7 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
1446 ;; is used, string is a TeX command 1446 ;; is used, string is a TeX command
1447 ;; (char before beginning of word is 1447 ;; (char before beginning of word is
1448 ;; backslash) and none of the previous 1448 ;; backslash) and none of the previous
1449 ;; contitions match 1449 ;; conditions match.
1450 (and (not ispell-really-aspell) 1450 (and (not ispell-really-aspell)
1451 (save-excursion 1451 (save-excursion
1452 (goto-char (- (nth 1 found-list) 1)) 1452 (goto-char (- (nth 1 found-list) 1))
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index d66b297bd2b..6f9e7e1bdb0 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -2323,7 +2323,7 @@ of (COLUMN-NUMBER . LINE) pairs."
2323 (indent-rigidly 2323 (indent-rigidly
2324 mbeg mend 2324 mbeg mend
2325 2325
2326 ;; Find the next tab after the leftmost columnt. 2326 ;; Find the next tab after the leftmost column.
2327 (let ((tab (funcall find-next-fun tabs leftmostcol))) 2327 (let ((tab (funcall find-next-fun tabs leftmostcol)))
2328 2328
2329 (if tab 2329 (if tab
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 2dc4e4a88b1..08922445521 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -1482,7 +1482,7 @@ the last cache point coordinate."
1482 (cons (cons command func-symbol) 1482 (cons (cons command func-symbol)
1483 table-command-remap-alist)))) 1483 table-command-remap-alist))))
1484 '(center-line 1484 '(center-line
1485 conter-region 1485 center-region
1486 center-paragraph 1486 center-paragraph
1487 fill-paragraph)) 1487 fill-paragraph))
1488 1488
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index deb92fc0243..c4892ce572c 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1871,7 +1871,7 @@ Mark is left at original location."
1871 tex-old-error-file-name 2 nil 1 1 1871 tex-old-error-file-name 2 nil 1 1
1872 (2 compilation-warning-face)) 1872 (2 compilation-warning-face))
1873 ;; Included files get output as (<file> ...). 1873 ;; Included files get output as (<file> ...).
1874 ;; FIXME: there tend to be a crapload of them at the beginning of the 1874 ;; FIXME: there tend to be a boatload of them at the beginning of the
1875 ;; output which aren't that interesting. Maybe we should filter out 1875 ;; output which aren't that interesting. Maybe we should filter out
1876 ;; all the file name that start with /usr/share? 1876 ;; all the file name that start with /usr/share?
1877 ;; ("(\\.?/\\([^() \n]+\\)" 1 nil nil 0) 1877 ;; ("(\\.?/\\([^() \n]+\\)" 1 nil nil 0)
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 7a505758408..6ac8eddc9d6 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -26,7 +26,7 @@
26;; This package create two new modes: thumbs-mode and thumbs-view-image-mode. 26;; This package create two new modes: thumbs-mode and thumbs-view-image-mode.
27;; It is used for basic browsing and viewing of images from within Emacs. 27;; It is used for basic browsing and viewing of images from within Emacs.
28;; Minimal image manipulation functions are also available via external 28;; Minimal image manipulation functions are also available via external
29;; programs. If you want to do more complex tasks like categorise and tag 29;; programs. If you want to do more complex tasks like categorize and tag
30;; your images, use image-dired.el 30;; your images, use image-dired.el
31;; 31;;
32;; The 'convert' program from 'ImageMagick' 32;; The 'convert' program from 'ImageMagick'
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 3d1f6afcb0e..95ab2623fff 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -909,7 +909,7 @@ Returns nil if URL contains no name starting with FILE."
909 ;; Only one file and FILE matches it exactly... 909 ;; Only one file and FILE matches it exactly...
910 t) 910 t)
911 (t 911 (t
912 ;; Need to figure out the longest string that they have in commmon 912 ;; Need to figure out the longest string that they have in common
913 (setq matches (sort matches (lambda (a b) (> (length a) (length b))))) 913 (setq matches (sort matches (lambda (a b) (> (length a) (length b)))))
914 (let ((n (length file)) 914 (let ((n (length file))
915 (searching t) 915 (searching t)
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index e9da4a1010c..bb7744be434 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -702,7 +702,7 @@ should be shown to the user."
702 (not-acceptable ; 406 702 (not-acceptable ; 406
703 ;; The resource identified by the request is only capable of 703 ;; The resource identified by the request is only capable of
704 ;; generating response entities which have content 704 ;; generating response entities which have content
705 ;; characteristics nota cceptable according to the accept 705 ;; characteristics not acceptable according to the accept
706 ;; headers sent in the request. 706 ;; headers sent in the request.
707 (setq success t)) 707 (setq success t))
708 (proxy-authentication-required ; 407 708 (proxy-authentication-required ; 407
@@ -1092,7 +1092,7 @@ the end of the document."
1092 (url-http-activate-callback))) 1092 (url-http-activate-callback)))
1093 ((string= "CONNECT" url-http-method) 1093 ((string= "CONNECT" url-http-method)
1094 ;; A CONNECT request is finished, but we cannot stick this 1094 ;; A CONNECT request is finished, but we cannot stick this
1095 ;; back on the free connectin list 1095 ;; back on the free connection list
1096 (url-http-debug "CONNECT request must have headers only.") 1096 (url-http-debug "CONNECT request must have headers only.")
1097 (when (url-http-parse-headers) 1097 (when (url-http-parse-headers)
1098 (url-http-activate-callback))) 1098 (url-http-activate-callback)))
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 7136b6023ce..c95b61c43fb 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -252,7 +252,7 @@ no further processing). URL is either a string or a parsed URL."
252 ;; interrupt it before it got a chance to handle process input. 252 ;; interrupt it before it got a chance to handle process input.
253 ;; `sleep-for' was tried but it lead to other forms of 253 ;; `sleep-for' was tried but it lead to other forms of
254 ;; hanging. --Stef 254 ;; hanging. --Stef
255 (unless (or (with-local-quit 255 (unless (or (with-local-quit
256 (accept-process-output proc)) 256 (accept-process-output proc))
257 (null proc)) 257 (null proc))
258 ;; accept-process-output returned nil, maybe because the process 258 ;; accept-process-output returned nil, maybe because the process
@@ -290,7 +290,7 @@ no further processing). URL is either a string or a parsed URL."
290 ;; These requires could advantageously be moved to url-mm-callback or 290 ;; These requires could advantageously be moved to url-mm-callback or
291 ;; turned into autoloads, but I suspect that it would introduce some bugs 291 ;; turned into autoloads, but I suspect that it would introduce some bugs
292 ;; because loading those files from a process sentinel or filter may 292 ;; because loading those files from a process sentinel or filter may
293 ;; result in some undesirable carner cases. 293 ;; result in some undesirable corner cases.
294 (require 'mm-decode) 294 (require 'mm-decode)
295 (require 'mm-view) 295 (require 'mm-view)
296 (url-retrieve url 'url-mm-callback nil)) 296 (url-retrieve url 'url-mm-callback nil))
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index d930a1bec69..ef273c610fe 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -635,7 +635,7 @@ optional argument, then use it."
635;; Traditional patch has weird return codes. 635;; Traditional patch has weird return codes.
636;; GNU and Posix return 1 if some hanks failed and 2 in case of trouble. 636;; GNU and Posix return 1 if some hanks failed and 2 in case of trouble.
637;; 0 is a good code in all cases. 637;; 0 is a good code in all cases.
638;; We'll do the concervative thing. 638;; We'll do the conservative thing.
639(defun ediff-patch-return-code-ok (code) 639(defun ediff-patch-return-code-ok (code)
640 (eq code 0)) 640 (eq code 0))
641;;; (if (eq (ediff-test-patch-utility) 'traditional) 641;;; (if (eq (ediff-test-patch-utility) 'traditional)
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 35fa11c2e5e..148f6cde930 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -72,7 +72,7 @@ An empty list disables VC altogether."
72 :group 'vc) 72 :group 'vc)
73 73
74;; Note: we don't actually have a darcs back end yet. 74;; Note: we don't actually have a darcs back end yet.
75;; Also, Meta-CVS (corresponsding to MCVS) is unsupported. 75;; Also, Meta-CVS (corresponding to MCVS) is unsupported.
76(defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS" 76(defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS"
77 ".svn" ".git" ".hg" ".bzr" 77 ".svn" ".git" ".hg" ".bzr"
78 "_MTN" "_darcs" "{arch}")) 78 "_MTN" "_darcs" "{arch}"))
@@ -456,8 +456,8 @@ For registered files, the value returned is one of:
456 'edited The working file has been edited by the user. If 456 'edited The working file has been edited by the user. If
457 locking is used for the file, this state means that 457 locking is used for the file, this state means that
458 the current version is locked by the calling user. 458 the current version is locked by the calling user.
459 This status should *not* be reported for files 459 This status should *not* be reported for files
460 which have a changed mtime but the same content 460 which have a changed mtime but the same content
461 as the repo copy. 461 as the repo copy.
462 462
463 USER The current version of the working file is locked by 463 USER The current version of the working file is locked by
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index dc4e179e060..d014c4da135 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -706,7 +706,7 @@ information about FILENAME and return its status."
706 (vc-svn-command buf 'async file "annotate" (if rev (concat "-r" rev)))) 706 (vc-svn-command buf 'async file "annotate" (if rev (concat "-r" rev))))
707 707
708(defun vc-svn-annotate-time-of-rev (rev) 708(defun vc-svn-annotate-time-of-rev (rev)
709 ;; Arbitrarily assume 10 commmits per day. 709 ;; Arbitrarily assume 10 commits per day.
710 (/ (string-to-number rev) 10.0)) 710 (/ (string-to-number rev) 10.0))
711 711
712(defvar vc-annotate-parent-rev) 712(defvar vc-annotate-parent-rev)
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index dde85478f7e..53a35b4f0b3 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -525,7 +525,7 @@ evaluated instead of indentation::space value.
525 525
526One reason for not visualize spaces via faces (if `face' is not 526One reason for not visualize spaces via faces (if `face' is not
527included in `whitespace-style') is to use exclusively for 527included in `whitespace-style') is to use exclusively for
528cleanning up a buffer. See `whitespace-cleanup' and 528cleaning up a buffer. See `whitespace-cleanup' and
529`whitespace-cleanup-region' for documentation. 529`whitespace-cleanup-region' for documentation.
530 530
531See also `whitespace-display-mappings' for documentation." 531See also `whitespace-display-mappings' for documentation."
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index b0d00242f2a..8c4df9fc9cf 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -2363,7 +2363,7 @@ Return an alist of (TYPE MATCH)."
2363 result)) 2363 result))
2364 2364
2365(defun widget-checklist-validate (widget) 2365(defun widget-checklist-validate (widget)
2366 ;; Ticked chilren must be valid. 2366 ;; Ticked children must be valid.
2367 (let ((children (widget-get widget :children)) 2367 (let ((children (widget-get widget :children))
2368 child button found) 2368 child button found)
2369 (while (and children (not found)) 2369 (while (and children (not found))
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 04b759a8116..fbb76da1b91 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -410,7 +410,7 @@ otherwise return the frame width/height."
410 "Return the x/y coordinates to be sent in a XDndStatus message. 410 "Return the x/y coordinates to be sent in a XDndStatus message.
411Coordinates are required to be absolute. 411Coordinates are required to be absolute.
412FRAME is the frame and W is the window where the drop happened. 412FRAME is the frame and W is the window where the drop happened.
413If W is a window, return its absolute corrdinates, 413If W is a window, return its absolute coordinates,
414otherwise return the frame coordinates." 414otherwise return the frame coordinates."
415 (let* ((frame-left (frame-parameter frame 'left)) 415 (let* ((frame-left (frame-parameter frame 'left))
416 ;; If the frame is outside the display, frame-left looks like 416 ;; If the frame is outside the display, frame-left looks like
@@ -444,7 +444,7 @@ otherwise return the frame coordinates."
444 (if (consp flags) 444 (if (consp flags)
445 (logand (cdr flags) 1) 445 (logand (cdr flags) 1)
446 (logand flags 1))) 446 (logand flags 1)))
447 447
448(defun x-dnd-handle-xdnd (event frame window message _format data) 448(defun x-dnd-handle-xdnd (event frame window message _format data)
449 "Receive one XDND event (client message) and send the appropriate reply. 449 "Receive one XDND event (client message) and send the appropriate reply.
450EVENT is the client message. FRAME is where the mouse is now. 450EVENT is the client message. FRAME is where the mouse is now.
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index 699b2bf817e..73d0d45e9c1 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -5943,7 +5943,7 @@
5943 Vauto_file_coding_system. 5943 Vauto_file_coding_system.
5944 (syms_of_fileio): Adjusted for the above change. Doc change. 5944 (syms_of_fileio): Adjusted for the above change. Doc change.
5945 (Finsert_file_contents): The argument for Vset_auto_coding is a 5945 (Finsert_file_contents): The argument for Vset_auto_coding is a
5946 concatination of the heading 1K-byte and the tailing 3K-byte. 5946 concatenation of the heading 1K-byte and the tailing 3K-byte.
5947 5947
5948 * cmds.c (internal_self_insert): Only set TARGET_CLM when C2 is tab. 5948 * cmds.c (internal_self_insert): Only set TARGET_CLM when C2 is tab.
5949 When multibyte characters are disabled, 5949 When multibyte characters are disabled,
diff --git a/src/buffer.c b/src/buffer.c
index fdf006a41eb..90b43d29fc8 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4431,7 +4431,7 @@ static int mmap_initialized_p;
4431 is currently mapped. Used to prevent overwriting an existing 4431 is currently mapped. Used to prevent overwriting an existing
4432 memory mapping. 4432 memory mapping.
4433 4433
4434 Default is to conservativly assume the address range is occupied by 4434 Default is to conservatively assume the address range is occupied by
4435 something else. This can be overridden by system configuration 4435 something else. This can be overridden by system configuration
4436 files if system-specific means to determine this exists. */ 4436 files if system-specific means to determine this exists. */
4437 4437
diff --git a/src/character.c b/src/character.c
index c54c0046c53..a21760c8ab2 100644
--- a/src/character.c
+++ b/src/character.c
@@ -588,7 +588,7 @@ parse_str_as_multibyte (const unsigned char *str, EMACS_INT len,
588} 588}
589 589
590/* Arrange unibyte text at STR of NBYTES bytes as a multibyte text. 590/* Arrange unibyte text at STR of NBYTES bytes as a multibyte text.
591 It actually converts only such 8-bit characters that don't contruct 591 It actually converts only such 8-bit characters that don't construct
592 a multibyte sequence to multibyte forms of Latin-1 characters. If 592 a multibyte sequence to multibyte forms of Latin-1 characters. If
593 NCHARS is nonzero, set *NCHARS to the number of characters in the 593 NCHARS is nonzero, set *NCHARS to the number of characters in the
594 text. It is assured that we can use LEN bytes at STR as a work 594 text. It is assured that we can use LEN bytes at STR as a work
diff --git a/src/composite.h b/src/composite.h
index c57e2a0e9b3..60145b10bd9 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -41,7 +41,7 @@ enum composition_method {
41 COMPOSITION_NO 41 COMPOSITION_NO
42}; 42};
43 43
44/* Maximum number of compoments a single composition can have. */ 44/* Maximum number of components a single composition can have. */
45#define MAX_COMPOSITION_COMPONENTS 16 45#define MAX_COMPOSITION_COMPONENTS 16
46 46
47/* These macros access information about a composition that 47/* These macros access information about a composition that
diff --git a/src/font.h b/src/font.h
index e50eaff9a1f..42fc050b670 100644
--- a/src/font.h
+++ b/src/font.h
@@ -599,7 +599,7 @@ struct font_driver
599 599
600 /* Optional. 600 /* Optional.
601 Store bitmap data for glyph-code CODE of FONT in BITMAP. It is 601 Store bitmap data for glyph-code CODE of FONT in BITMAP. It is
602 intended that this method is callled from the other font-driver 602 intended that this method is called from the other font-driver
603 for actual drawing. */ 603 for actual drawing. */
604 int (*get_bitmap) (struct font *font, unsigned code, 604 int (*get_bitmap) (struct font *font, unsigned code,
605 struct font_bitmap *bitmap, 605 struct font_bitmap *bitmap,
diff --git a/src/fontset.c b/src/fontset.c
index d802d235962..34b2131832f 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1088,7 +1088,7 @@ fontset_pattern_regexp (Lisp_Object pattern)
1088 nescs++; 1088 nescs++;
1089 } 1089 }
1090 1090
1091 /* If PATTERN is not full XLFD we conert "*" to ".*". Otherwise 1091 /* If PATTERN is not full XLFD we convert "*" to ".*". Otherwise
1092 we convert "*" to "[^-]*" which is much faster in regular 1092 we convert "*" to "[^-]*" which is much faster in regular
1093 expression matching. */ 1093 expression matching. */
1094 if (ndashes < 14) 1094 if (ndashes < 14)
diff --git a/src/frame.h b/src/frame.h
index e096807b02e..a32d1c549b5 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -371,7 +371,7 @@ struct frame
371 if greater than 1, then the frame is obscured - we still consider 371 if greater than 1, then the frame is obscured - we still consider
372 it to be "visible" as seen from lisp, but we don't bother 372 it to be "visible" as seen from lisp, but we don't bother
373 updating it. We must take care to garbage the frame when it 373 updating it. We must take care to garbage the frame when it
374 ceaces to be obscured though. 374 ceases to be obscured though.
375 375
376 iconified is nonzero if the frame is currently iconified. 376 iconified is nonzero if the frame is currently iconified.
377 377
diff --git a/src/gtkutil.c b/src/gtkutil.c
index af697c72673..04104064096 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -891,7 +891,7 @@ xg_frame_resized (FRAME_PTR f, int pixelwidth, int pixelheight)
891 } 891 }
892} 892}
893 893
894/* Resize the outer window of frame F after chainging the height. 894/* Resize the outer window of frame F after changing the height.
895 COLUMNS/ROWS is the size the edit area shall have after the resize. */ 895 COLUMNS/ROWS is the size the edit area shall have after the resize. */
896 896
897void 897void
diff --git a/src/indent.h b/src/indent.h
index 07ca4dd87a5..55ee934f574 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -19,7 +19,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
19/* We introduce new member `tab_offset'. We need it because of the 19/* We introduce new member `tab_offset'. We need it because of the
20 existence of wide-column characters. There is a case that the 20 existence of wide-column characters. There is a case that the
21 line-break occurs at a wide-column character and the number of 21 line-break occurs at a wide-column character and the number of
22 colums of the line gets less than width. 22 columns of the line gets less than width.
23 23
24 Example (where W_ stands for a wide-column character): 24 Example (where W_ stands for a wide-column character):
25 ---------- 25 ----------
@@ -73,5 +73,3 @@ int disptab_matches_widthtab (struct Lisp_Char_Table *disptab,
73/* Recompute BUF's width table, using the display table DISPTAB. */ 73/* Recompute BUF's width table, using the display table DISPTAB. */
74void recompute_width_table (struct buffer *buf, 74void recompute_width_table (struct buffer *buf,
75 struct Lisp_Char_Table *disptab); 75 struct Lisp_Char_Table *disptab);
76
77
diff --git a/src/nsterm.m b/src/nsterm.m
index 7d26cba6d73..c5b28d57ac5 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4503,7 +4503,7 @@ ns_term_shutdown (int sig)
4503 //ns_app_active=YES; 4503 //ns_app_active=YES;
4504 4504
4505 ns_update_auto_hide_menu_bar (); 4505 ns_update_auto_hide_menu_bar ();
4506 // No constrining takes place when the application is not active. 4506 // No constraining takes place when the application is not active.
4507 ns_constrain_all_frames (); 4507 ns_constrain_all_frames ();
4508} 4508}
4509- (void)applicationDidResignActive: (NSNotification *)notification 4509- (void)applicationDidResignActive: (NSNotification *)notification
diff --git a/src/process.c b/src/process.c
index 301274676d6..9b15e4c56c0 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5377,8 +5377,8 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
5377 sending a multibyte text, thus we must encode it by the 5377 sending a multibyte text, thus we must encode it by the
5378 original coding system specified for the current process. 5378 original coding system specified for the current process.
5379 5379
5380 Another reason we comming here is that the coding system 5380 Another reason we come here is that the coding system
5381 was just complemented and new one was returned by 5381 was just complemented and a new one was returned by
5382 complement_process_encoding_system. */ 5382 complement_process_encoding_system. */
5383 setup_coding_system (p->encode_coding_system, coding); 5383 setup_coding_system (p->encode_coding_system, coding);
5384 Vlast_coding_system_used = p->encode_coding_system; 5384 Vlast_coding_system_used = p->encode_coding_system;
diff --git a/src/syssignal.h b/src/syssignal.h
index 7533a5a64fd..315400d8498 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -39,7 +39,7 @@ extern sigset_t empty_mask;
39 39
40/* POSIX pretty much destroys any possibility of writing sigmask as a 40/* POSIX pretty much destroys any possibility of writing sigmask as a
41 macro in standard C. We always define our own version because the 41 macro in standard C. We always define our own version because the
42 predefined macro in Glibc 2.1 is only provided for compatility for old 42 predefined macro in Glibc 2.1 is only provided for compatibility for old
43 programs that use int as signal mask type. */ 43 programs that use int as signal mask type. */
44#undef sigmask 44#undef sigmask
45#ifdef __GNUC__ 45#ifdef __GNUC__
diff --git a/src/xdisp.c b/src/xdisp.c
index 15355e2d47a..6b9270b7e80 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28447,7 +28447,7 @@ To add a prefix to continuation lines, use `wrap-prefix'. */);
28447 DEFVAR_INT ("overline-margin", overline_margin, 28447 DEFVAR_INT ("overline-margin", overline_margin,
28448 doc: /* *Space between overline and text, in pixels. 28448 doc: /* *Space between overline and text, in pixels.
28449The default value is 2: the height of the overline (1 pixel) plus 1 pixel 28449The default value is 2: the height of the overline (1 pixel) plus 1 pixel
28450margin to the caracter height. */); 28450margin to the character height. */);
28451 overline_margin = 2; 28451 overline_margin = 2;
28452 28452
28453 DEFVAR_INT ("underline-minimum-offset", 28453 DEFVAR_INT ("underline-minimum-offset",
diff --git a/src/xfaces.c b/src/xfaces.c
index 0ed6fa1d8e2..849ad6bbdf4 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4189,12 +4189,12 @@ prepare_face_for_display (struct frame *f, struct face *face)
4189static int 4189static int
4190color_distance (XColor *x, XColor *y) 4190color_distance (XColor *x, XColor *y)
4191{ 4191{
4192 /* This formula is from a paper title `Colour metric' by Thiadmer Riemersma. 4192 /* This formula is from a paper titled `Colour metric' by Thiadmer Riemersma.
4193 Quoting from that paper: 4193 Quoting from that paper:
4194 4194
4195 This formula has results that are very close to L*u*v* (with the 4195 This formula has results that are very close to L*u*v* (with the
4196 modified lightness curve) and, more importantly, it is a more even 4196 modified lightness curve) and, more importantly, it is a more even
4197 algorithm: it does not have a range of colours where it suddenly 4197 algorithm: it does not have a range of colors where it suddenly
4198 gives far from optimal results. 4198 gives far from optimal results.
4199 4199
4200 See <http://www.compuphase.com/cmetric.htm> for more info. */ 4200 See <http://www.compuphase.com/cmetric.htm> for more info. */
diff --git a/src/xselect.c b/src/xselect.c
index adee1872dba..4bfab4143cc 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2355,7 +2355,7 @@ x_fill_property_data (Display *dpy, Lisp_Object data, void *ret, int format)
2355 F is the frame to be used to look up X atoms if the TYPE is XA_ATOM. 2355 F is the frame to be used to look up X atoms if the TYPE is XA_ATOM.
2356 DATA is a C array of values to be converted. 2356 DATA is a C array of values to be converted.
2357 TYPE is the type of the data. Only XA_ATOM is special, it converts 2357 TYPE is the type of the data. Only XA_ATOM is special, it converts
2358 each number in DATA to its corresponfing X atom as a symbol. 2358 each number in DATA to its corresponding X atom as a symbol.
2359 FORMAT is 8, 16 or 32 and gives the size in bits for each C value to 2359 FORMAT is 8, 16 or 32 and gives the size in bits for each C value to
2360 be stored in RET. 2360 be stored in RET.
2361 SIZE is the number of elements in DATA. 2361 SIZE is the number of elements in DATA.
diff --git a/src/xsettings.c b/src/xsettings.c
index d57f3b5be81..a8604ac5897 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -121,7 +121,7 @@ store_font_name_changed (const char *newfont)
121} 121}
122#endif /* HAVE_XFT */ 122#endif /* HAVE_XFT */
123 123
124/* Map TOOL_BAR_STYLE from a string to its correspinding Lisp value. 124/* Map TOOL_BAR_STYLE from a string to its corresponding Lisp value.
125 Return Qnil if TOOL_BAR_STYLE is not known. */ 125 Return Qnil if TOOL_BAR_STYLE is not known. */
126 126
127static Lisp_Object 127static Lisp_Object
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 55daec73307..7deac7b14e4 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -462,7 +462,7 @@ x_session_initialize (struct x_display_info *dpyinfo)
462 Vx_session_id = build_string (client_id); 462 Vx_session_id = build_string (client_id);
463 463
464#ifdef USE_GTK 464#ifdef USE_GTK
465 /* GTK creats a leader window by itself, but we need to tell 465 /* GTK creates a leader window by itself, but we need to tell
466 it about our client_id. */ 466 it about our client_id. */
467 gdk_x11_set_sm_client_id (client_id); 467 gdk_x11_set_sm_client_id (client_id);
468#else 468#else
diff --git a/test/cedet/semantic-tests.el b/test/cedet/semantic-tests.el
index c840993bf24..16dcd42c2ae 100644
--- a/test/cedet/semantic-tests.el
+++ b/test/cedet/semantic-tests.el
@@ -54,7 +54,7 @@ All systems are different. Ask questions along the way."
54 (y-or-n-p "New database created. Reload system databases? ") 54 (y-or-n-p "New database created. Reload system databases? ")
55 (y-or-n-p "Load in all system databases? ")) 55 (y-or-n-p "Load in all system databases? "))
56 (semanticdb-load-ebrowse-caches))) 56 (semanticdb-load-ebrowse-caches)))
57 ;; Ok, databases were creatd. Lets try some searching. 57 ;; Ok, databases were created. Let's try some searching.
58 (when (not (or (eq major-mode 'c-mode) 58 (when (not (or (eq major-mode 'c-mode)
59 (eq major-mode 'c++-mode))) 59 (eq major-mode 'c++-mode)))
60 (error "Please make your default buffer be a C or C++ file, then 60 (error "Please make your default buffer be a C or C++ file, then
@@ -387,4 +387,3 @@ gcc version 2.95.2 19991024 (release)"
387 (let ((semantic-gcc-test-strings (list (semantic-gcc-query "gcc" "-v")))) 387 (let ((semantic-gcc-test-strings (list (semantic-gcc-query "gcc" "-v"))))
388 (semantic-gcc-test-output-parser)) 388 (semantic-gcc-test-output-parser))
389 ) 389 )
390