From: Paul Eggert Date: Tue, 15 Nov 2011 07:55:13 +0000 (-0800) Subject: Spelling fixes. X-Git-Tag: emacs-pretest-24.0.92~179 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=da6062e6ea440f6cd68db251390fcb91450103ba;p=emacs.git Spelling fixes. --- 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. The charset map files directory -This directory contains two kinds of charse map files; verbatim copies +This directory contains two kinds of charset map files; verbatim copies (or their compressed versions) of files freely available in the Internet, and newly created files based on freely available information. 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 @@ # where XXXX is the code point. Including all these # names in this file increases its size substantially # and needlessly. The token "" is used for the -# name of these chracters. If necessary, it can be +# name of these characters. If necessary, it can be # expanded algorithmically by a parser or editor. # # 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. @item unchanged_modified @itemx overlay_unchanged_modified The values of @code{modiff} and @code{overlay_modiff}, respectively, -after the last compelete redisplay. If their current values match +after the last complete redisplay. If their current values match @code{modiff} or @code{overlay_modiff}, that means @code{beg_unchanged} and @code{end_unchanged} contain no useful information. 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' counterintuitive cr creatable -customie +customize deactivate deactivated deassigns 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: @node Methods and Signal @section Applying the functionality. -Methods and signals are the communicatione means to D-Bus. The +Methods and signals are the communication means to D-Bus. The following functions return their specifications. @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: (defun MY-LOAD (dir) "Load a project of type `cpp-root' for the directory DIR. Return nil if there isn't one." - ;; Use your preferred constructin method here. + ;; Use your preferred construction method here. (ede-cpp-root-project "NAME" :file (expand-file-name "FILE" dir) :locate-fcn 'MYFCN) ) @@ -3370,7 +3370,7 @@ Type: @code{(or null string)} @* Default Value: @code{nil} Emacs regex matching auxiliary source code this target accepts. -Aux source are source code files needed for compilation, which are not comiled +Aux source are source code files needed for compilation, which are not compiled themselves. @refill 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. You can customize the value of the @code{mml-enable-flowed} variable to enable or disable the flowed encoding usage when newline -characteres are present in the buffer. +characters are present in the buffer. On decoding flowed text, lines with soft newline characters are filled together 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. This implies that it's not possible to have more than one article buffer in a group at a time. But sometimes you might want to display all the latest emails from your mother, your father, your aunt, your uncle and -your 17 cousins to coordinate the next christmas party. +your 17 cousins to coordinate the next Christmas party. That's where sticky articles come in handy. A sticky article buffer basically 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 @@ @c orgkey{key} A key item @c orgcmd{key,cmd} Key with command name -@c xorgcmd{key,cmmand} Key with command name as @itemx +@c xorgcmd{key,command} Key with command name as @itemx @c orgcmdnki{key,cmd} Like orgcmd, but do not index the key @c orgcmdtkc{text,key,cmd} Like orgcmd,special text instead of key @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 broad range of other applications. @LaTeX{} export lets you use Org-mode and its structured editing functions to easily create @LaTeX{} files. DocBook export makes it possible to convert Org files to many other formats using -DocBook tools. OpenDocumentText export allows seamless colloboration across +DocBook tools. OpenDocumentText export allows seamless collaboration across organizational boundaries. For project management you can create gantt and resource charts by using TaskJuggler export. To incorporate entries with associated 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. ** If possible, re-use channel buffers when reconnecting to a server. ** Text in ERC buffers is now read-only by default. -To get the previous behavior, +To get the previous behavior, ** Changes and additions to modules @@ -1280,7 +1280,7 @@ in XEmacs. the variable `erc-modules' and define once and for all which extension modules you want to use. This unfortunately may require you to change your current erc initialisation code a bit, if you - have some existing customsations. On the other hand, this change + have some existing customizations. On the other hand, this change makes the configuration of extension modules a lot easier for new users. In theory, you should be able to configure all aspects of ERC by using the customize interface, you should no longer really @@ -1342,4 +1342,3 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - 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. * Interface to MH mail system. mh-e is a front end for GNU emacs and the MH mail system. It -provides a friendly and convient interface to the MH commands. +provides a friendly and convenient interface to the MH commands. To read mail, invoke mh-rmail. This will inc new mail and display the scan 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). *** If Emacs was invoked with the `-q' or `--no-init-file' options, it does not allow you to save customizations in your `~/.emacs' init file. This is because saving customizations from such a session would -wipe out all the other customizationss you might have on your init +wipe out all the other customizations you might have on your init file. ** 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. Release History --------------- -1990-1992 1.0-3.0 (?) Michael Brouwer's socket/terminal communication +1990-1992 1.0-3.0 (?) Michael Brouwer's socket/terminal communication based version (GUI ran as a separate process.) 1993/10/25 3.0.1 Last (?) release of Brouwer version. Supports @@ -126,7 +126,7 @@ Release History rendering for synthetic italic fonts. Further improved menu parsing. Use system highlight color. Added previous- and next-mark history - navigation commmands bound to M-p,M-n. + navigation commands bound to M-p,M-n. Miscellaneous bug fixes. 2005/08/04 8.0-rc5 All internal string handling changed to UTF-8. @@ -146,7 +146,7 @@ Release History handling now added. Transparency (e.g., M-x set-background-color ARGB88FFFFFF) improved: only the background is made transparent. - Cursor drawing glitches fixed. Preferences + Cursor drawing glitches fixed. Preferences handling improved. Fixed some portability problems on Tiger and Puma. @@ -185,7 +185,7 @@ Release History rendering, pasting, Color panel. Added function ns-set-background-alpha to work around inability to customize with numeric colors. - + 2006/12/24 9.0-rc1 Reworked font handling and text rendering to use Kenichi Handa's new font back-end system. 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 @@ All *.tit files in this directory are dictionary files to use with -the program cxterm. Their source and copyright status are categorised +the program cxterm. Their source and copyright status are categorized into these four groups. (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 @@ The source and copyright status of dictionary files in this directory -are categorised into these three groups. +are categorized into these three groups. (1) cangjie-table.b5 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 @@ ;; in typewriters for ages but it has been superseded on desktops by ;; a variation of this layout, implemented in M$ Windows software. ;; The Windows layout is greatly preferred because of the comma and -;; period being placed more conviniently and, of course, because of +;; period being placed more conveniently and, of course, because of ;; the popularity of Windows software. This layout is a common option ;; in X Windows and console layouts for GNU/Linux. [See ;; `russian-computer' below.] @@ -163,7 +163,7 @@ ;; commented out because quail-update-leim-list-file ignores ;; commented-out lines. (if nil - (quail-define-package + (quail-define-package "cyrillic-jcuken" "Russian" ",L69(B" nil ",L9FC:5=(B Russian typewriter layout (ISO 8859-5 encoding).")) 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.") ("P" "ɸ") ;; Voiceless bilabial fricative U+0278 ("Q" "ɣ") ;; Voiced velar fricative U+0263 ("R" ["ʀ" ;; Alveolar trill U+0280 - "ɚ"]) ;; Rhotacised schwa U+025A - ("@" "ɚ") ;; Mid central rhotacised vowel U+025A + "ɚ"]) ;; Rhotacized schwa U+025A + ("@" "ɚ") ;; Mid central rhotacized vowel U+025A ("S" "ʃ") ;; Voiceless postalveolar fricative U+0283 ("tS" ["ʧ" ;; Voiceless postalveolar affricate U+02A7 "tʃ" ;; U+0074 U+0283 @@ -176,13 +176,13 @@ incorrectly, as separate from the modified glyphs.") ("." "̣") ;; +Retroflex modifier U+0323 ("`" "ʼ") ;; +Ejective modifier U+02BC ("[" "̪") ;; +Dental modifier U+032A - (";" "ʲ") ;; +Palatalised modifier U+02B2 - ("" "̴") ;; +Pharyngealised modifier U+0334 + (";" "ʲ") ;; +Palatalized modifier U+02B2 + ("" "̴") ;; +Pharyngealized modifier U+0334 ("" "ʰ") ;; +Aspirated modifier U+02B0 ("" ["̥" ;; +Voiceless modifier U+0325 "˚"]) ;; +Unexploded modifier U+02DA - ("" "ʳ") ;; +Rhotacised modifier U+02B3 - ("" "ʷ") ;; +Labialised modifier U+02B7 + ("" "ʳ") ;; +Rhotacized modifier U+02B3 + ("" "ʷ") ;; +Labialized modifier U+02B7 ("" "ʱ") ;; +Murmured modififer U+02B1 ("b" "ʙ") ;; Bilabial trill U+0299 @@ -237,7 +237,7 @@ incorrectly, as separate from the modified glyphs.") ("u\"" "ʉ") ;; High central rounded vowel U+0289 ("@" "ɘ") ;; Upper-mid central unrounded vowel U+0258 - ("R" "ɝ") ;; Upper-mid central rhotacised vowel U+025D + ("R" "ɝ") ;; Upper-mid central rhotacized vowel U+025D ("@." "ɵ") ;; Mid central rounded vowel U+0275 ("V\"" "ɜ") ;; Lower-mid central unrounded vowel U+025C @@ -416,7 +416,7 @@ displays them, incorrectly, as separate from the modified glyphs.") (":\\" "ˑ") ;; Half-long U+02D1 ("@" "ə") ;; Schwa U+0259 ("@\\" "ɘ") ;; Close-mid central unrounded vowel U+0258 - ("@`" "ɚ") ;; Rhotacised schwa U+025A + ("@`" "ɚ") ;; Rhotacized schwa U+025A ("{" "æ") ;; Near-open front unrounded vowel U+00E6 ("}" "ʉ") ;; Close central rounded vowel U+0289 ("1" "ɨ") ;; Close central unrounded vowel U+0268 @@ -424,7 +424,7 @@ displays them, incorrectly, as separate from the modified glyphs.") ("3" "ɜ") ;; Open-mid central unrounded vowel U+025C ("3\\" "ɞ") ;; Open-mid central rounded vowel U+025E ("4" "ɾ") ;; Alveolar flap U+027E - ("5" "ɫ") ;; Velarised alveolar lateral approximant U+026B + ("5" "ɫ") ;; Velarized alveolar lateral approximant U+026B ("6" "ɐ") ;; Near-open central vowel U+0250 ("7" "ɤ") ;; Close-mid back unrounded vowel U+0264 ("8" "ɵ") ;; Close-mid central rounded vowel U+0275 @@ -459,7 +459,7 @@ displays them, incorrectly, as separate from the modified glyphs.") ("_=" "̩") ;; Syllabic U+0329 ("=" "̩") ;; Syllabic U+0329 ("_>" "ʼ") ;; Ejective U+02BC - ("_?\\" "ˤ") ;; Pharyngealised U+02E4 + ("_?\\" "ˤ") ;; Pharyngealized U+02E4 ("_\\" "ˆ") ;; Falling Tone U+02C6 ("_^" "̯") ;; Non-syllabic U+032F ("_}" "̚") ;; No audible release U+031A @@ -473,17 +473,17 @@ displays them, incorrectly, as separate from the modified glyphs.") ;; _B_L omitted, no Unicode code point for "low rising tone." ("_c" "̜") ;; Less rounded U+031C ("_d" "̪") ;; Dental U+032A - ("_e" "̴") ;; Velarised or pharyngeal U+0334 + ("_e" "̴") ;; Velarized or pharyngeal U+0334 ("" "↙") ;; Global fall; SOUTH EAST ARROW; may be a bit smaller than ;; intended. ("_F" "̂") ;; Falling tone U+0302 - ("_G" "ˠ") ;; Velarised U+02E0 + ("_G" "ˠ") ;; Velarized U+02E0 ("_H" "́") ;; High tone U+0301 ;; "_H_T omitted, no Unicode code point for "high rising tone" ("_h" "ʰ") ;; Aspirated U+02B0 - ("_j" "ʲ") ;; Palatalised U+02B2 - ("'" "ʲ") ;; Palatalised U+02B2 + ("_j" "ʲ") ;; Palatalized U+02B2 + ("'" "ʲ") ;; Palatalized U+02B2 ("_k" "̰") ;; Creaky voice U+0330 ("_L" "̀") ;; Low tone U+0300 ("_l" "ˡ") ;; Lateral release U+02E1 @@ -501,9 +501,9 @@ displays them, incorrectly, as separate from the modified glyphs.") ("_T" "̋") ;; Extra high tone U+030B ("_t" "̤") ;; Breathy voice U+0324 ("_v" "̬") ;; Voiced U+032C - ("_w" "ʷ") ;; Labialised U+02B7 + ("_w" "ʷ") ;; Labialized U+02B7 ("_X" "̆") ;; Extra-short U+0306 - ("_x" "̽")) ;; Mid-centralised U+033D + ("_x" "̽")) ;; Mid-centralized U+033D ;; Putting in place rules for the implosives like for the others above ;; breaks the "_" 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 @@ Also clean up the code slightly. * progmodes/grep.el (rgrep): Don't bind `process-connection-type', - because that makes the colours go away. + because that makes the colors go away. * mail/sendmail.el (send-mail-function): Change the default to `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." (defun allout-range-overlaps (from to ranges) "Return a pair indicating overlap of FROM and TO subtree range in RANGES. -First element of result indicates whether candadate range FROM, TO +First element of result indicates whether candidate range FROM, TO overlapped any of the existing ranges. Second 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)." (or (math-lessp acoeff bcoeff) (math-equal acoeff bcoeff))) (calc-record-why "*Improper coefficients" nil) - (math-mul + (math-mul (if (equal aunit '(var dB var-dB)) (let ((coef (if power 10 20))) (math-mul coef @@ -1681,7 +1681,7 @@ In symbolic mode, return the list (^ a b)." (math-simplify (math-mul (math-add - coef + coef (math-mul (if power 10 20) (math-conditional-apply 'calcFunc-log10 number))) units))) @@ -1689,7 +1689,7 @@ In symbolic mode, return the list (^ a b)." (math-simplify (math-mul (math-add - coef + coef (math-div (math-conditional-apply 'calcFunc-ln number) (if power 2 1))) units)))) (calc-record-why "*Improper units" nil)))) @@ -1707,7 +1707,7 @@ In symbolic mode, return the list (^ a b)." (math-simplify (math-mul (math-sub - coef + coef (math-mul (if power 10 20) (math-conditional-apply 'calcFunc-log10 b))) units))) @@ -1715,7 +1715,7 @@ In symbolic mode, return the list (^ a b)." (math-simplify (math-mul (math-sub - coef + coef (math-div (math-conditional-apply 'calcFunc-ln b) (if power 2 1))) units))))))))) @@ -1762,17 +1762,17 @@ In symbolic mode, return the list (^ a b)." (coeff (math-simplify (math-div val units)))) (math-mul (if (equal lunit '(var dB var-dB)) - (math-mul + (math-mul ref - (math-conditional-pow + (math-conditional-pow 10 (math-div coeff (if power 10 20)))) - (math-mul + (math-mul ref (math-conditional-apply 'calcFunc-exp - (if power + (if power (math-mul 2 coeff) coeff)))) runits))))) @@ -1869,7 +1869,7 @@ In symbolic mode, return the list (^ a b)." (let* ((n (math-round num)) (diff (math-abs (math-sub num n)))) - (if (< (math-compare diff + (if (< (math-compare diff (math-div (math-read-expr calc-note-threshold) 100)) 0) n num))) @@ -1927,10 +1927,10 @@ If non-nil, return a list consisting of the note and the cents coefficient." (assoc (nth 1 note) math-notes) (integerp (nth 2 note)) (setq rnote note) - (or + (or (not cents) (Math-numberp (setq rcents - (math-simplify + (math-simplify (math-div cents '(var cents var-cents))))))) (list rnote rcents)) ((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." (assoc (nth 1 cents) math-notes) (integerp (nth 2 cents)) (setq rnote cents) - (or + (or (not note) (Math-numberp (setq rcents - (math-simplify + (math-simplify (math-div note '(var cents var-cents))))))) (list rnote rcents))))) @@ -1972,7 +1972,7 @@ If non-nil, return a list consisting of the note and the cents coefficient." "Return the scientific pitch notation corresponding to midi number MIDI." (let (midin cents) (if (math-integerp midi) - (setq midin midi + (setq midin midi cents nil) (setq midin (math-floor midi) 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." (n (math-sub (car nr) 1)) (note (car (rassoc (cdr nr) math-notes)))) (if cents - (list '+ (list 'calcFunc-subscr note n) + (list '+ (list 'calcFunc-subscr note n) (list '* cents '(var cents var-cents))) (list 'calcFunc-subscr note n))))) @@ -2005,7 +2005,7 @@ If non-nil, return a list consisting of the note and the cents coefficient." 440 (math-pow 2 - (math-div + (math-div (math-sub midi 69) @@ -2018,7 +2018,7 @@ If non-nil, return a list consisting of the note and the cents coefficient." (defun calcFunc-spn (expr) "Return EXPR written as scientific pitch notation + cents." - ;; Get the coeffecient of Hz + ;; Get the coefficient of Hz (let (note) (cond ((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 @@ ;; TODO is a major mode for EMACS which offers functionality to ;; treat most lines in one buffer as a list of items one has to ;; do. There are facilities to add new items, which are -;; categorised, to edit or even delete items from the buffer. +;; categorized, to edit or even delete items from the buffer. ;; The buffer contents are currently compatible with the diary, ;; so that the list of todo-items will show up in the FANCY diary ;; mode. @@ -536,7 +536,7 @@ Use `todo-categories' instead.") (unless (zerop (buffer-size buf)) (and (null todo-categories) (null todo-cats) - (error "Error in %s: File is non-empty but contains no category" + (error "Error in %s: File is non-empty but contains no category" todo-file-do))) (unless cat (setq cat (read-from-minibuffer prompt))) (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." (defun data-debug-line-expandable-p () "Return non-nil if the current line is expandable. -Lines that are not expandable are assumed to not be contractable." +Lines that are not expandable are assumed to not be contractible." (not (get-text-property (point) 'ddebug-noexpand))) (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 @@ ;;; Customization Commands ;; -;; These commands initialize custoization of EDE control objects. +;; These commands initialize customization of EDE control objects. ;;;###autoload (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 @@ ;; Since these projects are all so increadibly generic, a user will ;; need to configure some aspects of the project by hand. In order to ;; enable this without configuring the project objects directly (which -;; are auto-generated) a special ede-generic-confg object is defined to +;; are auto-generated) a special ede-generic-config object is defined to ;; hold the basics. Generic projects will identify and use these ;; config files. ;; @@ -105,7 +105,7 @@ :group (default build) :documentation "Command used for debugging this project.") - ;; C target customixations + ;; C target customizations (c-include-path :initarg :c-include-path :initform nil :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." If a given set of projects has already been loaded, then do nothing but return the project for the directory given. Optional ROOTPROJ is the root EDE project." - (let* ((ede-constructiong t) + (let* ((ede-constructing t) (amo (object-assoc (expand-file-name "Makefile.am" directory) 'file ede-projects))) (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." (let ((file (ede-find-nearest-file-line))) (speedbar-find-file-in-frame file) (save-excursion (speedbar-stealthy-updates)) - ;; Reset the timer with a new timeout when cliking a file + ;; Reset the timer with a new timeout when clicking a file ;; in case the user was navigating directories, we can cancel ;; that other timer. ; (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." :visible semantic-mode :button (:toggle . global-semanticdb-minor-mode)))) -;; The `semantic-mode' command, in conjuction with the +;; The `semantic-mode' command, in conjunction with the ;; `semantic-default-submodes' variable, toggles Semantic's various ;; auxiliary minor modes. 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.") (prefixclass :initarg :prefixclass :type list :documentation "Tag classes expected at this context. -These are clases for tags, such as 'function, or 'variable.") +These are classes for tags, such as 'function, or 'variable.") (prefixtypes :initarg :prefixtypes :type list :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: ;; Reset c. (setq c nil) - ;; Loop over all the found matches, and catagorize them + ;; Loop over all the found matches, and categorize them ;; as being possible features. (while (and loopc do-typeconstraint) 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." (define-mode-local-override semantic-format-tag-canonical-name c-mode (tag &optional parent color) - "Create a cannonical name for TAG. + "Create a canonical name for TAG. PARENT specifies a parent class. COLOR indicates that the text should be type colorized. Enhances 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." ;; Try an Emacs 22 fcn. This throws errors. (find-library-name (semantic-tag-name tag)) (error - (message "semantic: connot find source file %s" + (message "semantic: cannot find source file %s" (semantic-tag-name tag)))) ;; No handy function available. (Older Emacsen) (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'." ;; Feb 06 - ;; IDed when the first cache-list tag is after ;; our change, meaning there is nothing before - ;; the chnge. + ;; the change. ((> (semantic-tag-start (car cache-list)) (semantic-overlay-end (car changes))) (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 in the new list. If optional argument SEARCH-PARTS is non-nil, all sub-parts of tags -are searched. The overloadable function `semantic-tag-componenets' is +are searched. The overloadable function `semantic-tag-components' is used for the searching child lists. If SEARCH-PARTS is the symbol 'positiononly, then only children that have positional information are searched. 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 \"(\": ;;; Lexical Safety ;; ;; The semantic lexers, unlike other lexers, can throw errors on -;; unbalanced syntax. Since editing is all about changeging test +;; unbalanced syntax. Since editing is all about changing text ;; we need to provide a convenient way to protect against syntactic ;; inequalities. 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." (save-excursion (speedbar-stealthy-updates)) (semantic-go-to-tag token parent) (switch-to-buffer (current-buffer)) - ;; Reset the timer with a new timeout when cliking a file + ;; Reset the timer with a new timeout when clicking a file ;; in case the user was navigating directories, we can cancel ;; that other timer. ;; (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." (define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer) "Return the fully qualified name of TAG in the package hierarchy. -STREAM-OR-BUFFER can be anything convertable by `semantic-something-to-stream', +STREAM-OR-BUFFER can be anything convertible by `semantic-something-to-stream', but must be a toplevel semantic tag stream that contains TAG. A Package Hierarchy is defined in UML by the way classes and methods are 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 @@ The compiled template can contain lists of section dictionaries, or values that are expected to be passed down into different section macros. The template section dictionaries are merged in with -any incomming dictionaries values.") +any incoming dictionaries values.") (binding :initarg :binding :documentation "Preferred keybinding for this template in `srecode-minor-mode-map'.") @@ -552,7 +552,7 @@ A list of defined variables VARS provides a variable table." (when (not hs) (setq hs (make-hash-table :test 'equal :size 20)) (puthash context hs contexthash)) - ;; Put into that contenxt's hash. + ;; Put into that context's hash. (puthash objname (car lp) hs) ) 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." ("str\\(ing\\)?" . "string") ("use?r" . "user") ("num\\(ber\\)?" . "number") - ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;commen sylable + ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;common sylable ) "List of common English abbreviations or full words. These 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'." (if (and (> count 1) (called-interactively-p 'interactive)) (message "Buffer includes %d directories" count))) ;; We don't need to sort it because it is in buffer order per - ;; constructionem. Return new alist: + ;; construction. Return new alist: dired-subdir-alist)) (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." (set-buffer-modified-p changed)))) (defun testcover-mark-all (&optional buffer) - "Mark all forms in BUFFER that did not get completley tested during + "Mark all forms in BUFFER that did not get completely tested during coverage tests. This function creates many overlays." (interactive "bMark forms in buffer: ") (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." (char-to-string (char-before)))) ;; allow \\ to mean a literal "\" character followed by a ;; normal return, rather than a backslash followed by a line - ;; continuator (i.e., "\\ + \n" rather than "\ + \\n"). This + ;; continuation (i.e., "\\ + \n" rather than "\ + \\n"). This ;; is necessary because backslashes in Eshell are not special ;; unless they either precede something special, or precede a ;; 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." ;;; Manipulating font names. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; This is here for compatibilty with Emacs 20.2. For example, +;; This is here for compatibility with Emacs 20.2. For example, ;; international/fontset.el uses x-resolve-font-name. The following ;; functions are not used in the face implementation itself. 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 @@ ;; (setq pixel-vertical-clip-threshold 30) -;; The correct way to configurate Follow mode, or any other mode for +;; The correct way to configure Follow mode, or any other mode for ;; that matter, is to create one or more functions that do ;; whatever you would like to do. These functions are then added to ;; a hook. @@ -894,7 +894,7 @@ Returns (end-pos end-of-buffer-p)" (save-restriction ;; Fix a mis-feature in `vertical-motion': ;; The start of the window is assumed to - ;; coinside with the start of a line. + ;; coincide with the start of a line. (narrow-to-region (point) (point-max)) (not (= height (vertical-motion height)))))) (list (point) buffer-end-p)))))) @@ -1064,7 +1064,7 @@ Return the selected window." ;; it wasn't just moved here. (I.e. M-> shall not unconditionally place ;; the point in the selected window.) ;; -;; (Compatibility cludge: in Emacs `window-end' is equal to `point-max'; +;; (Compatibility kludge: in Emacs `window-end' is equal to `point-max'; ;; in XEmacs, it is equal to `point-max + 1'. Should I really bother ;; checking `window-end' now when I check `end-of-buffer' explicitly?) 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 @@ * gnus-sum.el (gnus-user-date): Rename back from gnus-summary-user-date since user code refers to it. - * shr.el (shr-render-td): Store the actual background colour used. + * shr.el (shr-render-td): Store the actual background color used. * message.el (message-setup-1): Don't bind the constant -forbidden-properties. @@ -2653,9 +2653,9 @@ 2011-02-01 Lars Ingebrigtsen - * shr.el (shr-render-td): Only do colours at the final rendering. + * shr.el (shr-render-td): Only do colors at the final rendering. Should be slightly faster. - (shr-insert-table): Fix up TD background colours when doing the + (shr-insert-table): Fix up TD background colors when doing the vertical padding. * gnus-art.el (article-date-ut): Protect against articles with no Date @@ -2783,7 +2783,7 @@ 2011-01-27 Lars Ingebrigtsen - * shr.el (shr-put-color): Special-case background colours: Do put them + * shr.el (shr-put-color): Special-case background colors: Do put them at the blank parts at the front of the lines. * gnus-draft.el (gnus-draft-clear-marks): New function to be run as an @@ -3788,7 +3788,7 @@ 2010-11-25 Lars Magne Ingebrigtsen - * shr-color.el (shr-color-visible): Don't bug out if the colour names + * shr-color.el (shr-color-visible): Don't bug out if the color names don't exist. 2010-11-25 Katsumi Yamaoka @@ -3860,7 +3860,7 @@ 2010-11-24 Lars Magne Ingebrigtsen - * shr.el (shr-color-check): Protect against non-existent colour names. + * shr.el (shr-color-check): Protect against non-existent color names. 2010-11-24 Julien Danjou @@ -3886,7 +3886,7 @@ 2010-11-23 Lars Magne Ingebrigtsen * shr.el (shr-insert-color-overlay): Split stuff like - "#444444 !important" to find the real colour. + "#444444 !important" to find the real color. (shr-tag-font): Resurrect shr-tag-font again, since it's needed to parse entries. @@ -5997,15 +5997,15 @@ highlight again, so that the highlight is correct. * gnus-picon.el (gnus-picon): Remove again. - (gnus-picon-create-glyph): Set the background XPM colour explicitly. + (gnus-picon-create-glyph): Set the background XPM color explicitly. * gnus-art.el (gnus-treatment-function-alist): Insert picons after - doing the header highlightling, so that the background colour of the + doing the header highlightling, so that the background color of the picon is correct. * gnus-picon.el (gnus-picon-xbm): Remove obsolete face. (gnus-picon): Ditto. - (gnus-picon): Reinstate. The background colour for picons is white. + (gnus-picon): Reinstate. The background color for picons is white. (gnus-picon-insert-glyph): Make the background white. * nnml.el (nnml-open-nov): Don't return dead buffers. @@ -7417,7 +7417,7 @@ UTF-8. This seems to fix problems with some German web feeds. * gnus.el (gnus-group-startup-message): Put the xpm version of the logo - at the top so that the proper colours are applied. + at the top so that the proper colors are applied. * gnus-art.el (gnus-article-view-part): Doc fix. 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." ;; :mouse-2 command-on-mouse-2-press ;; :mouse-3 command-on-mouse-3-press) ;; typically a menu of related commands ;; -;; Combinations of mouse-[23] plus shift and/or controll might be overkill. +;; Combinations of mouse-[23] plus shift and/or control might be overkill. ;; ;; Then use (plist-get rs-command :none), (plist-get rs-command :shift) 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." (filter &optional host attributes attrsonly withdn)) (defun smime-cert-by-ldap-1 (mail host) - "Get cetificate for MAIL from the ldap server at HOST." + "Get certificate for MAIL from the ldap server at HOST." (let ((ldapresult (funcall (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: ** Information on Filtering: - You can filter your ibuffer view via different critera. Each Ibuffer + You can filter your ibuffer view via different criteria. Each Ibuffer buffer has its own stack of active filters. For example, suppose you are working on an Emacs Lisp project. You can create an Ibuffer buffer 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 @@ ;; The highlighting of matching items is controlled via ido-use-faces. ;; The faces used are ido-first-match, ido-only-match and ;; ido-subdir. -;; Colouring of the matching item was suggested by +;; Coloring of the matching item was suggested by ;; Carsten Dominik (dominik@strw.leidenuniv.nl). ;; Replacement for read-buffer and read-file-name @@ -3152,7 +3152,7 @@ for first matching file." ;;; CREATE LIST OF ALL CURRENT FILES (defun ido-all-completions () - ;; Return unsorted list of all competions. + ;; Return unsorted list of all completions. (let ((ido-process-ignore-lists nil) (ido-directory-too-big nil)) (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.") ;; Tai Viet (let ((deflist '(;; chars syntax category - ((?ꪀ. ?ꪯ) "w" ?0) ; cosonant + ((?ꪀ. ?ꪯ) "w" ?0) ; consonant ("ꪱꪵꪶ" "w" ?1) ; vowel base ((?ꪹ . ?ꪽ) "w" ?1) ; vowel base ("ꪰꪲꪳꪷꪸꪾ" "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 @@ ;; Font-Lock ;; font-lock is used to highlight the first matching buffer. To -;; switch this off, set (setq iswitchb-use-faces nil). Colouring of +;; switch this off, set (setq iswitchb-use-faces nil). Coloring of ;; the matching buffer name was suggested by Carsten Dominik ;; (dominik@strw.leidenuniv.nl) 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 @@ ;; for FQM files if you're a VM user ;; change buffer-substring calls to buffer-substring-no-properties for ;; speed-up (suggested by Howard Melman ) -;; feedmail-sendmail-f-doesnt-sell-me-out to contol "-f" in call to sendmail +;; feedmail-sendmail-f-doesnt-sell-me-out to control "-f" in call to sendmail ;; in feedmail-buffer-to-sendmail ;; better trapping of odd conditions during the running of the queue; ;; thanks to Yigal Hochberg for helping me test much of this by remote @@ -2410,7 +2410,7 @@ mapped to mostly alphanumerics for safety." (a-re-dtcb "^\\(To\\|Cc\\|Bcc\\):") (a-re-dtc "^\\(To\\|Cc\\):") (a-re-db "^Bcc:") - ;; to get a temporary changable copy + ;; to get a temporary changeable copy (mail-header-separator mail-header-separator) ) (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 @@ -;;; mh-compat.el --- make MH-E compatibile with various versions of Emacs +;;; mh-compat.el --- make MH-E compatible with various versions of Emacs ;; Copyright (C) 2006-2011 Free Software Foundation, Inc. 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." ;; To add support for your favorite checksum program add a clause to ;; the cond statement in mh-checksum-choose. This should set the ;; variable mh-checksum-cmd to the command line needed to run the -;; checsum program and should set mh-checksum-parser to a function +;; checksum program and should set mh-checksum-parser to a function ;; which returns a cons cell containing the message number and ;; checksum string. 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: s -- Select the server at point. t -- Transpose the server at point and the previous one q -- Commit the changes and quit. - x -- Quit without commiting the changes." + x -- Quit without committing the changes." (interactive) (kill-all-local-variables) (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 @@ ;; (secrets-create-collection "my collection") ;; There exists a special collection called "session", which has the -;; lifetime of the corrresponding client session (aka Emacs' +;; lifetime of the corresponding client session (aka Emacs' ;; lifetime). It is created automatically when Emacs uses the Secret ;; Service interface, and it is deleted when Emacs is killed. ;; 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 @@ ;; form. Single-line form is used when the outline state is hide-children ;; or there are no child sections; multi-line form is used otherwise. ;; There are two flavors of single-line form: with children and without. -;; The with-childen flavor is used when there are child sections. +;; The with-children flavor is used when there are child sections. ;; Single line with children looks like ;; <+section>A section title... ;; 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." (pgg-process-when-success))) (defun pgg-gpg-update-agent () - "Try to connet to gpg-agent and send UPDATESTARTUPTTY." + "Try to connect to gpg-agent and send UPDATESTARTUPTTY." (if (fboundp 'make-network-process) (let* ((agent-info (getenv "GPG_AGENT_INFO")) (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 (const :tag "List them, indented with leading dots" indented))) (defcustom org-tags-sort-function nil - "When set, tags are sorted using this function as a comparator." + "When set, tags are sorted using this comparison function." :group 'org-tags :type '(choice (const :tag "No sorting" nil) @@ -5549,7 +5549,7 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'." (defvar org-font-lock-set-keywords-hook nil "Functions that can manipulate `org-font-lock-extra-keywords'. -This is calles after `org-font-lock-extra-keywords' is defined, but before +This is called after `org-font-lock-extra-keywords' is defined, but before it is installed to be used by font lock. This can be useful if something needs to be inserted at a specific position in the font-lock sequence.") 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." ;; ;; If there aren't enough opening paren/brace/brackets, return the position ;; of the outermost one found, or HERE- if there are none. If there are no - ;; closeing p/b/bs between HERE+ and TOP, return HERE-. HERE-/+ and TOP + ;; closing p/b/bs between HERE+ and TOP, return HERE-. HERE-/+ and TOP ;; must not be inside literals. Only the accessible portion of the buffer ;; will be scanned. 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." (<= (point) limit)) ;; Search syntactically to the end of the declarator (";", - ;; ",", a closen paren, eob etc) or to the beginning of an + ;; ",", a closing paren, eob etc) or to the beginning of an ;; initializer or function prototype ("=" or "\\s\("). ;; Note that the open paren will match array specs in ;; 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'" "The most recent grep buffer. A grep buffer becomes most recent when you select Grep mode in it. Notice that using \\[next-error] or \\[compile-goto-error] modifies -`complation-last-buffer' rather than `grep-last-buffer'.") +`compilation-last-buffer' rather than `grep-last-buffer'.") ;;;###autoload (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.") \\[idlwave-shell-print] or \\[idlwave-shell-mouse-print] with the mouse, help, \\[idlwave-shell-help-expression] or \\[idlwave-shell-mouse-help] with the mouse, or with a - configureable set of custom examine commands using + configurable set of custom examine commands using \\[idlwave-shell-examine-select]. The mouse examine commands can also work by click and drag, to select an expression for 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 indicate the maximum number of classes to display. On XEmacs, a full list of classes will also be placed into a `help-echo' -property on the competion items, so that the list of classes for the current +property on the completion items, so that the list of classes for the current item is displayed in the echo area. If the value of this variable is a negative integer, the `help-echo' property will be suppressed." :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." ;; Like (up-list -1), but only considers lists that end nearby" (defun js--up-nearby-list () (save-restriction - ;; Look at a very small region so our compuation time doesn't + ;; Look at a very small region so our computation time doesn't ;; explode in pathological cases. (narrow-to-region (max (point-min) (- (point) 500)) (point)) (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.") (list (let* ((completion-ignore-case t) ;; we already have a list, but it is not in the right format - ;; transform it to a valid table so completition can use it + ;; transform it to a valid table so completion can use it (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil)) mixal-operation-codes-alist)) ;; 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 @@ ;; Version 1.22: ;; o Allowed both 'swipl' and 'pl' as names for the SWI Prolog ;; interpreter. -;; o Atoms that start a line are not blindly coloured as +;; o Atoms that start a line are not blindly colored as ;; predicates. Instead we check that they are followed by ( or ;; :- first. Patch suggested by Guy Wiener. ;; 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." )) (defconst verilog-auto-end-comment-lines-re - ;; Matches to names in this list cause auto-end-commentation + ;; Matches to names in this list cause auto-end-commenting (concat "\\(" verilog-directive-re "\\)\\|\\(" (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." (setq regex2 (concat regex2 (if regex2 "\\|" "") (car extlist)))) (setq extlist (cdr extlist))) ;; concat all the sub-exressions together, making sure all types - ;; of parts exist during concatination. + ;; of parts exist during concatenation. (concat "\\(" (if regex1 (concat "\\(\\.\\(" regex1 "\\)\\)") "") (if (and regex1 regex2) "\\|" "") @@ -2219,7 +2219,7 @@ passes some tests." ;; Go through all our bins Stick singles into our ;; junk-list, everything else as sublsts in work-list. ;; If two neighboring lists are both small, make a grouped - ;; group combinding those two sub-lists. + ;; group combining those two sub-lists. (setq diff-idx 0) (while (> 256 diff-idx) ;; The bins contents are currently in forward order. @@ -3327,7 +3327,7 @@ current indentation level." (speedbar-find-file-in-frame (concat cdd text)) (speedbar-stealthy-updates) (run-hooks 'speedbar-visiting-file-hook) - ;; Reset the timer with a new timeout when cliking a file + ;; Reset the timer with a new timeout when clicking a file ;; in case the user was navigating directories, we can cancel ;; that other timer. (speedbar-set-timer dframe-update-speed)) @@ -3447,7 +3447,7 @@ INDENT is the current indentation level." (select-frame f)) (speedbar-find-file-in-frame file) (save-excursion (speedbar-stealthy-updates)) - ;; Reset the timer with a new timeout when cliking a file + ;; Reset the timer with a new timeout when clicking a file ;; in case the user was navigating directories, we can cancel ;; that other timer. (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 @@ ;; MULE charset, Emacs can display a single MULE charset with the ;; glyphs of the current codepage. When Emacs starts on DOS, it ;; automatically sets its default coding systems for file I/O and -;; terminal output according to the currend DOS codepage, given by +;; terminal output according to the current DOS codepage, given by ;; the `dos-codepage' variable. ;; ;; 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'." ;; is used, string is a TeX command ;; (char before beginning of word is ;; backslash) and none of the previous - ;; contitions match + ;; conditions match. (and (not ispell-really-aspell) (save-excursion (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." (indent-rigidly mbeg mend - ;; Find the next tab after the leftmost columnt. + ;; Find the next tab after the leftmost column. (let ((tab (funcall find-next-fun tabs leftmostcol))) (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." (cons (cons command func-symbol) table-command-remap-alist)))) '(center-line - conter-region + center-region center-paragraph fill-paragraph)) 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." tex-old-error-file-name 2 nil 1 1 (2 compilation-warning-face)) ;; Included files get output as ( ...). - ;; FIXME: there tend to be a crapload of them at the beginning of the + ;; FIXME: there tend to be a boatload of them at the beginning of the ;; output which aren't that interesting. Maybe we should filter out ;; all the file name that start with /usr/share? ;; ("(\\.?/\\([^() \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 @@ ;; This package create two new modes: thumbs-mode and thumbs-view-image-mode. ;; It is used for basic browsing and viewing of images from within Emacs. ;; Minimal image manipulation functions are also available via external -;; programs. If you want to do more complex tasks like categorise and tag +;; programs. If you want to do more complex tasks like categorize and tag ;; your images, use image-dired.el ;; ;; 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." ;; Only one file and FILE matches it exactly... t) (t - ;; Need to figure out the longest string that they have in commmon + ;; Need to figure out the longest string that they have in common (setq matches (sort matches (lambda (a b) (> (length a) (length b))))) (let ((n (length file)) (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." (not-acceptable ; 406 ;; The resource identified by the request is only capable of ;; generating response entities which have content - ;; characteristics nota cceptable according to the accept + ;; characteristics not acceptable according to the accept ;; headers sent in the request. (setq success t)) (proxy-authentication-required ; 407 @@ -1092,7 +1092,7 @@ the end of the document." (url-http-activate-callback))) ((string= "CONNECT" url-http-method) ;; A CONNECT request is finished, but we cannot stick this - ;; back on the free connectin list + ;; back on the free connection list (url-http-debug "CONNECT request must have headers only.") (when (url-http-parse-headers) (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." ;; interrupt it before it got a chance to handle process input. ;; `sleep-for' was tried but it lead to other forms of ;; hanging. --Stef - (unless (or (with-local-quit + (unless (or (with-local-quit (accept-process-output proc)) (null proc)) ;; 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." ;; These requires could advantageously be moved to url-mm-callback or ;; turned into autoloads, but I suspect that it would introduce some bugs ;; because loading those files from a process sentinel or filter may - ;; result in some undesirable carner cases. + ;; result in some undesirable corner cases. (require 'mm-decode) (require 'mm-view) (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." ;; Traditional patch has weird return codes. ;; GNU and Posix return 1 if some hanks failed and 2 in case of trouble. ;; 0 is a good code in all cases. -;; We'll do the concervative thing. +;; We'll do the conservative thing. (defun ediff-patch-return-code-ok (code) (eq code 0)) ;;; (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." :group 'vc) ;; Note: we don't actually have a darcs back end yet. -;; Also, Meta-CVS (corresponsding to MCVS) is unsupported. +;; Also, Meta-CVS (corresponding to MCVS) is unsupported. (defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS" ".svn" ".git" ".hg" ".bzr" "_MTN" "_darcs" "{arch}")) @@ -456,8 +456,8 @@ For registered files, the value returned is one of: 'edited The working file has been edited by the user. If locking is used for the file, this state means that the current version is locked by the calling user. - This status should *not* be reported for files - which have a changed mtime but the same content + This status should *not* be reported for files + which have a changed mtime but the same content as the repo copy. 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." (vc-svn-command buf 'async file "annotate" (if rev (concat "-r" rev)))) (defun vc-svn-annotate-time-of-rev (rev) - ;; Arbitrarily assume 10 commmits per day. + ;; Arbitrarily assume 10 commits per day. (/ (string-to-number rev) 10.0)) (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. One reason for not visualize spaces via faces (if `face' is not included in `whitespace-style') is to use exclusively for -cleanning up a buffer. See `whitespace-cleanup' and +cleaning up a buffer. See `whitespace-cleanup' and `whitespace-cleanup-region' for documentation. See 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)." result)) (defun widget-checklist-validate (widget) - ;; Ticked chilren must be valid. + ;; Ticked children must be valid. (let ((children (widget-get widget :children)) child button found) (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." "Return the x/y coordinates to be sent in a XDndStatus message. Coordinates are required to be absolute. FRAME is the frame and W is the window where the drop happened. -If W is a window, return its absolute corrdinates, +If W is a window, return its absolute coordinates, otherwise return the frame coordinates." (let* ((frame-left (frame-parameter frame 'left)) ;; If the frame is outside the display, frame-left looks like @@ -444,7 +444,7 @@ otherwise return the frame coordinates." (if (consp flags) (logand (cdr flags) 1) (logand flags 1))) - + (defun x-dnd-handle-xdnd (event frame window message _format data) "Receive one XDND event (client message) and send the appropriate reply. EVENT 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 @@ Vauto_file_coding_system. (syms_of_fileio): Adjusted for the above change. Doc change. (Finsert_file_contents): The argument for Vset_auto_coding is a - concatination of the heading 1K-byte and the tailing 3K-byte. + concatenation of the heading 1K-byte and the tailing 3K-byte. * cmds.c (internal_self_insert): Only set TARGET_CLM when C2 is tab. 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; is currently mapped. Used to prevent overwriting an existing memory mapping. - Default is to conservativly assume the address range is occupied by + Default is to conservatively assume the address range is occupied by something else. This can be overridden by system configuration files if system-specific means to determine this exists. */ 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, } /* Arrange unibyte text at STR of NBYTES bytes as a multibyte text. - It actually converts only such 8-bit characters that don't contruct + It actually converts only such 8-bit characters that don't construct a multibyte sequence to multibyte forms of Latin-1 characters. If NCHARS is nonzero, set *NCHARS to the number of characters in the 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 { COMPOSITION_NO }; -/* Maximum number of compoments a single composition can have. */ +/* Maximum number of components a single composition can have. */ #define MAX_COMPOSITION_COMPONENTS 16 /* 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 /* Optional. Store bitmap data for glyph-code CODE of FONT in BITMAP. It is - intended that this method is callled from the other font-driver + intended that this method is called from the other font-driver for actual drawing. */ int (*get_bitmap) (struct font *font, unsigned code, 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) nescs++; } - /* If PATTERN is not full XLFD we conert "*" to ".*". Otherwise + /* If PATTERN is not full XLFD we convert "*" to ".*". Otherwise we convert "*" to "[^-]*" which is much faster in regular expression matching. */ 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 if greater than 1, then the frame is obscured - we still consider it to be "visible" as seen from lisp, but we don't bother updating it. We must take care to garbage the frame when it - ceaces to be obscured though. + ceases to be obscured though. iconified is nonzero if the frame is currently iconified. 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) } } -/* Resize the outer window of frame F after chainging the height. +/* Resize the outer window of frame F after changing the height. COLUMNS/ROWS is the size the edit area shall have after the resize. */ void 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 . */ /* We introduce new member `tab_offset'. We need it because of the existence of wide-column characters. There is a case that the line-break occurs at a wide-column character and the number of - colums of the line gets less than width. + columns of the line gets less than width. Example (where W_ stands for a wide-column character): ---------- @@ -73,5 +73,3 @@ int disptab_matches_widthtab (struct Lisp_Char_Table *disptab, /* Recompute BUF's width table, using the display table DISPTAB. */ void recompute_width_table (struct buffer *buf, struct Lisp_Char_Table *disptab); - - 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) //ns_app_active=YES; ns_update_auto_hide_menu_bar (); - // No constrining takes place when the application is not active. + // No constraining takes place when the application is not active. ns_constrain_all_frames (); } - (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, sending a multibyte text, thus we must encode it by the original coding system specified for the current process. - Another reason we comming here is that the coding system - was just complemented and new one was returned by + Another reason we come here is that the coding system + was just complemented and a new one was returned by complement_process_encoding_system. */ setup_coding_system (p->encode_coding_system, coding); 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; /* POSIX pretty much destroys any possibility of writing sigmask as a macro in standard C. We always define our own version because the - predefined macro in Glibc 2.1 is only provided for compatility for old + predefined macro in Glibc 2.1 is only provided for compatibility for old programs that use int as signal mask type. */ #undef sigmask #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'. */); DEFVAR_INT ("overline-margin", overline_margin, doc: /* *Space between overline and text, in pixels. The default value is 2: the height of the overline (1 pixel) plus 1 pixel -margin to the caracter height. */); +margin to the character height. */); overline_margin = 2; 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) static int color_distance (XColor *x, XColor *y) { - /* This formula is from a paper title `Colour metric' by Thiadmer Riemersma. + /* This formula is from a paper titled `Colour metric' by Thiadmer Riemersma. Quoting from that paper: This formula has results that are very close to L*u*v* (with the modified lightness curve) and, more importantly, it is a more even - algorithm: it does not have a range of colours where it suddenly + algorithm: it does not have a range of colors where it suddenly gives far from optimal results. See 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) F is the frame to be used to look up X atoms if the TYPE is XA_ATOM. DATA is a C array of values to be converted. TYPE is the type of the data. Only XA_ATOM is special, it converts - each number in DATA to its corresponfing X atom as a symbol. + each number in DATA to its corresponding X atom as a symbol. FORMAT is 8, 16 or 32 and gives the size in bits for each C value to be stored in RET. 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) } #endif /* HAVE_XFT */ -/* Map TOOL_BAR_STYLE from a string to its correspinding Lisp value. +/* Map TOOL_BAR_STYLE from a string to its corresponding Lisp value. Return Qnil if TOOL_BAR_STYLE is not known. */ static 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) Vx_session_id = build_string (client_id); #ifdef USE_GTK - /* GTK creats a leader window by itself, but we need to tell + /* GTK creates a leader window by itself, but we need to tell it about our client_id. */ gdk_x11_set_sm_client_id (client_id); #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." (y-or-n-p "New database created. Reload system databases? ") (y-or-n-p "Load in all system databases? ")) (semanticdb-load-ebrowse-caches))) - ;; Ok, databases were creatd. Lets try some searching. + ;; Ok, databases were created. Let's try some searching. (when (not (or (eq major-mode 'c-mode) (eq major-mode 'c++-mode))) (error "Please make your default buffer be a C or C++ file, then @@ -387,4 +387,3 @@ gcc version 2.95.2 19991024 (release)" (let ((semantic-gcc-test-strings (list (semantic-gcc-query "gcc" "-v")))) (semantic-gcc-test-output-parser)) ) -