From c80e3b4aed2e70eb6d8445d786c0df770094e9e1 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 4 Dec 2011 00:02:42 -0800 Subject: Spelling fixes. --- lisp/cedet/srecode/fields.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/cedet/srecode') diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index f13fb17ca8f..f4d34a0f2ab 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el @@ -324,7 +324,7 @@ Try to use this to provide useful completion when available.") ) (defvar srecode-field-replication-max-size 100 - "Maximum size of a field before cancelling replication.") + "Maximum size of a field before canceling replication.") (defun srecode-field-mod-hook (ol after start end &optional pre-len) "Modification hook for the field overlay. -- cgit v1.2.3 From fa46310344375ef5c114cbb94d4acea39ac29239 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 5 Dec 2011 00:55:25 -0800 Subject: Spelling fixes. --- doc/misc/eshell.texi | 2 +- doc/misc/gnus.texi | 2 +- etc/NEWS.23 | 2 +- etc/srecode/doc-cpp.srt | 2 +- etc/srecode/doc-default.srt | 2 +- etc/srecode/doc-java.srt | 2 +- leim/quail/croatian.el | 2 +- leim/quail/czech.el | 2 +- leim/quail/greek.el | 4 ++-- leim/quail/persian.el | 4 ++-- lisp/ChangeLog | 2 +- lisp/ChangeLog.13 | 2 +- lisp/ChangeLog.2 | 2 +- lisp/align.el | 2 +- lisp/allout-widgets.el | 2 +- lisp/allout.el | 2 +- lisp/ansi-color.el | 2 +- lisp/calendar/solar.el | 2 +- lisp/cedet/semantic/db-find.el | 12 ++++++------ lisp/cedet/semantic/debug.el | 2 +- lisp/cedet/srecode/args.el | 3 +-- lisp/cedet/srecode/insert.el | 2 +- lisp/dired.el | 2 +- lisp/emulation/cua-rect.el | 4 ++-- lisp/emulation/viper-cmd.el | 6 +++--- lisp/eshell/em-rebind.el | 2 +- lisp/gnus/ChangeLog.2 | 2 +- lisp/gs.el | 4 ++-- lisp/hilit-chg.el | 2 +- lisp/htmlfontify.el | 2 +- lisp/international/ccl.el | 2 +- lisp/language/ethio-util.el | 2 +- lisp/language/lao-util.el | 2 +- lisp/net/netrc.el | 2 +- lisp/net/network-stream.el | 2 +- lisp/net/tramp-gvfs.el | 2 +- lisp/net/tramp.el | 4 ++-- lisp/net/xesam.el | 4 ++-- lisp/progmodes/cc-defs.el | 2 +- lisp/progmodes/cc-engine.el | 4 ++-- lisp/progmodes/vhdl-mode.el | 2 +- lisp/ps-mule.el | 6 +++--- lisp/reveal.el | 4 ++-- lisp/term/rxvt.el | 2 +- lisp/term/xterm.el | 2 +- lisp/textmodes/picture.el | 2 +- lisp/view.el | 2 +- oldXMenu/X10.h | 2 +- oldXMenu/XMenu.h | 4 ++-- src/fileio.c | 2 +- src/ftxfont.c | 9 +++++---- src/nsterm.m | 2 +- src/regex.c | 2 +- src/regex.h | 4 ++-- src/textprop.c | 4 ++-- src/w32select.c | 7 +++---- src/w32term.c | 2 +- src/xdisp.c | 2 +- src/xselect.c | 8 ++++---- src/xterm.c | 2 +- 60 files changed, 89 insertions(+), 90 deletions(-) (limited to 'lisp/cedet/srecode') diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index b0090f0fb84..7c178757927 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -608,7 +608,7 @@ scrolls back. @item Using C-p and C-n with rebind gets into a locked state -This happened a few times in Emacs 21, but has been unreproducible +This happened a few times in Emacs 21, but has been irreproducible since. @item If an interactive process is currently running, @kbd{M-!} doesn't work diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 69b17a94d68..5ae86c4e631 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -8976,7 +8976,7 @@ Translate many non-@acronym{ASCII} characters into their @acronym{ASCII} equivalents (@code{gnus-article-treat-non-ascii}). This is mostly useful if you're on a terminal that has a limited font and doesn't show accented characters, ``advanced'' punctuation, and the -like. For instance, @samp{»} is tranlated into @samp{>>}, and so on. +like. For instance, @samp{»} is translated into @samp{>>}, and so on. @item W Y f @kindex W Y f (Summary) diff --git a/etc/NEWS.23 b/etc/NEWS.23 index 4e541c0deb3..6f1b50e8c7a 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 @@ -903,7 +903,7 @@ mode-line information (e.g. waiting for a VC command to finish). *** The mode-line tooltips have been improved to provide more details. -*** The VC, line/colum number and minor mode indicators on the mode +*** The VC, line/column number and minor mode indicators on the mode line are now interactive: mouse-1 can be used on them to pop up a menu. ** File deletion can make use of the Recycle Bin or system Trash folder. diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt index 957986e8eda..a9ea16d1811 100644 --- a/etc/srecode/doc-cpp.srt +++ b/etc/srecode/doc-cpp.srt @@ -43,7 +43,7 @@ Recycle doxygen comment code from the more general template set." ---- template variable-same-line-comment :tag -"A comment occurring after a veriable declaration. +"A comment occurring after a variable declaration. Recycle doxygen comment code from the more general template set." ---- {{>:declaration:doxygen-variable-same-line}} diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt index 24741fa7741..ac8d8bc1ac2 100644 --- a/etc/srecode/doc-default.srt +++ b/etc/srecode/doc-default.srt @@ -43,7 +43,7 @@ template function-comment :tag :indent :blank ---- template variable-same-line-comment :tag -"A comment occurring after a veriable declaration." +"A comment occurring after a variable declaration." ---- {{comment_start}} {{?DOC}} {{comment_end}} ---- diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt index c6d2ef1fd54..aeae1c2c389 100644 --- a/etc/srecode/doc-java.srt +++ b/etc/srecode/doc-java.srt @@ -44,7 +44,7 @@ Recycle javadoc comment code from the more general template set." ---- template variable-same-line-comment :tag -"A comment occurring after a veriable declaration. +"A comment occurring after a variable declaration. Recycle javadoc comment code from the more general template set." ---- {{>:declaration:javadoc-variable-same-line}} diff --git a/leim/quail/croatian.el b/leim/quail/croatian.el index 7f394979261..885ac238398 100644 --- a/leim/quail/croatian.el +++ b/leim/quail/croatian.el @@ -1,4 +1,4 @@ -;;; quail/croatian.el -- Quail package for inputing Croatian -*-coding: iso-8859-2;-*- +;;; quail/croatian.el -- Quail package for inputting Croatian -*-coding: iso-8859-2;-*- ;; Copyright (C) 2003-2011 Free Software Foundation, Inc. diff --git a/leim/quail/czech.el b/leim/quail/czech.el index 334045eac32..fc1fb5f6e1f 100644 --- a/leim/quail/czech.el +++ b/leim/quail/czech.el @@ -461,7 +461,7 @@ keyboard from the obsolete `emacs-czech' package. All digits except of `1' are replaced by Czech characters as on the standard Czech keyboard. `[' and `]' are replaced with `,Bz(B' and `,By(B', respectively. -There are two dead keys on `=' and `+'. Characters with diaresis are +There are two dead keys on `=' and `+'. Characters with diaereses are accessible through `+='. All other keys are the same as on standard US keyboard." nil t nil nil t nil nil nil nil nil t) diff --git a/leim/quail/greek.el b/leim/quail/greek.el index ab82775ff0e..407b52f1f39 100644 --- a/leim/quail/greek.el +++ b/leim/quail/greek.el @@ -1147,7 +1147,7 @@ nil t t nil nil nil nil nil nil nil t) In the right of ,Fk(B key is a combination key, where ,F4(B acute - ,F((B diaresis + ,F((B diaeresis e.g. ,F4(B + ,Fa(B -> ,F\(B @@ -1289,7 +1289,7 @@ e.g. In the right of ,Fk(B key is a combination key, where ,F4(B acute - ,F((B diaresis + ,F((B diaeresis e.g. ,Fa(B + ,F4(B -> ,F\(B diff --git a/leim/quail/persian.el b/leim/quail/persian.el index b664eb5995b..572c9127f9d 100644 --- a/leim/quail/persian.el +++ b/leim/quail/persian.el @@ -194,11 +194,11 @@ Based on ISIRI-9149 Layout of Persian Letters and Symbols on Computer Keyboards. ;;; ;;; This translit keyboard is designed to be intuitive such that ;;; mapping are easy and natural to remember for a persian writer. -;;; For some persian characters there are multiple ways of inputing +;;; For some persian characters there are multiple ways of inputting ;;; the same character. ;;; ;;; The letter 'h' is used for a number of two character mappings, -;;; this means that some character sequence inputs need to be repeated +;;; this means that some character sequence inputs need to be repeated ;;; followed by a backspace followed by the 'h'. ;;; For example: سحر = 's' 's' '' 'h' 'h' 'r' ;;; In practice such sequences are rare. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 413a2947a58..ef91deddc1d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5370,7 +5370,7 @@ * net/network-stream.el (network-stream-open-starttls): Support upgrading to STARTTLS always, even if we don't have built-in support. - (open-network-stream): Add the :always-query-capabilies keyword. + (open-network-stream): Add the :always-query-capabilities keyword. * mail/smtpmail.el: Rewritten to do opportunistic STARTTLS upgrades with `open-network-stream', and rely solely on diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 0e6a27e0776..0b96f4a36eb 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -10869,7 +10869,7 @@ 2007-09-23 Glenn Morris - * ses.el (ses-calculate-cell): Don't evaluate unsafe formulae. + * ses.el (ses-calculate-cell): Don't evaluate unsafe formulas. 2007-09-23 Dan Nicolaescu diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 65005a4ba47..957c9c7deff 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -60,7 +60,7 @@ 1988-08-03 Robert J. Chassell (bob@frosted-flakes.ai.mit.edu) - * texinfo.el: Changed fill-colum from 75 to 72. The larger + * texinfo.el: Changed fill-column from 75 to 72. The larger fill-column causes numerous overfull hboxes in TeX when you are writing Emacs Lisp code that will be formatted as a Texinfo example. diff --git a/lisp/align.el b/lisp/align.el index a386b7a82ba..214c3add93f 100644 --- a/lisp/align.el +++ b/lisp/align.el @@ -109,7 +109,7 @@ ;; simple algorithm that understand only basic regular expressions. ;; Parts of the code were broken up and included in vhdl-mode.el ;; around this time. After several comments from users, and a need to -;; find a more robust, performant algorithm, 2.0 was born in late +;; find a more robust, higher performing algorithm, 2.0 was born in late ;; 1998. Many different approaches were taken (mostly due to the ;; complexity of TeX tables), but finally a scheme was discovered ;; which worked fairly well for most common usage cases. Development diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index dfd9adad2a7..715879534b0 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -108,7 +108,7 @@ inhibition of allout-widgets-mode." ;;;_ > allout-widgets-setup (varname value) ;;;###autoload (defun allout-widgets-setup (varname value) - "Commission or decommision allout-widgets-mode along with allout-mode. + "Commission or decommission allout-widgets-mode along with allout-mode. Meant to be used by customization of `allout-widgets-auto-activation'." (set-default varname value) diff --git a/lisp/allout.el b/lisp/allout.el index 68330aa538b..9289e38b418 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1872,7 +1872,7 @@ at the beginning of the current entry. Extending Allout -Allout exposure and authoring activites all have associated +Allout exposure and authoring activities all have associated hooks, by which independent code can cooperate with allout without changes to the allout core. Here are key ones: diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index 4d6f02a40b7..08b569de333 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -413,7 +413,7 @@ start of the region and set the face with which to start. Set (setq ansi-color-context-region nil)))))) ;; This function helps you look for overlapping overlays. This is -;; usefull in comint-buffers. Overlapping overlays should not happen! +;; useful in comint-buffers. Overlapping overlays should not happen! ;; A possible cause for bugs are the markers. If you create an overlay ;; up to the end of the region, then that end might coincide with the ;; process-mark. As text is added BEFORE the process-mark, the overlay diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el index 84a1544d709..b841ed4ab73 100644 --- a/lisp/calendar/solar.el +++ b/lisp/calendar/solar.el @@ -962,7 +962,7 @@ Accurate to within a minute between 1951 and 2050." (defun solar-mean-equinoxes/solstices (k year) "Julian day of mean equinox/solstice K for YEAR. K=0, spring equinox; K=1, summer solstice; K=2, fall equinox; K=3, winter -solstice. These formulae are only to be used between 1000 BC and 3000 AD." +solstice. These formulas are only to be used between 1000 BC and 3000 AD." (let ((y (/ year 1000.0)) (z (/ (- year 2000) 1000.0))) (if (< year 1000) ; actually between -1000 and 1000 diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 4d5d8f35f51..58fca963a58 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -210,7 +210,7 @@ This class will cache data derived during various searches.") "Synchronize the search index IDX with some NEW-TAGS." ;; Reset our parts. (semantic-reset idx) - ;; Notify dependants by clearning their indicies. + ;; Notify dependants by clearing their indices. (semanticdb-notify-references (oref idx table) (lambda (tab me) @@ -224,7 +224,7 @@ This class will cache data derived during various searches.") (if (semantic-find-tags-by-class 'include new-tags) (progn (semantic-reset idx) - ;; Notify dependants by clearning their indicies. + ;; Notify dependants by clearing their indices. (semanticdb-notify-references (oref idx table) (lambda (tab me) @@ -234,7 +234,7 @@ This class will cache data derived during various searches.") (when (oref idx type-cache) (when (semanticdb-partial-synchronize (oref idx type-cache) new-tags) ;; If the synchronize returns true, we need to notify. - ;; Notify dependants by clearning their indicies. + ;; Notify dependants by clearing their indices. (semanticdb-notify-references (oref idx table) (lambda (tab me) @@ -405,10 +405,10 @@ Default action as described in `semanticdb-find-translate-path'." ;; do a caching lookup. (let ((index (semanticdb-get-table-index table))) (if (semanticdb-find-need-cache-update-p table) - ;; Lets go look up our indicies + ;; Let's go look up our indices. (let ((ans (semanticdb-find-translate-path-includes--internal path))) (oset index include-path ans) - ;; Once we have our new indicies set up, notify those + ;; Once we have our new indices set up, notify those ;; who depend on us if we found something for them to ;; depend on. (when ans (semanticdb-refresh-references table)) @@ -575,7 +575,7 @@ a new path from the provided PATH." (setq ans (semanticdb-file-table (car systemdb) ;; I would expect most omniscient to return the same - ;; thing reguardless of filename, but we may have +o ;; thing regardless of filename, but we may have ;; one that can return a table of all things the ;; current file needs. (buffer-file-name (current-buffer)))) diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el index 45b807df12b..6db47f8b0be 100644 --- a/lisp/cedet/semantic/debug.el +++ b/lisp/cedet/semantic/debug.el @@ -175,7 +175,7 @@ TOKEN is a lexical token." "For IFACE, highlight NONTERM in the parser buffer. NONTERM is the name of the rule currently being processed that shows up as a nonterminal (or tag) in the source buffer. -If RULE and MATCH indicies are specified, highlight those also." +If RULE and MATCH indices are specified, highlight those also." (set-buffer (oref iface :parser-buffer)) (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer))) diff --git a/lisp/cedet/srecode/args.el b/lisp/cedet/srecode/args.el index d8e02f978b2..73445fbf13d 100644 --- a/lisp/cedet/srecode/args.el +++ b/lisp/cedet/srecode/args.el @@ -32,7 +32,7 @@ ;;; :blank ;; ;; Using :blank means that the template should force blank lines -;; before and after the template, reguardless of where the insertion +;; before and after the template, regardless of where the insertion ;; is occurring. (defun srecode-semantic-handle-:blank (dict) "Add macros into the dictionary DICT specifying blank line spacing. @@ -185,4 +185,3 @@ do not contain any text from preceding or following text." (provide 'srecode/args) ;;; srecode/args.el ends here - diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index 60f277b2c9f..bbf8b881c4d 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -312,7 +312,7 @@ occur in your template.") (setq doit nil))) (goto-char pm) ) - ;; Do indentation reguardless of the newline. + ;; Do indentation regardless of the newline. (when (and (eq i t) inbuff) (indent-according-to-mode) (goto-char pm)) diff --git a/lisp/dired.el b/lisp/dired.el index 4970b14e7b4..52bd67751d4 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -2678,7 +2678,7 @@ Anything else means ask for each directory." (defvar dired-re-no-dot "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*") ;; Delete file, possibly delete a directory and all its files. -;; This function is usefull outside of dired. One could change it's name +;; This function is useful outside of dired. One could change it's name ;; to e.g. recursive-delete-file and put it somewhere else. (defun dired-delete-file (file &optional recursive trash) "\ Delete FILE or directory (possibly recursively if optional RECURSIVE is true.) diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 76cab39f5b2..00aec2d0bf9 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el @@ -1258,7 +1258,7 @@ The numbers are formatted according to the FORMAT string." (untabify (point-min) (point-max))) (defun cua-text-fill-rectangle (width text) - "Replace rectagle with filled TEXT read from minibuffer. + "Replace rectangle with filled TEXT read from minibuffer. A numeric prefix argument is used a new width for the filled rectangle." (interactive (list (prefix-numeric-value current-prefix-arg) @@ -1269,7 +1269,7 @@ A numeric prefix argument is used a new width for the filled rectangle." (lambda () (insert text)))) (defun cua-refill-rectangle (width) - "Fill contents of current rectagle. + "Fill contents of current rectangle. A numeric prefix argument is used as new width for the filled rectangle." (interactive "P") (cua--rectangle-aux-replace diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 78bc09af136..b6d487704f4 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -1979,7 +1979,7 @@ Undo previous insertion and inserts new." ;; Quote region by each line with a user supplied string. (defun viper-quote-region () (let ((quote-str viper-quote-string) - (donot-change-dafault t)) + (donot-change-default t)) (setq quote-str (viper-read-string-with-history "Quote string: " @@ -1991,9 +1991,9 @@ Undo previous insertion and inserts new." ((string-match "lisp.*-mode" (symbol-name major-mode)) ";;") ((memq major-mode '(c-mode cc-mode c++-mode)) "//") ((memq major-mode '(sh-mode shell-mode)) "#") - (t (setq donot-change-dafault nil) + (t (setq donot-change-default nil) quote-str)))) - (or donot-change-dafault + (or donot-change-default (setq viper-quote-string quote-str)) (viper-enlarge-region (point) (mark t)) (if (> (point) (mark t)) (exchange-point-and-mark)) diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el index 2c346dfcd3d..b6f12e1ff2e 100644 --- a/lisp/eshell/em-rebind.el +++ b/lisp/eshell/em-rebind.el @@ -144,7 +144,7 @@ This is default behavior of shells like bash." ;;; Functions: (defun eshell-rebind-initialize () - "Initialize the inputing code." + "Initialize the inputting code." (unless eshell-non-interactive-p (add-hook 'eshell-mode-hook 'eshell-setup-input-keymap nil t) (make-local-variable 'eshell-previous-point) diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 6b11a956a99..893ee88e98d 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -5094,7 +5094,7 @@ 2003-02-02 Katsumi Yamaoka * nnheader.el (nnheader-directory-separator-character): Change the - way to compute the dafault value. + way to compute the default value. 2003-02-02 Jesper Harder diff --git a/lisp/gs.el b/lisp/gs.el index 2eba7af71ae..b86632f7637 100644 --- a/lisp/gs.el +++ b/lisp/gs.el @@ -96,7 +96,7 @@ FILE is the value to substitute for the place-holder `'." (declare-function x-display-pixel-width "xfns.c" (&optional terminal)) (defun gs-width-in-pt (frame pixel-width) - "Return, on FRAME, pixel width PIXEL-WIDTH tranlated to pt." + "Return, on FRAME, pixel width PIXEL-WIDTH translated to pt." (let ((mm (* (float pixel-width) (/ (float (x-display-mm-width frame)) (float (x-display-pixel-width frame)))))) @@ -106,7 +106,7 @@ FILE is the value to substitute for the place-holder `'." (declare-function x-display-pixel-height "xfns.c" (&optional terminal)) (defun gs-height-in-pt (frame pixel-height) - "Return, on FRAME, pixel height PIXEL-HEIGHT tranlated to pt." + "Return, on FRAME, pixel height PIXEL-HEIGHT translated to pt." (let ((mm (* (float pixel-height) (/ (float (x-display-mm-height frame)) (float (x-display-pixel-height frame)))))) diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 0dee4157d78..50e631a95c5 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -367,7 +367,7 @@ buffer with the contents of a file ;;;###autoload (define-minor-mode highlight-changes-visible-mode - "Toggle visiblility of highlighting due to Highlight Changes mode. + "Toggle visibility of highlighting due to Highlight Changes mode. With a prefix argument ARG, enable Highlight Changes Visible mode if ARG is positive, and disable it otherwise. If called from Lisp, enable the mode if ARG is omitted or nil. diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 126b616a644..b0fd37abd36 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -580,7 +580,7 @@ If a window system is unavailable, calls `hfy-fallback-colour-values'." (color-values colour) ;;(message "[%S]" window-system) (x-color-values colour)) - ;; blarg - tty colours are no good - go fetch some X colours: + ;; blarg - tty colors are no good - go fetch some X colors: (hfy-fallback-colour-values colour)))) (defvar hfy-cperl-mode-kludged-p nil) diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index 9614479072a..457fe84c0b1 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el @@ -1433,7 +1433,7 @@ REG := r0 | r1 | r2 | r3 | r4 | r5 | r6 | r7 ARG := REG | integer OPERATOR := - ;; Normal arithmethic operators (same meaning as C code). + ;; Normal arithmetic operators (same meaning as C code). + | - | * | / | % ;; Bitwise operators (same meaning as C code) diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index 1d93d981f8e..306a7bee9dc 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -890,7 +890,7 @@ Otherwise, [0-9A-F]." ;;;###autoload (defun ethio-find-file nil - "Transliterate file content into Ethiopic dependig on filename suffix." + "Transliterate file content into Ethiopic depending on filename suffix." (cond ((string-match "\\.sera$" (buffer-file-name)) diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 008eb92dbbc..2a339504409 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@ -386,7 +386,7 @@ character MAA-SAKOD-n.") "Transcribe a Romanized Lao syllable in the region FROM and TO to Lao string. Only the first syllable is transcribed. The value has the form: (START END LAO-STRING), where -START and END are the beggining and end positions of the Roman Lao syllable, +START and END are the beginning and end positions of the Roman Lao syllable, LAO-STRING is the Lao character transcription of it. Optional 3rd arg STR, if non-nil, is a string to search for Roman Lao diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el index b04863b5fc0..80836b03978 100644 --- a/lisp/net/netrc.el +++ b/lisp/net/netrc.el @@ -237,7 +237,7 @@ MODE can be \"login\" or \"password\", suitable for passing to ;;;###autoload (defun netrc-credentials (machine &rest ports) "Return a user name/password pair. -Port specifications will be prioritised in the order they are +Port specifications will be prioritized in the order they are listed in the PORTS list." (let ((list (netrc-parse)) found) diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index e27b4541ab5..9c07953c9c9 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -115,7 +115,7 @@ values: capability command, and should return the command to switch on STARTTLS if the server supports STARTTLS, and nil otherwise. -:always-query-capabilies says whether to query the server for +:always-query-capabilities says whether to query the server for capabilities, even if we're doing a `plain' network connection. :client-certificate should either be a list where the first diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index df841bade79..27dff3aa8d9 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -188,7 +188,7 @@ ;; STRING stable_name ;; STRING x_content_types Since GVFS 1.0 only !!! ;; STRING icon -;; STRING prefered_filename_encoding +;; STRING preferred_filename_encoding ;; BOOLEAN user_visible ;; ARRAY BYTE fuse_mountpoint ;; STRUCT mount_spec diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index c89b61c2eb1..2848211fae9 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -298,8 +298,8 @@ shouldn't return t when it isn't." (search-forward-regexp "Missing ControlMaster argument" nil t)))) (defcustom tramp-default-method - ;; An external copy method seems to be preferred, because it is much - ;; more performant for large files, and it hasn't too serious delays + ;; An external copy method seems to be preferred, because it performs + ;; much better for large files, and it hasn't too serious delays ;; for small files. But it must be ensured that there aren't ;; permanent password queries. Either a password agent like ;; "ssh-agent" or "Pageant" shall run, or the optional diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index ab817a43885..279ea54e4cc 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el @@ -279,8 +279,8 @@ fields are supported.") (defun xesam-dbus-call-method (&rest args) "Apply a D-Bus method call. -`dbus-call-method' is to be preferred, because it is more -performant. If the target D-Bus service is owned by Emacs, this +`dbus-call-method' is preferred, because it performs better. +If the target D-Bus service is owned by Emacs, this is not applicable, and `dbus-call-method-non-blocking' must be used instead. ARGS are identical to the argument list of both functions." diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index c91fe13543a..2991b511830 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -473,7 +473,7 @@ various buffer change hooks." (let ((saved-undo-list (elt saved-state 0))) (if (eq buffer-undo-list saved-undo-list) - ;; No change was done afterall. + ;; No change was done after all. (setq buffer-undo-list (cdr saved-undo-list)) (if keep diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 9544c4f8728..cd483d20f2f 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -6832,7 +6832,7 @@ comment at the start of cc-engine.el for more info." got-suffix-after-parens (eq (char-after got-suffix-after-parens) ?\()) ;; Got a type, no declarator but a paren suffix. I.e. it's a - ;; normal function call afterall (or perhaps a C++ style object + ;; normal function call after all (or perhaps a C++ style object ;; instantiation expression). (throw 'at-decl-or-cast nil)))) @@ -9151,7 +9151,7 @@ comment at the start of cc-engine.el for more info." 'label)) (if (eq step 'up) (setq placeholder (point)) - ;; There was no containing statement afterall. + ;; There was no containing statement after all. (goto-char placeholder))))) placeholder)) (if (looking-at c-block-stmt-2-key) diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 0cf01b1228f..a81cc107ce3 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4266,7 +4266,7 @@ Usage: CODE BEAUTIFICATION: `C-c M-b' and `C-c C-b' beautify the code of a region or of the entire - buffer respectively. This inludes indentation, alignment, and case + buffer respectively. This includes indentation, alignment, and case fixing. Code beautification can also be run non-interactively using the command: diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el index c8bdc271f5f..db5b57f8585 100644 --- a/lisp/ps-mule.el +++ b/lisp/ps-mule.el @@ -932,7 +932,7 @@ the sequence." (list ps-mule-bitmap-prologue))) (defun ps-mule-generate-bitmap-font (font-spec size relative-compose - baselie-offset bbx) + baseline-offset bbx) (let* ((id (ps-mule-font-spec-id font-spec)) (bytes (ps-mule-font-spec-bytes font-spec)) output-list) @@ -941,7 +941,7 @@ the sequence." (list (format "/E%02X [ 0 1 255 {pop /.notdef} for ] def\n" id) (format "%%%% %s\n" (ps-mule-font-spec-name font-spec)) (format "/F%02X %f %S %d E%02X NBF\n" id size - relative-compose baselie-offset id))) + relative-compose baseline-offset id))) (setq output-list (list (list (format "/E%02X [ 0 1 255 { pop 0 } for ] def\n" id)) (list (format "/V%02X [" id)) @@ -950,7 +950,7 @@ the sequence." (format "/F%02X E%02X V%02X NPF\n" id id id)))) (aset ps-mule-bitmap-font-record id (vector (= bytes 1) output-list - size relative-compose baselie-offset bbx)) + size relative-compose baseline-offset bbx)) (if ps-mule-bitmap-dict-list output-list (setq ps-mule-bitmap-dict-list (list "/BitmapDict <<\n" ">> def\n")) diff --git a/lisp/reveal.el b/lisp/reveal.el index ea46cfd1dd3..c776ab72969 100644 --- a/lisp/reveal.el +++ b/lisp/reveal.el @@ -189,12 +189,12 @@ Each element has the form (WINDOW . OVERLAY).") ;;;###autoload (define-minor-mode reveal-mode - "Toggle decloaking of invisible text near point (Reveal mode). + "Toggle uncloaking of invisible text near point (Reveal mode). With a prefix argument ARG, enable Reveal mode if ARG is positive, and disable it otherwise. If called from Lisp, enable Reveal mode if ARG is omitted or nil. -Reveral mode is a buffer-local minor mode. When enabled, it +Reveal mode is a buffer-local minor mode. When enabled, it reveals invisible text around point." :group 'reveal :lighter (global-reveal-mode nil " Reveal") diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index c784892ce6b..c64dc0e7a19 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -228,7 +228,7 @@ for the currently selected frame." ;; 216 non-gray colors first (let ((r 0) (g 0) (b 0)) (while (> ncolors 24) - ;; This and other formulae taken from 256colres.pl and + ;; This and other formulas taken from 256colres.pl and ;; 88colres.pl in the xterm distribution. (tty-color-define (format "color-%d" (- 256 ncolors)) (- 256 ncolors) diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index c2856660ea8..f9d11cb2685 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -637,7 +637,7 @@ versions of xterm." ;; 216 non-gray colors first (let ((r 0) (g 0) (b 0)) (while (> ncolors 24) - ;; This and other formulae taken from 256colres.pl and + ;; This and other formulas taken from 256colres.pl and ;; 88colres.pl in the xterm distribution. (tty-color-define (format "color-%d" (- 256 ncolors)) (- 256 ncolors) diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el index 678d48758da..3356ce195f2 100644 --- a/lisp/textmodes/picture.el +++ b/lisp/textmodes/picture.el @@ -742,7 +742,7 @@ by supplying an argument. Entry to this mode calls the value of `picture-mode-hook' if non-nil. Note that Picture mode commands will work outside of Picture mode, but -they are not defaultly assigned to keys." +they are not by default assigned to keys." (interactive) (if (eq major-mode 'picture-mode) (error "You are already editing a picture") diff --git a/lisp/view.el b/lisp/view.el index 7703719ba40..0d8ad3336f9 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -496,7 +496,7 @@ Entry to view-mode runs the normal hook `view-mode-hook'." "Update `view-return-to-alist' of buffer BUFFER. Remove from `view-return-to-alist' all entries referencing dead windows. Optional argument ITEM non-nil means add ITEM to -`view-return-to-alist' after purging. For a decsription of items +`view-return-to-alist' after purging. For a description of items that can be added see the RETURN-TO-ALIST argument of the function `view-mode-exit'. If `view-return-to-alist' contains an entry for the selected window, purge that entry from diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h index c30632b9d68..5e4ca068ba5 100644 --- a/oldXMenu/X10.h +++ b/oldXMenu/X10.h @@ -51,7 +51,7 @@ XDrawFilled so it shouldn't be defined. */ typedef struct _XAssoc { struct _XAssoc *next; /* Next object in this bucket. */ - struct _XAssoc *prev; /* Previous obejct in this bucket. */ + struct _XAssoc *prev; /* Previous object in this bucket. */ Display *display; /* Display which owns the id. */ XID x_id; /* X Window System id. */ void *data; /* Pointer to untyped memory. */ diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h index aa27211c05c..8e4292f5088 100644 --- a/oldXMenu/XMenu.h +++ b/oldXMenu/XMenu.h @@ -152,8 +152,8 @@ typedef struct _xmselect { * */ typedef enum _xmstyle { - LEFT, /* Left oriented obejct. */ - RIGHT, /* Right oriented obejct. */ + LEFT, /* Left oriented object. */ + RIGHT, /* Right oriented object. */ CENTER /* Center oriented object. */ } XMStyle; diff --git a/src/fileio.c b/src/fileio.c index c0f6c1d2e8e..fb021cee5a4 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4186,7 +4186,7 @@ variable `last-coding-system-used' to the coding system actually used. */) /* If REPLACE is non-nil and we succeeded in not replacing the beginning or end of the buffer text with the file's contents, call format-decode with `point' positioned at the beginning - of the buffer and `inserted' equalling the number of + of the buffer and `inserted' equaling the number of characters in the buffer. Otherwise, format-decode might fail to correctly analyze the beginning or end of the buffer. Hence we temporarily save `point' and `inserted' here and diff --git a/src/ftxfont.c b/src/ftxfont.c index 608cfd8d44d..e04e802a3db 100644 --- a/src/ftxfont.c +++ b/src/ftxfont.c @@ -48,8 +48,8 @@ static GC *ftxfont_get_gcs (FRAME_PTR, unsigned long, unsigned long); static int ftxfont_draw_bitmap (FRAME_PTR, GC, GC *, struct font *, unsigned, int, int, XPoint *, int, int *, int); -static void ftxfont_draw_backgrond (FRAME_PTR, struct font *, GC, - int, int, int); +static void ftxfont_draw_background (FRAME_PTR, struct font *, GC, + int, int, int); struct ftxfont_frame_data { @@ -219,7 +219,8 @@ ftxfont_draw_bitmap (FRAME_PTR f, GC gc_fore, GC *gcs, struct font *font, unsign } static void -ftxfont_draw_backgrond (FRAME_PTR f, struct font *font, GC gc, int x, int y, int width) +ftxfont_draw_background (FRAME_PTR f, struct font *font, GC gc, int x, int y, + int width) { XGCValues xgcv; @@ -296,7 +297,7 @@ ftxfont_draw (struct glyph_string *s, int from, int to, int x, int y, int with_b BLOCK_INPUT; if (with_background) - ftxfont_draw_backgrond (f, font, s->gc, x, y, s->width); + ftxfont_draw_background (f, font, s->gc, x, y, s->width); code = alloca (sizeof (unsigned) * len); for (i = 0; i < len; i++) code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8) diff --git a/src/nsterm.m b/src/nsterm.m index 5e19a397c34..17fd5a93f63 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2108,7 +2108,7 @@ ns_scroll_run (struct window *w, struct run *run) } else { - /* Scolling down. Make sure we don't copy over the mode line. + /* Scrolling down. Make sure we don't copy over the mode line. at the bottom. */ if (to_y + run->height > bottom_y) height = bottom_y - to_y; diff --git a/src/regex.c b/src/regex.c index b7699378f5a..0ba05a95fdb 100644 --- a/src/regex.c +++ b/src/regex.c @@ -53,7 +53,7 @@ (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs) #endif -/* For platform which support the ISO C amendement 1 functionality we +/* For platform which support the ISO C amendment 1 functionality we support user defined character classes. */ #if WIDE_CHAR_SUPPORT /* Solaris 2.5 has a bug: must be included before . */ diff --git a/src/regex.h b/src/regex.h index eba62f2e769..32ccfb7ddef 100644 --- a/src/regex.h +++ b/src/regex.h @@ -582,7 +582,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg)); } #endif /* C++ */ -/* For platform which support the ISO C amendement 1 functionality we +/* For platform which support the ISO C amendment 1 functionality we support user defined character classes. */ #if WIDE_CHAR_SUPPORT /* Solaris 2.5 has a bug: must be included before . */ @@ -592,7 +592,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg)); #if WIDE_CHAR_SUPPORT /* The GNU C library provides support for user-defined character classes - and the functions from ISO C amendement 1. */ + and the functions from ISO C amendment 1. */ # ifdef CHARCLASS_NAME_MAX # define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX # else diff --git a/src/textprop.c b/src/textprop.c index 29425f7a550..a1c7593f568 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1625,7 +1625,7 @@ Return t if any property was actually removed, nil otherwise. */) DEFUN ("text-property-any", Ftext_property_any, Stext_property_any, 4, 5, 0, - doc: /* Check text from START to END for property PROPERTY equalling VALUE. + doc: /* Check text from START to END for property PROPERTY equaling VALUE. If so, return the position of the first character whose property PROPERTY is `eq' to VALUE. Otherwise return nil. If the optional fifth argument OBJECT is a buffer (or nil, which means @@ -1661,7 +1661,7 @@ markers). If OBJECT is a string, START and END are 0-based indices into it. */ DEFUN ("text-property-not-all", Ftext_property_not_all, Stext_property_not_all, 4, 5, 0, - doc: /* Check text from START to END for property PROPERTY not equalling VALUE. + doc: /* Check text from START to END for property PROPERTY not equaling VALUE. If so, return the position of the first character whose property PROPERTY is not `eq' to VALUE. Otherwise, return nil. If the optional fifth argument OBJECT is a buffer (or nil, which means diff --git a/src/w32select.c b/src/w32select.c index e3225c3f996..392cb07a96d 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -39,7 +39,7 @@ along with GNU Emacs. If not, see . */ * * When copying or cutting (sending data to the OS), the data is * announced and stored internally, but only actually rendered on - * request. The requester determines the format provided. The + * request. The requestor determines the format provided. The * {next-}selection-coding-system is only used, when its corresponding * clipboard type matches the type requested. * @@ -335,7 +335,7 @@ render_all (Lisp_Object ignore) OpenClipboard (NULL); - /* There is no usefull means to report errors here, there are none + /* There is no useful means to report errors here, there are none expected anyway, and even if there were errors, they wouldn't do any harm. So we just go ahead and do what has to be done without bothering with error handling. */ @@ -750,7 +750,7 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data, else { /* Advertise all supported formats so that whatever the - requester chooses, only one encoding step needs to be + requestor chooses, only one encoding step needs to be made. This is intentionally different from what we do in the handler for WM_RENDERALLFORMATS. */ SetClipboardData (CF_UNICODETEXT, NULL); @@ -1138,4 +1138,3 @@ globals_of_w32select (void) clipboard_owner = create_owner (); } - diff --git a/src/w32term.c b/src/w32term.c index a2ccdd21f7d..6df218326d1 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -2665,7 +2665,7 @@ x_scroll_run (struct window *w, struct run *run) } else { - /* Scolling down. Make sure we don't copy over the mode line. + /* Scrolling down. Make sure we don't copy over the mode line. at the bottom. */ if (to_y + run->height > bottom_y) height = bottom_y - to_y; diff --git a/src/xdisp.c b/src/xdisp.c index 52f73785e2d..3ac5651975b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1915,7 +1915,7 @@ get_glyph_string_clip_rects (struct glyph_string *s, NativeRectangle *rects, int environments with anti-aliased text: if the same text is drawn onto the same place multiple times, it gets thicker. If the overlap we are processing is for the erased cursor, we - take the intersection with the rectagle of the cursor. */ + take the intersection with the rectangle of the cursor. */ if (s->for_overlaps & OVERLAPS_ERASED_CURSOR) { XRectangle rc, r_save = r; diff --git a/src/xselect.c b/src/xselect.c index 4bfab4143cc..f9ebdf730d4 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -516,7 +516,7 @@ static struct selection_data *converted_selections; static Atom conversion_fail_tag; /* Used as an unwind-protect clause so that, if a selection-converter signals - an error, we tell the requester that we were unable to do what they wanted + an error, we tell the requestor that we were unable to do what they wanted before we throw to top-level or go into the debugger or whatever. */ static Lisp_Object @@ -693,7 +693,7 @@ x_reply_selection_request (struct input_event *event, bytes_remaining = cs->size; bytes_remaining *= format_bytes; - /* Wait for the requester to ack by deleting the property. + /* Wait for the requestor to ack by deleting the property. This can run Lisp code (process handlers) or signal. */ if (! had_errors) { @@ -732,7 +732,7 @@ x_reply_selection_request (struct input_event *event, if (had_errors) break; - /* Wait for the requester to ack this chunk by deleting + /* Wait for the requestor to ack this chunk by deleting the property. This can run Lisp code or signal. */ TRACE1 ("Waiting for increment ACK (deletion of %s)", XGetAtomName (display, cs->property)); @@ -740,7 +740,7 @@ x_reply_selection_request (struct input_event *event, } /* Now write a zero-length chunk to the property to tell the - requester that we're done. */ + requestor that we're done. */ BLOCK_INPUT; if (! waiting_for_other_props_on_window (display, window)) XSelectInput (display, window, 0L); diff --git a/src/xterm.c b/src/xterm.c index 290acdd9ca4..abe52238415 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -3317,7 +3317,7 @@ x_scroll_run (struct window *w, struct run *run) } else { - /* Scolling down. Make sure we don't copy over the mode line. + /* Scrolling down. Make sure we don't copy over the mode line. at the bottom. */ if (to_y + run->height > bottom_y) height = bottom_y - to_y; -- cgit v1.2.3 From 333f9019e29e9b6de3a7ec07448be1d364ba540b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 11 Dec 2011 21:32:49 -0800 Subject: Spelling fixes. --- doc/emacs/ChangeLog | 2 +- doc/lispref/ChangeLog | 2 +- doc/lispref/elisp.texi | 4 ++-- doc/lispref/internals.texi | 4 ++-- doc/lispref/nonascii.texi | 2 +- doc/lispref/vol1.texi | 6 +++--- doc/lispref/vol2.texi | 4 ++-- doc/misc/calc.texi | 6 +++--- doc/misc/cc-mode.texi | 2 +- doc/misc/dbus.texi | 2 +- doc/misc/ebrowse.texi | 2 +- doc/misc/emacs-mime.texi | 2 +- doc/misc/gnus-faq.texi | 2 +- doc/misc/gnus.texi | 4 ++-- doc/misc/tramp.texi | 4 ++-- etc/srecode/el.srt | 2 +- lib-src/ChangeLog | 2 +- lisp/ChangeLog.13 | 2 +- lisp/ChangeLog.15 | 2 +- lisp/ChangeLog.3 | 2 +- lisp/ChangeLog.7 | 14 +++++++------- lisp/calc/calc-poly.el | 26 +++++++++++++------------- lisp/cedet/semantic/bovine/el.el | 8 ++++---- lisp/cedet/semantic/find.el | 2 +- lisp/cedet/semantic/grammar.el | 2 +- lisp/cedet/semantic/wisent/comp.el | 2 +- lisp/cedet/srecode/srt-mode.el | 2 +- lisp/comint.el | 2 +- lisp/delim-col.el | 14 +++++++------- lisp/emulation/cua-base.el | 2 +- lisp/epa-dired.el | 2 +- lisp/epa-file.el | 4 ++-- lisp/erc/ChangeLog.03 | 8 ++++---- lisp/eshell/em-dirs.el | 2 +- lisp/forms.el | 2 +- lisp/gnus/ChangeLog | 4 ++-- lisp/gnus/plstore.el | 2 +- lisp/ibuf-ext.el | 2 +- lisp/international/mule-util.el | 2 +- lisp/mail/emacsbug.el | 2 +- lisp/net/ange-ftp.el | 2 +- lisp/net/dbus.el | 2 +- lisp/net/tramp-sh.el | 6 +++--- lisp/net/xesam.el | 2 +- lisp/obsolete/old-whitespace.el | 8 ++++---- lisp/org/ChangeLog | 2 +- lisp/org/org.el | 6 +++--- lisp/proced.el | 2 +- lisp/progmodes/ada-mode.el | 6 +++--- lisp/progmodes/ada-xref.el | 2 +- lisp/progmodes/cc-awk.el | 2 +- lisp/progmodes/cc-cmds.el | 2 +- lisp/progmodes/cc-engine.el | 2 +- lisp/progmodes/cc-fonts.el | 2 +- lisp/progmodes/cc-langs.el | 2 +- lisp/progmodes/cc-mode.el | 2 +- lisp/progmodes/grep.el | 2 +- lisp/progmodes/gud.el | 4 ++-- lisp/progmodes/hideif.el | 2 +- lisp/progmodes/inf-lisp.el | 2 +- lisp/progmodes/vhdl-mode.el | 18 +++++++++--------- lisp/shell.el | 2 +- lisp/url/url-cookie.el | 2 +- lisp/url/url-vars.el | 1 - src/ChangeLog.10 | 6 +++--- src/ChangeLog.2 | 6 +++--- src/alloc.c | 2 +- src/editfns.c | 2 +- src/emacs.c | 2 +- src/fontset.c | 2 +- src/ftfont.c | 2 +- src/lastfile.c | 3 +-- src/lread.c | 2 +- src/nsfont.m | 2 +- src/region-cache.c | 4 ++-- src/region-cache.h | 4 ++-- src/termhooks.h | 4 ++-- src/xfns.c | 8 ++++---- 78 files changed, 146 insertions(+), 148 deletions(-) (limited to 'lisp/cedet/srecode') diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 7661b8c401b..d1dbbfd0831 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1676,7 +1676,7 @@ 2009-08-31 Nick Roberts * building.texi (Threads Buffer, Multithreaded Debugging): - Re-organise these two sections. + Reorganize these two sections. 2009-08-29 Eli Zaretskii diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index d620c9e3c4c..44d44e7528c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -9754,7 +9754,7 @@ directory have been changed to reflect this. * All instances of @indentedresultt{} have been changed to - ` @result{}', using 5 spaces at the begining of the line. + ` @result{}', using 5 spaces at the beginning of the line. 1989-04-24 Robert J. Chassell (bob@rice-chex.ai.mit.edu) diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index cefa917a4e1..98eaf1f8ade 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -1381,7 +1381,7 @@ Operating System Interface * System Environment:: Distinguish the name and kind of system. * User Identification:: Finding the name and user id of the user. * Time of Day:: Getting the current time. -* Time Conversion:: Converting a time from numeric form to +* Time Conversion:: Converting a time from numeric form to calendrical data and vice versa. * Time Parsing:: Converting a time from numeric form to text and vice versa. @@ -1438,7 +1438,7 @@ Tips and Conventions GNU Emacs Internals * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 0168c564e34..9ef4646b50b 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -13,7 +13,7 @@ internal aspects of GNU Emacs that may be of interest to C programmers. @menu * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. @@ -196,7 +196,7 @@ function definition in pure storage. If it is non-@code{nil}, then the function definition is copied into pure storage. This flag is @code{t} while loading all of the basic functions for -building Emacs initially (allowing those functions to be sharable and +building Emacs initially (allowing those functions to be shareable and non-collectible). Dumping Emacs as an executable always writes @code{nil} in this variable, regardless of the value it actually has before and after dumping. diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index 298c7c3d1a8..46dbbb08e57 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -1580,7 +1580,7 @@ decoding functions (@pxref{Explicit Encoding}). Sometimes, you need to prefer several coding systems for some operation, rather than fix a single one. Emacs lets you specify a priority order for using coding systems. This ordering affects the -sorting of lists of coding sysems returned by functions such as +sorting of lists of coding systems returned by functions such as @code{find-coding-systems-region} (@pxref{Lisp and Coding Systems}). @defun coding-system-priority-list &optional highestp diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi index 914ba5b1fd8..c89447fc139 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi @@ -44,7 +44,7 @@ @end ifset @c per rms and peterb, use 10pt fonts for the main text, mostly to -@c save on paper cost. +@c save on paper cost. @c Do this inside @tex for now, so current makeinfo does not complain. @tex @ifset smallbook @@ -1402,7 +1402,7 @@ Operating System Interface * System Environment:: Distinguish the name and kind of system. * User Identification:: Finding the name and user id of the user. * Time of Day:: Getting the current time. -* Time Conversion:: Converting a time from numeric form to +* Time Conversion:: Converting a time from numeric form to calendrical data and vice versa. * Time Parsing:: Converting a time from numeric form to text and vice versa. @@ -1458,7 +1458,7 @@ Tips and Conventions GNU Emacs Internals * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 1f84b267c9b..d45d23da365 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi @@ -1401,7 +1401,7 @@ Operating System Interface * System Environment:: Distinguish the name and kind of system. * User Identification:: Finding the name and user id of the user. * Time of Day:: Getting the current time. -* Time Conversion:: Converting a time from numeric form to +* Time Conversion:: Converting a time from numeric form to calendrical data and vice versa. * Time Parsing:: Converting a time from numeric form to text and vice versa. @@ -1457,7 +1457,7 @@ Tips and Conventions GNU Emacs Internals * Building Emacs:: How the dumped Emacs is made. -* Pure Storage:: A kludge to make preloaded Lisp functions sharable. +* Pure Storage:: Kludge to make preloaded Lisp functions shareable. * Garbage Collection:: Reclaiming space for Lisp objects no longer used. * Memory Usage:: Info about total size of Lisp objects made so far. * Writing Emacs Primitives:: Writing C code for Emacs. diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 535efd86270..d0c15c1940e 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -16873,7 +16873,7 @@ The @kbd{t U} (@code{calc-unix-time}) [@code{unixtime}] command converts a date form into a Unix time value, which is the number of seconds since midnight on Jan 1, 1970, or vice-versa. The numeric result will be an integer if the current precision is 12 or less; for higher -precisions, the result may be a float with (@var{precision}@minus{}12) +precision, the result may be a float with (@var{precision}@minus{}12) digits after the decimal. Just as for @kbd{t J}, the numeric time is interpreted in the GMT time zone and the date form is interpreted in the current or specified zone. Some systems use Unix-like @@ -16943,7 +16943,7 @@ from a date form as an integer in the range 0 to 59. The @kbd{M-6 t P} [@code{second}] function extracts the second from a date form. If the current precision is 12 or less, the result is an integer in the range 0 to 59. For higher -precisions, the result may instead be a floating-point number. +precision, the result may instead be a floating-point number. @tindex weekday The @kbd{M-7 t P} [@code{weekday}] function extracts the weekday @@ -18499,7 +18499,7 @@ counterparts, which are also available separately as @code{calc-sech} Calc can compute a variety of less common functions that arise in various branches of mathematics. All of the functions described in this section allow arbitrary complex arguments and, except as noted, -will work to arbitrarily large precisions. They can not at present +will work to arbitrarily large precision. They can not at present handle error forms or intervals as arguments. NOTE: These functions are still experimental. In particular, their diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index d5f403e5cdb..c36e45e60f7 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -2160,7 +2160,7 @@ A space between the function name and opening parenthesis when calling a user function. The last character of the function name and the opening parenthesis are highlighted. This font-locking rule will spuriously highlight a valid concatenation expression where an -identifier precedes a parenthesised expression. Unfortunately. +identifier precedes a parenthesized expression. Unfortunately. @item Whitespace following the @samp{\} in what otherwise looks like an diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index 88b068ccd5b..06a52107d71 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -1816,7 +1816,7 @@ handled by a hook function. @defvar dbus-event-error-hooks This hook variable keeps a list of functions, which are called when a D-Bus error happens in the event handler. Every function must accept -two arguments, the event and the error variable catched in +two arguments, the event and the error variable caught in @code{condition-case} by @code{dbus-error}. Such functions can be used the adapt the error signal to be raised. diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index 19ee9705484..a2a4017eb64 100644 --- a/doc/misc/ebrowse.texi +++ b/doc/misc/ebrowse.texi @@ -482,7 +482,7 @@ name. @table @kbd @item SPC This command views the class declaration if the database -contains informations about it. If you don't parse the entire source +contains information about it. If you don't parse the entire source you are working on, some classes will only be known to exist but the location of their declarations and definitions will not be known.@refill diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index c44cc1c9b09..91440dcfe8f 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -417,7 +417,7 @@ called with a @acronym{MIME} handle as the argument. @vindex mm-inline-text-html-with-images Some @acronym{HTML} mails might have the trick of spammers using @samp{} tags. It is likely to be intended to verify whether you -have read the mail. You can prevent your personal informations from +have read the mail. You can prevent your personal information from leaking by setting this option to @code{nil} (which is the default). It is currently ignored by Emacs/w3. For emacs-w3m, you may use the command @kbd{t} on the image anchor to show an image even if it is diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index ace7bb42c21..7bd3e4ac7fa 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -1838,7 +1838,7 @@ inconvenient since you are not displaying the found mail in Gnus. Here comes nnir into action. Nnir is a front end to search engines like swish-e or swish++ and others. You index your mail with one of those search -engines and with the help of nnir you can search trough +engines and with the help of nnir you can search through the indexed mail and generate a temporary group with all messages which met your search criteria. If this sound cool to you get nnir.el from diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 5ae86c4e631..68c7e8bbdbc 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -4622,7 +4622,7 @@ Sieve is a server-side mail filtering language. In Gnus you can use the @code{sieve} group parameter (@pxref{Group Parameters}) to specify sieve rules that should apply to each group. Gnus provides two commands to translate all these group parameters into a proper Sieve -script that can be transfered to the server somehow. +script that can be transferred to the server somehow. @vindex gnus-sieve-file @vindex gnus-sieve-region-start @@ -8332,7 +8332,7 @@ Files with name matching this regular expression won't be viewed. Files with a @acronym{MIME} type matching this variable won't be viewed. Note that Gnus tries to guess what type the file is based on the name. @code{gnus-uu} is not a @acronym{MIME} package (yet), so this is slightly -kludgey. +kludgy. @item gnus-uu-tmp-dir @vindex gnus-uu-tmp-dir diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index e2c2594b66e..1cea074fa2b 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -528,8 +528,8 @@ differ. @cindex methods, inline @cindex methods, external Loading or saving a remote file requires that the content of the file -be transfered between the two machines. The content of the file can -be transfered using one of two methods: the @dfn{inline method} over +be transferred between the two machines. The content of the file can +be transferred using one of two methods: the @dfn{inline method} over the same connection used to log in to the remote machine, or the @dfn{external method} through another connection using a remote copy program such as @command{rcp}, @command{scp} or @command{rsync}. diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt index 6117e72be2a..03a797bb709 100644 --- a/etc/srecode/el.srt +++ b/etc/srecode/el.srt @@ -109,7 +109,7 @@ $ toolbar that can move it. 2010-07-29 Chong Yidong diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index b97bcea89cc..e0f9bc9ade2 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -8647,7 +8647,7 @@ * comint.el, inf-lisp.el, shell.el: Updated to meet Olin's version 2.0 comint offerings. * ring.el: The underlying history mechanism for comint. - Generalised handling of a ring data type based on vectors. + Generalized handling of a ring data type based on vectors. * history.el: For now, a symlink to ring.el. * loaddefs.el: Updated shell-prompt-pattern doc string. diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 37387121777..b05707abe5c 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -13088,7 +13088,7 @@ 1997-07-25 Simon Marshall - * complete.el: Customise; as subgroup of minibuffer. + * complete.el: Customize; as subgroup of minibuffer. (partial-completion-mode): New option to toggle mode. (partial-completion-mode): New command to toggle mode. Add and remove hooks here, i.e., not at the top-level. @@ -13617,7 +13617,7 @@ 1997-07-15 Simon Marshall - * mouse-sel.el: Customise; create mouse-sel as subgroup of mouse. + * mouse-sel.el: Customize; create mouse-sel as subgroup of mouse. (mouse-sel-mode): New option to toggle mode. (mouse-sel-mode): New command to toggle mode. (mouse-sel-set-selection-function): If mouse-sel-default-bindings is @@ -13625,7 +13625,7 @@ (mouse-sel-bindings): New function to install/restore mouse bindings. This is called by mouse-sel-mode, i.e., not at the top-level. - * delsel.el: Customise; as part of editing-basics group. + * delsel.el: Customize; as part of editing-basics group. (delete-selection-mode): Convert to autoloaded option. Default to nil. (delete-selection-mode): Define before option. Modify pre-command-hook here, i.e., not at the top-level. @@ -14943,7 +14943,7 @@ paren-matching) and put all blink-matching-paren variables in the former (as opposed to the latter) group. - * paren.el: Customise; paren-showing as a subgroup of paren-matching. + * paren.el: Customize; paren-showing as a subgroup of paren-matching. (show-paren-style): New variable. (show-paren-match-face) (show-paren-mismatch-face): New faces. @@ -18871,7 +18871,7 @@ 1997-04-16 Simon Marshall - * font-lock.el: Customise. + * font-lock.el: Customize. (font-lock-defaults-alist): Leave ~ syntax alone in C++. (font-lock-match-c++-style-declaration-item-and-skip-to-next): Match ~ characters here. @@ -18883,10 +18883,10 @@ (font-lock-compile-keywords): Don't set font-lock-keywords. (font-lock-fontify-keywords-region): Set it here. - * fast-lock.el: Customise. + * fast-lock.el: Customize. (fast-lock-cache-data): Simplify calls of font-lock-compile-keywords. - * lazy-lock.el: Customise. + * lazy-lock.el: Customize. (lazy-lock-fontify-conservatively): Fontify around WINDOW's point. * shell.el (shell-font-lock-keywords): Use EVAL form for prompt. diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el index 97d955eb07d..e21a095c821 100644 --- a/lisp/calc/calc-poly.el +++ b/lisp/calc/calc-poly.el @@ -147,7 +147,7 @@ ;;; Return only quotient to top of stack (nil if zero) -;; calc-poly-div-remainder is a local variable for +;; calc-poly-div-remainder is a local variable for ;; calc-poly-div (in calc-alg.el), but is used by ;; calcFunc-pdiv, which is called by calc-poly-div. (defvar calc-poly-div-remainder) @@ -512,7 +512,7 @@ ;;; Given an expression find all variables that are polynomial bases. ;;; Return list in the form '( (var1 degree1) (var2 degree2) ... ). -;; The variable math-poly-base-total-base is local to +;; The variable math-poly-base-total-base is local to ;; math-total-polynomial-base, but is used by math-polynomial-p1, ;; which is called by math-total-polynomial-base. (defvar math-poly-base-total-base) @@ -539,19 +539,19 @@ nil) ;; The variable math-factored-vars is local to calcFunc-factors and -;; calcFunc-factor, but is used by math-factor-expr and +;; calcFunc-factor, but is used by math-factor-expr and ;; math-factor-expr-part, which are called (directly and indirectly) by ;; calcFunc-factor and calcFunc-factors. (defvar math-factored-vars) ;; The variable math-fact-expr is local to calcFunc-factors, -;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try +;; calcFunc-factor and math-factor-expr, but is used by math-factor-expr-try ;; and math-factor-expr-part, which are called (directly and indirectly) by ;; calcFunc-factor, calcFunc-factors and math-factor-expr. (defvar math-fact-expr) -;; The variable math-to-list is local to calcFunc-factors and -;; calcFunc-factor, but is used by math-accum-factors, which is +;; The variable math-to-list is local to calcFunc-factors and +;; calcFunc-factor, but is used by math-accum-factors, which is ;; called (indirectly) by calcFunc-factors and calcFunc-factor. (defvar math-to-list) @@ -729,7 +729,7 @@ '(1))) ;; We now have a square-free polynomial with integer coefs. - ;; For now, we use a kludgey method that finds linear and + ;; For now, we use a kludgy method that finds linear and ;; quadratic terms using floating-point root-finding. (if (setq t1 (let ((calc-symbolic-mode nil)) (math-poly-all-roots nil p t))) @@ -749,7 +749,7 @@ (math-add (math-add (math-mul den (math-pow math-fet-x 2)) - (math-mul (math-mul coef1 den) + (math-mul (math-mul coef1 den) math-fet-x)) (math-mul coef0 den))) (let ((den (math-lcm-denoms coef0))) @@ -1077,7 +1077,7 @@ If no partial fraction representation can be found, return nil." ((and (eq (car-safe expr) '^) (memq (car-safe (nth 1 expr)) '(+ -)) (integerp (nth 2 expr)) - (if (and + (if (and (or (math-known-matrixp (nth 1 (nth 1 expr))) (math-known-matrixp (nth 2 (nth 1 expr))) (and @@ -1090,11 +1090,11 @@ If no partial fraction representation can be found, return nil." (math-add-or-sub (list '* (nth 1 (nth 1 expr)) (nth 1 expr)) (list '* (nth 2 (nth 1 expr)) (nth 1 expr)) nil (eq (car (nth 1 expr)) '-)) - (math-add-or-sub (list '* (nth 1 (nth 1 expr)) - (list '^ (nth 1 expr) + (math-add-or-sub (list '* (nth 1 (nth 1 expr)) + (list '^ (nth 1 expr) (1- (nth 2 expr)))) - (list '* (nth 2 (nth 1 expr)) - (list '^ (nth 1 expr) + (list '* (nth 2 (nth 1 expr)) + (list '^ (nth 1 expr) (1- (nth 2 expr)))) nil (eq (car (nth 1 expr)) '-))) (if (> (nth 2 expr) 0) diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el index 98f744dca6e..1a2061d01e7 100644 --- a/lisp/cedet/semantic/bovine/el.el +++ b/lisp/cedet/semantic/bovine/el.el @@ -497,15 +497,15 @@ used to perform the override." Unfortunately, this requires that the tag in question has been loaded into Emacs Lisp's memory." (let ((obsoletethis (intern-soft (semantic-tag-name tag))) - (obsoletor nil)) + (obsoleter nil)) ;; This asks if our tag is available in the Emacs name space for querying. (when obsoletethis (mapatoms (lambda (a) (let ((oi (get a 'byte-obsolete-info))) (if (and oi (eq (car oi) obsoletethis)) - (setq obsoletor a))))) - (if obsoletor - (format "\n@obsolete{%s,%s}" obsoletor (semantic-tag-name tag)) + (setq obsoleter a))))) + (if obsoleter + (format "\n@obsolete{%s,%s}" obsoleter (semantic-tag-name tag)) "")))) (define-mode-local-override semantic-documentation-for-tag diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el index b4d94321bc1..a6d86691206 100644 --- a/lisp/cedet/semantic/find.el +++ b/lisp/cedet/semantic/find.el @@ -427,7 +427,7 @@ TABLE is a tag table. See `semantic-something-to-tag-table'." ;;; Old Style Brute Force Search Routines ;; -;; These functions will search through tags lists explicity for +;; These functions will search through tags lists explicitly for ;; desired information. ;; The -by-name nonterminal search can use the built in fcn diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index 98b1ab55c32..1a79adc650d 100644 --- a/lisp/cedet/semantic/grammar.el +++ b/lisp/cedet/semantic/grammar.el @@ -1290,7 +1290,7 @@ the change bounds to encompass the whole nonterminal tag." semantic-grammar-mode-keywords-3) nil ;; perform string/comment fontification nil ;; keywords are case sensitive. - ;; This puts _ & - as a word constituant, + ;; This puts _ & - as a word constituent, ;; simplifying our keywords significantly ((?_ . "w") (?- . "w")))) ;; Setup Semantic to parse grammar diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el index f92ae88c14e..884342a1df2 100644 --- a/lisp/cedet/semantic/wisent/comp.el +++ b/lisp/cedet/semantic/wisent/comp.el @@ -2640,7 +2640,7 @@ there are any reduce/reduce conflicts.") (defun wisent-print-results () "Print information on generated parser. -Report detailed informations if `wisent-verbose-flag' or +Report detailed information if `wisent-verbose-flag' or `wisent-debug-flag' are non-nil." (when (or wisent-verbose-flag wisent-debug-flag) (wisent-print-useless)) diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index 0a99b7869e8..ed2b0e2cfdb 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el @@ -194,7 +194,7 @@ we can tell font lock about them.") '(srecode-font-lock-keywords nil ;; perform string/comment fontification nil ;; keywords are case sensitive. - ;; This puts _ & - as a word constituant, + ;; This puts _ & - as a word constituent, ;; simplifying our keywords significantly ((?_ . "w") (?- . "w"))))) diff --git a/lisp/comint.el b/lisp/comint.el index c0b02e5a230..77734b69af6 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -45,7 +45,7 @@ ;; It is pretty easy to make new derived modes for other processes. ;; For documentation on the functionality provided by Comint mode, and -;; the hooks available for customising it, see the comments below. +;; the hooks available for customizing it, see the comments below. ;; For further information on the standard derived modes (shell, ;; inferior-lisp, inferior-scheme, ...), see the relevant source files. diff --git a/lisp/delim-col.el b/lisp/delim-col.el index 96a0745dd31..a0a8af80389 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -97,7 +97,7 @@ ;; operates over the text rectangle selected which rectangle diagonal is ;; given by the region start and end. ;; -;; See `delimit-columns-format' variable documentation for column formating. +;; See `delimit-columns-format' variable documentation for column formatting. ;; ;; `delimit-columns-region' is useful when you have columns of text that ;; are not well aligned, like: @@ -171,7 +171,7 @@ For examples below, consider: Valid values are: - nil no formating. That is, `delimit-columns-after' is followed by + nil no formatting. That is, `delimit-columns-after' is followed by `delimit-columns-separator'. For example, the result is: \"::\" @@ -190,9 +190,9 @@ Valid values are: For example, the result is: \"::\" Any other value is treated as t." - :type '(choice :menu-tag "Column Formating" - :tag "Column Formating" - (const :tag "No Formating" nil) + :type '(choice :menu-tag "Column Formatting" + :tag "Column Formatting" + (const :tag "No Formatting" nil) (const :tag "Column Alignment" t) (const :tag "Separator Alignment" separator) (const :tag "Column Padding" padding)) @@ -404,7 +404,7 @@ START and END delimits the corners of text rectangle." (re-search-forward delimit-columns-separator delimit-columns-limit 'move)) (setq ncol (1+ ncol))) - ;; insert first formating + ;; insert first formatting (insert delimit-columns-str-before delimit-columns-before) ;; Adjust all columns but last one (while (progn @@ -436,7 +436,7 @@ START and END delimits the corners of text rectangle." (setq spaces (and delimit-columns-format (make-string (aref delimit-columns-max ncol) ?\s))))) - ;; insert last formating + ;; insert last formatting (cond ((null delimit-columns-format) (insert delimit-columns-after delimit-columns-str-after)) ((eq delimit-columns-format 'padding) diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index a68c4dfdf69..b17fa6b1471 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -368,7 +368,7 @@ interpreted as a register number." (defcustom cua-check-pending-input t "If non-nil, don't override prefix key if input pending. -It is rumoured that `input-pending-p' is unreliable under some window +It is rumored that `input-pending-p' is unreliable under some window managers, so try setting this to nil, if prefix override doesn't work." :type 'boolean :group 'cua) diff --git a/lisp/epa-dired.el b/lisp/epa-dired.el index 0834a8df23a..d51045a5e37 100644 --- a/lisp/epa-dired.el +++ b/lisp/epa-dired.el @@ -67,7 +67,7 @@ If no one is selected, default secret key is used. " (while file-list (epa-encrypt-file (expand-file-name (car file-list)) - (epa-select-keys (epg-make-context) "Select recipents for encryption. + (epa-select-keys (epg-make-context) "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. ")) (setq file-list (cdr file-list))) (revert-buffer))) diff --git a/lisp/epa-file.el b/lisp/epa-file.el index bef67ba4f69..4d05563719d 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -235,7 +235,7 @@ encryption is used." (current-buffer))))) (epa-select-keys context - "Select recipents for encryption. + "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. " recipients) (if epa-file-encrypt-to @@ -273,7 +273,7 @@ If no one is selected, symmetric encryption will be performed. " (epg-sub-key-id (car (epg-key-sub-key-list key)))) (epa-select-keys (epg-make-context) - "Select recipents for encryption. + "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. ")))) ;;;###autoload diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 135d8f788f8..3e687202d38 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 @@ -416,7 +416,7 @@ * erc-button.el: New variable erc-button-wrap-long-urls. Modified erc-button-add-buttons: New optional argument REGEXP. - If we're buttonising a URL and erc-button-wrap-long-urls is + If we're buttonizing a URL and erc-button-wrap-long-urls is non-nil, try and wrap them Modified erc-button-add-buttons-1: @@ -822,7 +822,7 @@ (define-erc-module): the enable and disable routines now update erc-modules accordingly erc-modules: new variable controlling the modules which erc has loaded/will - load. when customising, it will automatically enable modules. it won't + load. when customizing, it will automatically enable modules. it won't automatically disable modules which are removed, yet. (erc-update-modules): enable all modules in `erc-modules' @@ -1058,7 +1058,7 @@ * erc.el(erc-process-input-line): when displaying the help for a function, if no documentation exists, don't fall over - (erc-cmd-SAY): new function for quoting lines begining with / + (erc-cmd-SAY): new function for quoting lines beginning with / (erc-server-NICK): - fix a bug where the "is now known as" message doesn't appear on newly created /query buffers @@ -1491,7 +1491,7 @@ * erc.el: * removed duplicate do-no-parse-args properties for the defaliased defuns (erc-process-input-line): show function signature when incorrect args - (erc-extract-command-from-line): canonicalise defaliases before extracting + (erc-extract-command-from-line): canonicalize defaliases before extracting plist (erc-cmd-CLEAR): fixed (erc-cmd-UNIGNORE): fixed again diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el index 1aa2c34c395..cab84951143 100644 --- a/lisp/eshell/em-dirs.el +++ b/lisp/eshell/em-dirs.el @@ -160,7 +160,7 @@ it's far more automatic. `pushd' allows the user to decide which directories gets pushed, and its size is unlimited. `eshell-last-dir-ring' is meant for users who don't use `pushd' -explicity very much, but every once in a while would like to return to +explicitly very much, but every once in a while would like to return to a previously visited directory without having to type in the whole thing again." :type 'integer diff --git a/lisp/forms.el b/lisp/forms.el index 215f3ce88f7..0d92dc3ffd9 100644 --- a/lisp/forms.el +++ b/lisp/forms.el @@ -709,7 +709,7 @@ Commands: Equivalent keys in read-only mode: (forms-first-record)) ) - ;; user customising + ;; user customizing ;;(message "forms: proceeding setup (user hooks)...") (run-mode-hooks 'forms-mode-hook 'forms-mode-hooks) ;;(message "forms: setting up... done.") diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 72f99e65184..00b5417fa37 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -3595,7 +3595,7 @@ (autoload): Silence byte-compiler. (nnir-open-server): Add a hook for nnir groups. (nnir-request-move-article): Don't mangle the header. Better to use - formating variables (which will be added in the future). + formatting variables (which will be added in the future). (nnir-registry-action): Update the registry using the original article group name. (nnir-mode): Install nnir-specific hooks for updating the registry. @@ -21851,7 +21851,7 @@ 2004-01-06 Steve Youngs - * gnus-ems.el (gnus-mode-line-modified): Don't conditionalise on + * gnus-ems.el (gnus-mode-line-modified): Don't conditionalize on XEmacs version. * dns.el (dns-make-network-process): Use `open-network-stream' diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el index 340c7255958..50208cc5b0b 100644 --- a/lisp/gnus/plstore.el +++ b/lisp/gnus/plstore.el @@ -420,7 +420,7 @@ SECRET-KEYS is a plist containing secret data." (current-buffer))))) (epa-select-keys context - "Select recipents for encryption. + "Select recipients for encryption. If no one is selected, symmetric encryption will be performed. " recipients) (if plstore-encrypt-to diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el index 6c8db872c0b..a0fae8d8671 100644 --- a/lisp/ibuf-ext.el +++ b/lisp/ibuf-ext.el @@ -26,7 +26,7 @@ ;;; Commentary: ;; These functions should be automatically loaded when called, but you -;; can explicity (require 'ibuf-ext) in your ~/.emacs to have them +;; can explicitly (require 'ibuf-ext) in your ~/.emacs to have them ;; preloaded. ;;; Code: diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el index ef09cdda2de..f0a5ebbee40 100644 --- a/lisp/international/mule-util.el +++ b/lisp/international/mule-util.el @@ -314,7 +314,7 @@ Optional 5th argument NIL-FOR-TOO-LONG non-nil means return nil (defmacro with-coding-priority (coding-systems &rest body) "Execute BODY like `progn' with CODING-SYSTEMS at the front of priority list. CODING-SYSTEMS is a list of coding systems. See `set-coding-system-priority'. -This affects the implicit sorting of lists of coding sysems returned by +This affects the implicit sorting of lists of coding systems returned by operations such as `find-coding-systems-region'." (let ((current (make-symbol "current"))) `(let ((,current (coding-system-priority-list))) diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index 576f443c8e2..5b7601c6335 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -437,7 +437,7 @@ and send the mail again%s." (car bug)) items)) (nreverse items)))) - (widget-insert "No bugs maching your keywords found.\n")) + (widget-insert "No bugs matching your keywords found.\n")) (widget-insert "\n") (widget-create 'push-button :notify (lambda (&rest ignore) diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index a0d2281bfe8..06d200c4e3e 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -2854,7 +2854,7 @@ NO-ERROR, if a listing for DIRECTORY cannot be obtained." ;; that a wasted listing is not done: ;; 1. When looking for a .dired file in dired-x.el. ;; 2. The syntax of FILE and DIR make it impossible that FILE could be a valid -;; subdirectory. This is of course an OS dependent judgement. +;; subdirectory. This is of course an OS dependent judgment. (defvar dired-local-variables-file) (defmacro ange-ftp-allow-child-lookup (dir file) diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 8a8d9e6332f..9254fef8a7f 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -101,7 +101,7 @@ Otherwise, return result of last form in BODY, or all other errors." (defvar dbus-event-error-hooks nil "Functions to be called when a D-Bus error happens in the event handler. Every function must accept two arguments, the event and the error variable -catched in `condition-case' by `dbus-error'.") +caught in `condition-case' by `dbus-error'.") ;;; Hash table of registered functions. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index ee4c8966626..da6f8a69e6d 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -44,7 +44,7 @@ (defcustom tramp-inline-compress-start-size 4096 "*The minimum size of compressing where inline transfer. -When inline transfer, compress transfered data of file +When inline transfer, compress transferred data of file whose size is this value or above (up to `tramp-copy-size-limit'). If it is nil, no compression at all will be applied." :group 'tramp @@ -3726,7 +3726,7 @@ process to set up. VEC specifies the connection." ;; Check whether the output of "uname -sr" has been changed. If ;; yes, this is a strong indication that we must expire all ;; connection properties. We start again with - ;; `tramp-maybe-open-connection', it will be catched there. + ;; `tramp-maybe-open-connection', it will be caught there. (tramp-message vec 5 "Checking system information") (let ((old-uname (tramp-get-connection-property vec "uname" nil)) (new-uname @@ -4215,7 +4215,7 @@ connection if a previous connection has died for some reason." (tramp-send-command vec "echo are you awake" t t) (unless (and (memq (process-status p) '(run open)) (tramp-wait-for-output p 10)) - ;; The error will be catched locally. + ;; The error will be caught locally. (tramp-error vec 'file-error "Awake did fail"))) (file-error (tramp-flush-connection-property vec) diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index 279ea54e4cc..17b22aa03ba 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el @@ -172,7 +172,7 @@ (defface xesam-highlight '((t :inherit match)) "Face to highlight query entries. -It will be overlayed by `widget-documentation-face', so it shall +It will be overlaid by `widget-documentation-face', so it shall be different at least in one face property not set in that face." :group 'xesam) diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el index c33794f668d..0c0580b55dc 100644 --- a/lisp/obsolete/old-whitespace.el +++ b/lisp/obsolete/old-whitespace.el @@ -515,12 +515,12 @@ See `whitespace-buffer' docstring for a summary of the problems." (whitespace-check-whitespace-mode current-prefix-arg) (if (and buffer-file-name whitespace-mode) (let ((whitespace-any nil) - (whitespace-tabwith 8) - (whitespace-tabwith-saved tab-width)) + (whitespace-tabwidth 8) + (whitespace-tabwidth-saved tab-width)) ;; since all printable TABS should be 8, irrespective of how ;; they are displayed. - (setq tab-width whitespace-tabwith) + (setq tab-width whitespace-tabwidth) (if (and whitespace-check-buffer-leading (whitespace-buffer-leading)) @@ -562,7 +562,7 @@ See `whitespace-buffer' docstring for a summary of the problems." (message "The region is now clean") (message "%s is now clean" buffer-file-name))) (whitespace-update-modeline))) - (setq tab-width whitespace-tabwith-saved)))) + (setq tab-width whitespace-tabwidth-saved)))) ;;;###autoload (defun whitespace-cleanup-region (s e) diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 555709f1fa8..6f835c7bfa4 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -7124,7 +7124,7 @@ 2010-11-11 Dan Davison * ob.el (org-babel-get-src-block-info): Form info list correctly - when parenthesised arguments are missing. + when parenthesized arguments are missing. 2010-11-11 Dan Davison diff --git a/lisp/org/org.el b/lisp/org/org.el index afd4ea6b4c3..8aca74e69cc 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -2580,7 +2580,7 @@ To turn this on on a per-file basis, insert anywhere in the file: (defcustom org-time-stamp-custom-formats '("<%m/%d/%y %a>" . "<%m/%d/%y %a %H:%M>") ; american "Custom formats for time stamps. See `format-time-string' for the syntax. -These are overlayed over the default ISO format if the variable +These are overlaid over the default ISO format if the variable `org-display-custom-times' is set. Time like %H:%M should be at the end of the second format. The custom formats are also honored by export commands, if custom time display is turned on at the time of export." @@ -15109,7 +15109,7 @@ The command returns the inserted time stamp." (org-restart-font-lock) (setq org-table-may-need-update t) (if org-display-custom-times - (message "Time stamps are overlayed with custom format") + (message "Time stamps are overlaid with custom format") (message "Time stamp overlays removed"))) (defun org-display-custom-time (beg end) @@ -18961,7 +18961,7 @@ contexts are: :target on a <> :radio-target on a <<>> :latex-fragment on a LaTeX fragment -:latex-preview on a LaTeX fragment with overlayed preview image +:latex-preview on a LaTeX fragment with overlaid preview image This function expects the position to be visible because it uses font-lock faces as a help to recognize the following contexts: :table-special, :link, diff --git a/lisp/proced.el b/lisp/proced.el index e4987bd926c..baee7c0f6ee 100644 --- a/lisp/proced.el +++ b/lisp/proced.el @@ -1332,7 +1332,7 @@ Prefix ARG controls sort order, see `proced-sort-interactive'." (proced-sort-interactive key arg) (message "No sorter defined here.")))))) -;;; Formating +;;; Formatting (defun proced-format-time (time) "Format time interval TIME." diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 64734420a8c..17ff4bd32a6 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -499,7 +499,7 @@ Used to define `ada-*-keywords.'")) (defvar ada-case-exception-substring '() "Alist of substrings (entities) that have special casing. -The substrings are detected for word constituant when the word +The substrings are detected for word constituent when the word is not itself in `ada-case-exception', and only for substrings that either are at the beginning or end of the word, or start after '_'.") @@ -1773,7 +1773,7 @@ ATTENTION: This function might take very long for big buffers!" ;; `ada-insert-paramlist'. ;; Both steps are called from `ada-format-paramlist'. ;; Note: Comments inside the parameter list are lost. -;; The syntax has to be correct, or the reformating will fail. +;; The syntax has to be correct, or the reformatting will fail. ;;-------------------------------------------------------------- (defun ada-format-paramlist () @@ -2139,7 +2139,7 @@ command like: (while command-line-args-left (let ((source (car command-line-args-left))) - (message "Formating %s" source) + (message "Formatting %s" source) (find-file source) (ada-indent-region (point-min) (point-max)) (ada-adjust-case-buffer) diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 2f6a7be393a..f30457992a3 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -30,7 +30,7 @@ ;;; for lookup and completion in Ada mode. ;;; ;;; If a file *.`adp' exists in the ada-file directory, then it is -;;; read for configuration informations. It is read only the first +;;; read for configuration information. It is read only the first ;;; time a cross-reference is asked for, and is not read later. ;;; You need Emacs >= 20.2 to run this package diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 8213a83461b..f44b34ac351 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -545,7 +545,7 @@ (defun c-awk-vsemi-status-unknown-p () ;; Are we unsure whether there is a virtual semicolon on the current line? ;; DO NOT under any circumstances attempt to calculate this; that would - ;; defeat the (admittedly kludgey) purpose of this function, which is to + ;; defeat the (admittedly kludgy) purpose of this function, which is to ;; prevent an infinite recursion in c-beginning-of-statement-1 when point ;; starts at a `while' token. (not (c-get-char-property (c-point 'eol) 'c-awk-NL-prop))) diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 4981bbfd2bc..686695bc838 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1360,7 +1360,7 @@ No indentation or other \"electric\" behavior is performed." ;; Determine where we are with respect to functions (or other brace ;; constructs, included in the term "function" in the rest of this comment). ;; Point is assumed to be outside any macro or literal. - ;; This is used by c-\(begining\|end\)-of-defun. + ;; This is used by c-\(beginning\|end\)-of-defun. ;; ;; Return one of these symbols: ;; at-header : we're at the start of a function's header. diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index cd483d20f2f..28e7ffae40e 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2113,7 +2113,7 @@ comment at the start of cc-engine.el for more info." ;; buffer). Otherwise, return nil. ;; ;; This function is almost the same as `c-literal-limits'. It differs in - ;; that it is a lower level function, and that it rigourously follows the + ;; that it is a lower level function, and that it rigorously follows the ;; syntax from BOB, whereas `c-literal-limits' uses a "local" safe position. ;; ;; NOTE: This function manipulates `c-state-nonlit-pos-cache'. This cache diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index ac4d1bf9e57..c18789de07b 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -1211,7 +1211,7 @@ casts and declarations are fontified. Used on level 2 and higher." ;; o - '<> if the arglist is of angle bracket type; ;; o - 'arglist if it's some other arglist; ;; o - nil, if not in an arglist at all. This includes the - ;; parenthesised condition which follows "if", "while", etc. + ;; parenthesized condition which follows "if", "while", etc. context ;; The position of the next token after the closing paren of ;; the last detected cast. diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 37818638d41..0bfca84cd96 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -522,7 +522,7 @@ don't have EOL terminated statements. " (c-lang-defconst c-vsemi-status-unknown-p-fn "Contains a function \"are we unsure whether there is a virtual semicolon on this line?\". -The (admittedly kludgey) purpose of such a function is to prevent an infinite +The (admittedly kludgy) purpose of such a function is to prevent an infinite recursion in c-beginning-of-statement-1 when point starts at a `while' token. The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1, even indirectly. This variable contains nil for languages which don't have diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index cc5a5236255..6a40378935c 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -943,7 +943,7 @@ Note that the style variables are always made local to the buffer." ;; Note that this function must be FAST rather than accurate. Note ;; also that it only has any effect when font locking is enabled. ;; We exploit this by checking for font-lock-*-face instead of doing - ;; rigourous syntactic analysis. + ;; rigorous syntactic analysis. ;; If either change boundary is wholly inside an identifier, delete ;; it/them from the cache. Don't worry about being inside a string diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 75d71d2d8a9..b379ce67fd7 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -108,7 +108,7 @@ To change the default value, use Customize or call the function Setting it causes the grep commands to put point at the end of their output window so that the end of the output is always visible rather -than the begining." +than the beginning." :type 'boolean :version "22.1" :group 'grep) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 406db76487d..de8da09768d 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1919,7 +1919,7 @@ extension EXTN. Normally EXTN is given as the regular expression ;; in petticoat junction. (defun gud-jdb-skip-block () - ;; Find the begining of the block. + ;; Find the beginning of the block. (while (not (eq (following-char) ?{)) @@ -1936,7 +1936,7 @@ extension EXTN. Normally EXTN is given as the regular expression (gud-jdb-skip-character-literal)) (t (forward-char)))) - ;; Now at the begining of the block. + ;; Now at the beginning of the block. (forward-char) ;; Skip over the body of the block as well as the final brace. diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 374a45acec6..82961376669 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -822,7 +822,7 @@ Point is left unchanged." (defun hif-possibly-hide () "Called at #ifX expression, this hides those parts that should be hidden. -It uses the judgement of `hide-ifdef-evaluator'." +It uses the judgment of `hide-ifdef-evaluator'." ;; (message "hif-possibly-hide") (sit-for 1) (let ((test (hif-canonicalize)) (range (hif-find-range))) diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el index 1328e303d45..dd24aeea9a3 100644 --- a/lisp/progmodes/inf-lisp.el +++ b/lisp/progmodes/inf-lisp.el @@ -36,7 +36,7 @@ ;; This makes these modes easier to use. ;; For documentation on the functionality provided by comint mode, and -;; the hooks available for customising it, see the file comint.el. +;; the hooks available for customizing it, see the file comint.el. ;; For further information on inferior-lisp mode, see the comments below. ;; Needs fixin: diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index a81cc107ce3..deac85581d2 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -10812,7 +10812,7 @@ but not if inside a comment or quote." (defvar vhdl-port-list nil "Variable to hold last port map parsed.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (ent-name ;; ((generic-names) generic-type generic-init generic-comment group-comment) ;; ((port-names) port-object port-direct port-type port-comment group-comment) @@ -11660,7 +11660,7 @@ reflected in a subsequent paste operation." (defvar vhdl-subprog-list nil "Variable to hold last subprogram interface parsed.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (subprog-name kind ;; ((names) object direct type init comment group-comment) ;; return-type return-comment group-comment) @@ -12971,7 +12971,7 @@ This does background highlighting of translate-off regions.") (defvar vhdl-entity-alist nil "Cache with entities and corresponding architectures for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (ent-key ent-name ent-file ent-line ;; (arch-key arch-name arch-file arch-line @@ -12982,7 +12982,7 @@ project/directory.") (defvar vhdl-config-alist nil "Cache with configurations for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (conf-key conf-name conf-file conf-line ent-key arch-key ;; (inst-key inst-comp-name inst-ent-key inst-arch-key @@ -12991,7 +12991,7 @@ project/directory.") (defvar vhdl-package-alist nil "Cache with packages for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (pack-key pack-name pack-file pack-line ;; (comp-key comp-name comp-file comp-line) @@ -13003,19 +13003,19 @@ project/directory.") (defvar vhdl-ent-inst-alist nil "Cache with instantiated entities for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key (inst-ent-key)) (defvar vhdl-file-alist nil "Cache with design units in each file for each project/directory.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key ;; (file-name (ent-list) (arch-list) (arch-ent-list) (conf-list) ;; (pack-list) (pack-body-list) (inst-list) (inst-ent-list)) (defvar vhdl-directory-alist nil "Cache with source directories for each project.") -;; structure: (parenthesised expression means list of such entries) +;; structure: (parenthesized expression means list of such entries) ;; (cache-key (directory)) (defvar vhdl-speedbar-shown-unit-alist nil @@ -13655,7 +13655,7 @@ of PROJECT." (vhdl-speedbar-update-current-unit) (when updated (message "Updating hierarchy...done"))))) -;; structure (parenthesised expression means list of such entries) +;; structure (parenthesized expression means list of such entries) ;; (inst-key inst-file-marker comp-ent-key comp-ent-file-marker ;; comp-arch-key comp-arch-file-marker comp-conf-key comp-conf-file-marker ;; comp-lib-name level) diff --git a/lisp/shell.el b/lisp/shell.el index 47119e6769c..fdfc8b3cf19 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -35,7 +35,7 @@ ;; This makes these modes easier to use. ;; For documentation on the functionality provided by comint mode, and -;; the hooks available for customising it, see the file comint.el. +;; the hooks available for customizing it, see the file comint.el. ;; For further information on shell mode, see the comments below. ;; Needs fixin: diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index f8417791ce5..746a4dc77b5 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -316,7 +316,7 @@ telling Microsoft that." (set (if (> trusted untrusted) 'untrusted 'trusted) nil)) (cond (untrusted - ;; The site was explicity marked as untrusted by the user. + ;; The site was explicitly marked as untrusted by the user. nil) ((or (eq url-privacy-level 'paranoid) (and (listp url-privacy-level) (memq 'cookies url-privacy-level))) diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index cfb98c6937e..19e0b621d87 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el @@ -62,7 +62,6 @@ (mapc 'make-variable-buffer-local '( url-current-object - url-current-referer url-current-mime-headers )) diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index e759183724e..53f7a016654 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -15816,14 +15816,14 @@ Add prototypes. * macterm.c (mac_draw_bitmap): Add overlay_p arg. - (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps; + (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps; thanks to YAMAMOTO Mitsuharu for advice on how to do this. Use cursor color for displaying cursor in fringe. (x_redisplay_interface): Add null handlers for define_fringe_bitmap and destroy_fringe_bitmap functions. * w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from - xterm.c to handle overlayed fringe bitmaps and to use cursor color + xterm.c to handle overlaid fringe bitmaps and to use cursor color for displaying cursor in fringe. (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32 specific functions to define and destroy fringe bitmaps in fringe_bmp. @@ -15849,7 +15849,7 @@ (display_line): Handle cursor in fringe at eob. (display_line): Set row user fringe bitmaps from iterator. - * xterm.c (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps. + * xterm.c (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps. Use cursor color for displaying cursor in fringe. (x_redisplay_interface): Add null handlers for define_fringe_bitmap and destroy_fringe_bitmap functions. diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index ba61c337efc..d3be0064610 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -2254,7 +2254,7 @@ Initialize save_color. * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: - Delete/replace unused/conditionalised variables + Delete/replace unused/conditionalized variables 1987-01-15 Richard M. Stallman (rms@prep) @@ -2632,7 +2632,7 @@ * fns.c: Fding requires an arg; pass Qnil. * m-alliant.h: define TEXT_START as 0x1000. - Don't define LIBS_STANDARD; the default (sharable) library + Don't define LIBS_STANDARD; the default (shareable) library is said to work now. * alloc.c (mark_object): Now pass address of slot being marked. @@ -4220,7 +4220,7 @@ Increase PURESIZE again (sigh) * unexec.c (write_segment): - Kludgey coercions ("(int)") to get this line to compile: + Kludgy coercions ("(int)") to get this line to compile: nwrite = (((int) ptr + 128) & ~127) - (int) ptr; Also changed incorrect ~128 to ~127. diff --git a/src/alloc.c b/src/alloc.c index 96d63f53cf9..6f70976c345 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -6399,7 +6399,7 @@ If this portion is smaller than `gc-cons-threshold', this is ignored. */); Vgc_cons_percentage = make_float (0.1); DEFVAR_INT ("pure-bytes-used", pure_bytes_used, - doc: /* Number of bytes of sharable Lisp data allocated so far. */); + doc: /* Number of bytes of shareable Lisp data allocated so far. */); DEFVAR_INT ("cons-cells-consed", cons_cells_consed, doc: /* Number of cons cells that have been consed so far. */); diff --git a/src/editfns.c b/src/editfns.c index 83cd4bd5535..7077f40e51c 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3870,7 +3870,7 @@ usage: (format STRING &rest OBJECTS) */) enum { /* Maximum precision for a %f conversion such that the - trailing output digit might be nonzero. Any precisions + trailing output digit might be nonzero. Any precision larger than this will not yield useful information. */ USEFUL_PRECISION_MAX = ((1 - DBL_MIN_EXP) diff --git a/src/emacs.c b/src/emacs.c index 6bfc0dc60d0..12a48b26553 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -951,7 +951,7 @@ main (int argc, char **argv) } /* Command line option --no-windows is deprecated and thus not mentioned - in the manual and usage informations. */ + in the manual and usage information. */ if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args) || argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args)) inhibit_window_system = 1; diff --git a/src/fontset.c b/src/fontset.c index 605d807aa3c..281ac92f82d 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -643,7 +643,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fa if (font_has_char (f, font_object, c)) goto found; - /* Find a font already opened, maching with the current spec, + /* Find a font already opened, matching with the current spec, and supporting C. */ font_def = RFONT_DEF_FONT_DEF (rfont_def); for (; found_index + 1 < ASIZE (vec); found_index++) diff --git a/src/ftfont.c b/src/ftfont.c index bab97e44fab..dbb2ce2745e 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -960,7 +960,7 @@ ftfont_list (Lisp_Object frame, Lisp_Object spec) /* Need fix because this finds any fonts. */ if (fontset->nfont == 0 && ! NILP (family)) { - /* Try maching with configuration. For instance, the + /* Try matching with configuration. For instance, the configuration may specify "Nimbus Mono L" as an alias of "Courier". */ FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString, diff --git a/src/lastfile.c b/src/lastfile.c index d348e4ebb07..ab07e748930 100644 --- a/src/lastfile.c +++ b/src/lastfile.c @@ -23,7 +23,7 @@ along with GNU Emacs. If not, see . */ The files of Emacs are written so as to have no initialized data that can ever need to be altered except at the first startup. - This is so that those words can be dumped as sharable text. + This is so that those words can be dumped as shareable text. It is not possible to exercise such control over library files. So it is necessary to refrain from making their data areas shared. @@ -47,4 +47,3 @@ char my_endbss[1]; of the bss area used by Emacs. */ static char _my_endbss[1]; char * my_endbss_static = _my_endbss; - diff --git a/src/lread.c b/src/lread.c index 582d8f46638..7c0b0475786 100644 --- a/src/lread.c +++ b/src/lread.c @@ -2822,7 +2822,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) So we now use the same heuristic as for backquote: old-style unquotes are only recognized when first on a list, and when followed by a space. - Because it's more difficult to peak 2 chars ahead, a new-style + Because it's more difficult to peek 2 chars ahead, a new-style ,@ can still not be used outside of a `, unless it's in the middle of a list. */ if (new_backquote_flag diff --git a/src/nsfont.m b/src/nsfont.m index 7d691ced6e1..6a053af344d 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -630,7 +630,7 @@ nsfont_list (Lisp_Object frame, Lisp_Object font_spec) } -/* Return a font entity most closely maching with FONT_SPEC on +/* Return a font entity most closely matching with FONT_SPEC on FRAME. The closeness is determined by the font backend, thus `face-font-selection-order' is ignored here. Properties to be considered are same as for list(). */ diff --git a/src/region-cache.c b/src/region-cache.c index ed7a07a6709..054374eb688 100644 --- a/src/region-cache.c +++ b/src/region-cache.c @@ -699,7 +699,7 @@ know_region_cache (struct buffer *buf, struct region_cache *c, /* Return true if the text immediately after POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position after POS where the knownness changes. */ + position after POS where the knowledge changes. */ int region_cache_forward (struct buffer *buf, struct region_cache *c, ptrdiff_t pos, ptrdiff_t *next) @@ -736,7 +736,7 @@ region_cache_forward (struct buffer *buf, struct region_cache *c, /* Return true if the text immediately before POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position before POS where the knownness changes. */ + position before POS where the knowledge changes. */ int region_cache_backward (struct buffer *buf, struct region_cache *c, ptrdiff_t pos, ptrdiff_t *next) { diff --git a/src/region-cache.h b/src/region-cache.h index 8e1be716776..6758f8bcd08 100644 --- a/src/region-cache.h +++ b/src/region-cache.h @@ -97,7 +97,7 @@ extern void invalidate_region_cache (struct buffer *BUF, /* Return true if the text immediately after POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position after POS where the knownness changes. */ + position after POS where the knowledge changes. */ extern int region_cache_forward (struct buffer *BUF, struct region_cache *CACHE, ptrdiff_t POS, @@ -105,7 +105,7 @@ extern int region_cache_forward (struct buffer *BUF, /* Return true if the text immediately before POS in BUF is known, for the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest - position before POS where the knownness changes. */ + position before POS where the knowledge changes. */ extern int region_cache_backward (struct buffer *BUF, struct region_cache *CACHE, ptrdiff_t POS, diff --git a/src/termhooks.h b/src/termhooks.h index 63d166b6418..5bd081d6d8b 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -553,7 +553,7 @@ struct terminal /* Arrange for all scroll bars on FRAME to be removed at the next call to `*judge_scroll_bars_hook'. A scroll bar may be spared if - `*redeem_scroll_bar_hook' is applied to its window before the judgement. + `*redeem_scroll_bar_hook' is applied to its window before the judgment. This should be applied to each frame each time its window tree is redisplayed, even if it is not displaying scroll bars at the moment; @@ -565,7 +565,7 @@ struct terminal currently displaying them. */ void (*condemn_scroll_bars_hook) (struct frame *frame); - /* Unmark WINDOW's scroll bar for deletion in this judgement cycle. + /* Unmark WINDOW's scroll bar for deletion in this judgment cycle. Note that it's okay to redeem a scroll bar that is not condemned. */ void (*redeem_scroll_bar_hook) (struct window *window); diff --git a/src/xfns.c b/src/xfns.c index 95154395e9c..e44f28df870 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1877,7 +1877,7 @@ static XIMStyle supported_xim_styles[] = #if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT /* Create an X fontset on frame F with base font name BASE_FONTNAME. */ -static const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; +static const char xic_default_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; /* Create an Xt fontset spec from the name of a base font. If `motif' is True use the Motif syntax. */ @@ -1888,7 +1888,7 @@ xic_create_fontsetname (const char *base_fontname, int motif) char *fontsetname; /* Make a fontset name from the base font name. */ - if (xic_defaut_fontset == base_fontname) + if (xic_default_fontset == base_fontname) { /* There is no base font name, use the default. */ ptrdiff_t len = strlen (base_fontname) + 2; fontsetname = xmalloc (len); @@ -1912,12 +1912,12 @@ xic_create_fontsetname (const char *base_fontname, int motif) modify it to generalize it to allcs and allfamilies. Use the specified font plus the default. */ ptrdiff_t len = - strlen (base_fontname) + strlen (xic_defaut_fontset) + 3; + strlen (base_fontname) + strlen (xic_default_fontset) + 3; fontsetname = xmalloc (len); memset (fontsetname, 0, len); strcpy (fontsetname, base_fontname); strcat (fontsetname, sep); - strcat (fontsetname, xic_defaut_fontset); + strcat (fontsetname, xic_default_fontset); } else { -- cgit v1.2.3