From: Paul Eggert Date: Mon, 5 Dec 2011 08:55:25 +0000 (-0800) Subject: Spelling fixes. X-Git-Tag: emacs-pretest-24.0.93~230 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa46310344375ef5c114cbb94d4acea39ac29239;p=emacs.git Spelling fixes. --- 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;