From a7acbbe4d48af3113de2dfaf836a42f2a9b6c2b0 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Fri, 5 Jan 1996 22:21:28 +0000 Subject: [PATCH] Comment fixes. --- lisp/ange-ftp.el | 4 ++-- lisp/avoid.el | 2 +- lisp/completion.el | 4 ++-- lisp/dabbrev.el | 4 ++-- lisp/desktop.el | 2 +- lisp/dired-aux.el | 2 +- lisp/double.el | 6 +++--- lisp/ediff-merg.el | 2 +- lisp/ediff-mult.el | 4 ++-- lisp/ediff-util.el | 6 +++--- lisp/ediff.el | 6 +++--- lisp/emacs-lisp/bytecomp.el | 4 ++-- lisp/emacs-lisp/cl-indent.el | 2 +- lisp/emacs-lisp/cl-specs.el | 6 +++--- lisp/emacs-lisp/copyright.el | 2 +- lisp/emacs-lisp/eval-reg.el | 4 ++-- lisp/emacs-lock.el | 2 +- lisp/emerge.el | 4 ++-- lisp/emulation/edt-pc.el | 2 +- lisp/emulation/mlsupport.el | 2 +- lisp/emulation/pc-select.el | 4 ++-- lisp/emulation/viper-keym.el | 3 +-- lisp/emulation/viper-util.el | 2 +- lisp/faces.el | 2 +- lisp/gnus-cite.el | 4 ++-- lisp/gnus-ems.el | 2 +- lisp/gnus-msg.el | 4 ++-- lisp/gnus-score.el | 6 +++--- lisp/ielm.el | 4 ++-- lisp/imenu.el | 2 +- lisp/ledit.el | 2 +- lisp/mail/rnews.el | 6 +++--- lisp/mail/rnewspost.el | 2 +- lisp/man.el | 4 ++-- lisp/nnbabyl.el | 2 +- lisp/nneething.el | 2 +- lisp/nnfolder.el | 6 +++--- lisp/nnkiboze.el | 2 +- lisp/nnmbox.el | 2 +- lisp/nnmh.el | 2 +- lisp/nnml.el | 2 +- lisp/nnspool.el | 2 +- lisp/nntp.el | 4 ++-- lisp/play/gomoku.el | 4 ++-- lisp/play/mpuz.el | 2 +- lisp/progmodes/f90.el | 2 +- lisp/progmodes/perl-mode.el | 2 +- lisp/ps-print.el | 8 ++++---- lisp/s-region.el | 2 +- lisp/sun-fns.el | 2 +- lisp/tar-mode.el | 2 +- lisp/term/pc-win.el | 2 +- lisp/textmodes/ispell.el | 6 +++--- lisp/textmodes/ooutline.el | 2 +- lisp/textmodes/outline.el | 2 +- lisp/textmodes/page-ext.el | 2 +- lisp/textmodes/texinfmt.el | 2 +- lisp/vc-hooks.el | 2 +- lisp/vc.el | 6 +++--- 59 files changed, 94 insertions(+), 95 deletions(-) diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el index d93a3735d8..2b79cf5757 100644 --- a/lisp/ange-ftp.el +++ b/lisp/ange-ftp.el @@ -395,7 +395,7 @@ ;;; when asked to list a non-existent directory. Some of the ai.mit.edu ;;; machines cause this problem for some FTP clients. Using ;;; ange-ftp-kill-ftp-process can restart the ftp process, which -;;; should get things back in synch. +;;; should get things back in sync. ;;; ;;; 3. Ange-ftp does not check to make sure that when creating a new file, ;;; you provide a valid filename for the remote operating system. @@ -2242,7 +2242,7 @@ which can parse the output from a DIR listing for a host of type TYPE.") ;; ;; With no-error t, it returns: ;; an error if not an ange-ftp-name -;; error if listing is unreable (most likely caused by a slow connection) +;; error if listing is unreadable (most likely caused by a slow connection) ;; nil if ftp error (this is because although asking to list a nonexistent ;; directory on a remote unix machine usually (except ;; maybe for dumb hosts) returns an ls error, but no diff --git a/lisp/avoid.el b/lisp/avoid.el index d75ca2c961..8abb81e142 100644 --- a/lisp/avoid.el +++ b/lisp/avoid.el @@ -166,7 +166,7 @@ You can redefine this if you want the mouse banished to a different corner." ;; Args are the CURRENT location, the desired DELTA for ;; warp-conservation, the DISTANCE we like to move, the VARIABILITY ;; in distance allowed, and the MIN and MAX possible window positions. - ;; Returns something as close to DELTA as possible withing the constraints. + ;; Returns something as close to DELTA as possible within the constraints. (let ((L1 (max (- min cur) (+ (- dist) (- var)))) (R1 (+ (- dist) var )) (L2 (+ dist (- var))) diff --git a/lisp/completion.el b/lisp/completion.el index 1e4e281ad1..918d032797 100644 --- a/lisp/completion.el +++ b/lisp/completion.el @@ -221,7 +221,7 @@ ;;; With input from many users at TMC, (rose, craig, and gls come to mind), ;;; the current style of interface was developed. ;;; 9/87, Jim and Brewster took terminals home. Yuck. After -;;; complaining for a while Brewester implemented a subset of the current +;;; complaining for a while Brewster implemented a subset of the current ;;; LISPM version for GNU Emacs. ;;; 8/88 After complaining for a while (and with sufficient ;;; promised rewards), Jim reimplemented a version of GNU completion @@ -1045,7 +1045,7 @@ Each symbol is bound to a single completion entry.") ;;; A completion entry is a LIST of string, prefix-symbol num-uses, and ;;; last-use-time (the time the completion was last used) ;;; last-use-time is T if the string should be kept permanently -;;; num-uses is incremented everytime the completion is used. +;;; num-uses is incremented every time the completion is used. ;;; We chose lists because (car foo) is faster than (aref foo 0) and the ;;; creation time is about the same. diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index a6f454116e..b119c0d76a 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el @@ -41,7 +41,7 @@ ;; ;; Set the variables you want special for your mode like this: ;; (set (make-local-variable 'dabbrev-case-replace) nil) -;; Then you don't interfer with other modes. +;; Then you don't interfere with other modes. ;; ;; If your mode handles buffers that refers to other buffers ;; (i.e. compilation-mode, gud-mode), then try to set @@ -771,7 +771,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]." ;;; ABBREV is string to find as prefix of word. Second arg, REVERSE, ;;; is t for reverse search, nil for forward. Variable dabbrev-limit -;;; controls the maximum search region size. Third argment IGNORE-CASE +;;; controls the maximum search region size. Third argument IGNORE-CASE ;;; non-nil means treat case as insignificant while looking for a match ;;; and when comparing with previous matches. Also if that's non-nil ;;; and the match is found at the beginning of a sentence and is in diff --git a/lisp/desktop.el b/lisp/desktop.el index aa881af5d0..ecea3e80a3 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -144,7 +144,7 @@ The variables are saved only when they really are local.") (make-variable-buffer-local 'desktop-locals-to-save) ;; We skip .log files because they are normally temporary. -;; (ftp) files because they require passwords and whatsnot. +;; (ftp) files because they require passwords and whatnot. ;; TAGS files to save time (tags-file-name is saved instead). (defvar desktop-buffers-not-to-save "\\(^nn\\.a[0-9]+\\|\\.log\\|(ftp)\\|^tags\\|^TAGS\\)$" diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index 27ef4397d7..1edbd3a1de 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -1008,7 +1008,7 @@ Special value `always' suppresses confirmation.") ;; which will be added. The user will be queried if the file already ;; exists. If oldfile is removed by FILE-CREATOR (i.e, it is a ;; rename), it is FILE-CREATOR's responsibility to update dired -;; buffers. FILE-CREATOR must abort by signalling a file-error if it +;; buffers. FILE-CREATOR must abort by signaling a file-error if it ;; could not create newfile. The error is caught and logged. ;; OPERATION (a capitalized string, e.g. `Copy') describes the diff --git a/lisp/double.el b/lisp/double.el index 403b5a2242..0f3f4513ae 100644 --- a/lisp/double.el +++ b/lisp/double.el @@ -33,7 +33,7 @@ ;; string will be replaced by another. This can be used for mapping ;; keys on a US keyboard to generate characters according to the local ;; keyboard convention when pressed once, and according to US keyboard -;; convetion when pressed twice. +;; convention when pressed twice. ;; ;; To use this mode, you must define the variable `double-map' and ;; then enable double mode with `M-x double-mode'. Read the @@ -42,9 +42,9 @@ ;; The default mapping is for getting Danish/Norwegian keyboard layout ;; using ISO Latin 1 on a US keyboard. ;; -;; Imprtant node: While I would like to hear comments, bug reports, +;; Important node: While I would like to hear comments, bug reports, ;; suggestions, please do @strong{not} expect me to put other mappings -;; that the default into this file. There are billions and billions +;; than the default into this file. There are billions and billions ;; of such mappings, and just supporting the most common would ;; increase the size of this nice small file manyfold. diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index ef14c8c436..9b473816d3 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -137,7 +137,7 @@ skiped over. Nil means show all regions.") (and (string= state-of-merge "combined") (not (string= (ediff-make-combined-diff reg-A reg-B) reg-C))) - ;; was prefered--ignore + ;; was preferred--ignore (string-match "prefer" state-of-merge)) (setq do-not-copy t)) diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index f8a0c0912f..319edf30fa 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -43,7 +43,7 @@ ;; Actually, the format of this list is pretty much up to the ;; developer. The only thing is that it must be a list of lists. ;; Also, keep in mind that the function ediff-prepare-meta-buffer -;; (which see) prepends nil in fron of each list (i.e., the above list +;; (which see) prepends nil in front of each list (i.e., the above list ;; will become ((nil obj1 obj2 ...) (nil ...) ...). ;; Ediff expects that your function (in 2 above) will arrange to ;; replace this prepended nil (via setcar) with the actual ediff @@ -1209,7 +1209,7 @@ all marked sessions must be active." (error "No active Ediff sessions or corrupted session registry")) (let (wind frame) ;; for some reason, point moves in ediff-registry-buffer, so we preserve it - ;; explicity + ;; explictly (ediff-eval-in-buffer ediff-registry-buffer (save-excursion (cond ((setq wind diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 47f9c57c72..c0a401301c 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -733,7 +733,7 @@ Reestablish the default three-window display." ediff-patch-action ediff-toggle-wide-display ediff-toggle-multiframe)) ;; Or one of the movement cmds and prev cmd was an Ediff cmd - ;; This avoids rasing frames unnecessarily. + ;; This avoids raising frames unnecessarily. (and (memq this-command '(ediff-next-difference ediff-previous-difference @@ -1420,7 +1420,7 @@ the width of the A/B/C windows." (move-to-window-line lines) (point))) ;; `end' may be beyond the window bottom, so check - ;; that we are making progres + ;; that we are making progress (< prev-point (point))) (setq prev-point (point)) (setq lines (1+ lines))) @@ -2962,7 +2962,7 @@ buffer." ;;; Misc -;; These two functions are here to neutralize XEmacs unwillingless to +;; These two functions are here to neutralize XEmacs's unwillingness to ;; handle overlays whose buffers were deleted. (defun ediff-move-overlay (overlay beg end &optional buffer) "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs. diff --git a/lisp/ediff.el b/lisp/ediff.el index 571cd65981..371a024494 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -85,7 +85,7 @@ ;; 2. On a monochrome display, the repertoire of faces with which to ;; highlight fine differences is limited. By default, Ediff is using -;; underlining. However, if the region is already underlied by some other +;; underlining. However, if the region is already underlined by some other ;; overlays, there is no simple way to temporarily remove that residual ;; underlining. This problem occurs when a buffer is highlighted with ;; hilit19.el or font-lock.el packages. If this residual highlighting gets @@ -175,7 +175,7 @@ ;; Make a temp file, if source-filename has a magic file handler (or if ;; it is handled via auto-mode-alist and similar magic). ;; Check if there is a buffer visiting source-filename and if they are in - ;; synch; arrange for the deletion of temp file. + ;; sync; arrange for the deletion of temp file. (ediff-find-file 'true-source-filename 'buf-to-patch 'ediff-last-dir-patch 'startup-hooks) @@ -833,7 +833,7 @@ If WIND-B is nil, use window next to WIND-A." (save-excursion (save-window-excursion - (sit-for 0) ; synch before using window-start/end -- a precaution + (sit-for 0) ; sync before using window-start/end -- a precaution (select-window wind-A) (setq beg-A (window-start) end-A (window-end)) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 20d54630da..4efe6cd8f9 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -938,7 +938,7 @@ otherwise pop it") (defun byte-compile-arglist-signatures-congruent-p (old new) (not (or (> (car new) (car old)) ; requires more args now - (and (null (cdr old)) ; tooks rest-args, doesn't any more + (and (null (cdr old)) ; took rest-args, doesn't any more (cdr new)) (and (cdr new) (cdr old) ; can't take as many args now (< (cdr new) (cdr old))) @@ -1381,7 +1381,7 @@ With argument, insert value in current buffer after the form." ;; Compile pending forms at end of file. (byte-compile-flush-pending) (byte-compile-warn-about-unresolved-functions) - ;; SHould we always do this? When calling multiple files, it + ;; Should we always do this? When calling multiple files, it ;; would be useful to delay this warning until all have ;; been compiled. (setq byte-compile-unresolved-functions nil)))) diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el index f6ad185401..bef95f322b 100644 --- a/lisp/emacs-lisp/cl-indent.el +++ b/lisp/emacs-lisp/cl-indent.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1987 Free Software Foundation, Inc. -;; Author: Richard Mlynark +;; Author: Richard Mlynarik ;; Created: July 1987 ;; Maintainer: FSF ;; Keywords: lisp, tools diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el index 9bb79ea79a..06c29a97ec 100644 --- a/lisp/emacs-lisp/cl-specs.el +++ b/lisp/emacs-lisp/cl-specs.el @@ -7,7 +7,7 @@ ;; LCD Archive Entry: ;; cl-specs.el|Daniel LaLiberte|liberte@cs.uiuc.edu ;; |Edebug specs for cl.el -;; |$Date: 1995/04/19 00:47:42 $|1.1| +;; |$Date: 1995/10/30 16:51:55 $|1.1| ;; This file is part of GNU Emacs. @@ -30,7 +30,7 @@ ;; These specs are to be used with edebug.el version 3.3 or later and ;; cl.el version 2.03 or later, by Dave Gillespie . -;; This file need not be byte-compiled, but it shouldnt hurt. +;; This file need not be byte-compiled, but it shouldn't hurt. (provide 'cl-specs) ;; Do the above provide before the following require. @@ -412,7 +412,7 @@ (def-edebug-spec loop-initial-final (&or ["initially" - ;; [&optional &or "do" "doing"] ;; CLtL2 doesnt allow this. + ;; [&optional &or "do" "doing"] ;; CLtL2 doesn't allow this. &rest loop-non-atomic-expr] ["finally" &or [[&optional &or "do" "doing"] &rest loop-non-atomic-expr] diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index e6f5ba34f7..c41fdd59ba 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -48,7 +48,7 @@ When this is `function', only ask when called non-interactively.") "String representing the current year.") -;; when modifiying this, also modify the comment generated by autoinsert.el +;; when modifying this, also modify the comment generated by autoinsert.el (defconst copyright-current-gpl-version "2" "String representing the current version of the GPL or `nil'.") diff --git a/lisp/emacs-lisp/eval-reg.el b/lisp/emacs-lisp/eval-reg.el index f4e32ded32..a956aa4a26 100644 --- a/lisp/emacs-lisp/eval-reg.el +++ b/lisp/emacs-lisp/eval-reg.el @@ -130,7 +130,7 @@ nil means discard it; anything else is stream for print. This version, from `eval-reg.el', allows Lisp customization of read, eval, and the printer." - ;; Because this doesnt narrow to the region, one other difference + ;; Because this doesn't narrow to the region, one other difference ;; concerns inserting whitespace after the expression being evaluated. (interactive "r") @@ -138,7 +138,7 @@ eval, and the printer." (original-eval-region elisp-start elisp-end elisp-output) (let ((elisp-pnt (point)) (elisp-buf (current-buffer));; Outside buffer - (elisp-inside-buf (current-buffer));; Buffer current while evaling + (elisp-inside-buf (current-buffer));; Buffer current while evalling ;; Mark the end because it may move. (elisp-end-marker (set-marker (make-marker) elisp-end)) elisp-form diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el index c0495bb835..7d9614c400 100644 --- a/lisp/emacs-lock.el +++ b/lisp/emacs-lock.el @@ -28,7 +28,7 @@ ;; yourself from yourself. For example, if you have a shell running a big ;; program and exiting emacs would abort that program, you may want to lock ;; that buffer, then if you forget about it after a while, you won't -;; accidently exit emacs. To unlock the buffer, just goto the buffer and +;; accidentally exit emacs. To unlock the buffer, just goto the buffer and ;; run toggle-emacs-lock again. (defvar lock-emacs-from-exiting nil diff --git a/lisp/emerge.el b/lisp/emerge.el index 17eb6f86ca..988644ea77 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -1741,7 +1741,7 @@ to the left margin, if they are in windows." ;; If there are min-lines lines above and below the region, then don't do ;; anything. ;; If not, recenter the region to make it so. -;; If that isn't possible, remove context lines balancedly from top and botton +;; If that isn't possible, remove context lines balancedly from top and bottom ;; so the entire region shows. ;; If that isn't possible, show the top of the region. ;; BEG must be at the beginning of a line. @@ -2847,7 +2847,7 @@ keymap. Leaves merge in fast mode." ;; a list of variables. The argument is a list of symbols (the names of ;; the variables). A list element can also be a list of two functions, ;; the first of which (when called with no arguments) gets the value, and -;; the second (when called with a value as an argment) sets the value. +;; the second (when called with a value as an argument) sets the value. ;; A "function" is anything that funcall can handle as an argument. (defun emerge-save-variables (vars) diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el index 5fae49e4b2..db92d2b947 100644 --- a/lisp/emulation/edt-pc.el +++ b/lisp/emulation/edt-pc.el @@ -38,7 +38,7 @@ ;; NumLock must be ON. ;; ;; The PC keypad keys are mapped to the corresponding DEC LK-201 -;; keypad keys according to the corresponding physical possition on +;; keypad keys according to the corresponding physical position on ;; the keyboard. Thus, the physical position of the PC keypad key ;; determines its function, not the PC keycap name. ;; diff --git a/lisp/emulation/mlsupport.el b/lisp/emulation/mlsupport.el index d60b3809df..3a1d3c5ba1 100644 --- a/lisp/emulation/mlsupport.el +++ b/lisp/emulation/mlsupport.el @@ -26,7 +26,7 @@ ;; This package provides equivalents of certain primitives from Gosling ;; Emacs (including the commercial UniPress versions). These have an ;; ml- prefix to distinguish them from native GNU Emacs functions with -;; similar names. The oackage mlconvert.el translates Mocklisp code +;; similar names. The package mlconvert.el translates Mocklisp code ;; to use these names. ;;; Code: diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el index eb3798f0b3..1187b642c8 100644 --- a/lisp/emulation/pc-select.el +++ b/lisp/emulation/pc-select.el @@ -494,7 +494,7 @@ the MAC GUI or MS-Windows (sorry for the last one)." (define-key global-map "\M-w" 'copy-region-as-kill-nomark) - ;; The followong keybindings are for standard ISO keyboards + ;; The following keybindings are for standard ISO keyboards ;; as they are used with IBM compatible PCs, IBM RS/6000, ;; MACs, many X-Stations and probably more (define-key global-map [S-right] 'forward-char-mark) @@ -533,7 +533,7 @@ the MAC GUI or MS-Windows (sorry for the last one)." (define-key global-map [C-insert] 'copy-region-as-kill) (define-key global-map [S-delete] 'kill-region) - ;; The following bindings are usueful on Sun Type 3 keyboards + ;; The following bindings are useful on Sun Type 3 keyboards ;; They implement the Get-Delete-Put (copy-cut-paste) ;; functions from sunview on the L6, L8 and L10 keys (define-key global-map [f16] 'yank) diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index 9ff7cd83f4..11bcec0363 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -31,8 +31,7 @@ (defvar vip-insert-intercept-map (make-sparse-keymap)) (defvar vip-emacs-intercept-map (make-sparse-keymap)) -;; keymap used to zap all keymaps other than function-key-map, -;; devide-function-key-map, etc. +;; keymap used to zap all keymaps other than function-key-map, etc. (defvar vip-overriding-map (make-sparse-keymap)) (vip-deflocalvar vip-vi-local-user-map (make-sparse-keymap) diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 3e3cd658e5..1523399aef 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -766,7 +766,7 @@ ;; Emacs has a bug in eventp, which causes (eventp nil) to return (nil) -;; instead of nil, if '(nil) was previously inadvertantly assigned to +;; instead of nil, if '(nil) was previously inadvertently assigned to ;; unread-command-events (defun vip-event-key (event) (or (and event (eventp event)) diff --git a/lisp/faces.el b/lisp/faces.el index cd20abb0f3..ea298db1c6 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -150,7 +150,7 @@ in that frame; otherwise change each frame." ;; For a specific frame, use gray stipple instead of gray color ;; if the display does not support a gray color. (if (and frame (not (eq frame t)) color - ;; Check for supportedness for foreground, not for background! + ;; Check for support for foreground, not for background! ;; face-color-supported-p is smart enough to know ;; that grays are "supported" as background ;; because we are supposed to use stipple for them! diff --git a/lisp/gnus-cite.el b/lisp/gnus-cite.el index a83ea80114..e74c07773f 100644 --- a/lisp/gnus-cite.el +++ b/lisp/gnus-cite.el @@ -452,12 +452,12 @@ See also the documentation for `gnus-article-highlight-citation'." ;; loose attribution lines, otherwise the first prefix will be used. ;; ;; If AFTER is non-nil, only citations after the attribution line - ;; will be concidered. + ;; will be considered. ;; ;; If FUN is non-nil, it will be called with the arguments (WROTE ;; PREFIX TAG) and expected to return a regular expression. Only ;; citations whose prefix matches the regular expression will be - ;; concidered. + ;; considered. ;; ;; WROTE is the attribution line number. ;; PREFIX is the attribution line prefix. diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el index e0b2244ab0..924ff7be8e 100644 --- a/lisp/gnus-ems.el +++ b/lisp/gnus-ems.el @@ -415,7 +415,7 @@ NOTE: This command only works with newsgroups that use real or simulated NNTP." ;; Fucking XEmacs redisplay bug with truncated lines. (goto-char b) (sit-for 0) - ;; Grumble.. Fucking XEmacs stickyness of text properties. + ;; Grumble.. Fucking XEmacs stickiness of text properties. (remove-text-properties (1+ b) (1+ (gnus-point-at-eol)) '(gnus-number nil gnus-mark nil gnus-level nil)) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index ea52c043c1..6f6c97e7f7 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -580,7 +580,7 @@ will attempt to use the foreign server to post the article." (match-beginning 0))) ;; Correct newsgroups field: change sequence of spaces to comma and - ;; eliminate spaces around commas. Eliminate imbedded line breaks. + ;; eliminate spaces around commas. Eliminate embedded line breaks. (goto-char (point-min)) (if (re-search-forward "^Newsgroups: +" nil t) (save-restriction @@ -1353,7 +1353,7 @@ domain is undefined, the domain name is got from it." ;; You might for example insert a "." somewhere (not next to another dot ;; or string boundary), or modify the newsreader name to "Ding". (defun gnus-inews-unique-id () - ;; Dont use microseconds from (current-time), they may be unsupported. + ;; Don't use microseconds from (current-time), they may be unsupported. ;; Instead we use this randomly inited counter. (setq gnus-unique-id-char (% (1+ (or gnus-unique-id-char (logand (random t) (1- (lsh 1 20))))) diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index db30a7551d..03dc644d67 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -910,7 +910,7 @@ SCORE is the score to add." (if last (progn ;; Insert the line, with a text property on the - ;; terminating newline refering to the articles with + ;; terminating newline referring to the articles with ;; this line. (insert last ?\n) (put-text-property (1- (point)) (point) 'articles alike))) @@ -1252,7 +1252,7 @@ SCORE is the score to add." (defun gnus-score-string (score-list header now expire &optional trace) ;; Score ARTICLES according to HEADER in SCORE-LIST. - ;; Update matches entries to NOW and remove unmatched entried older + ;; Update matching entries to NOW and remove unmatched entries older ;; than EXPIRE. ;; Insert the unique article headers in the buffer. @@ -1281,7 +1281,7 @@ SCORE is the score to add." (if last (progn ;; Insert the line, with a text property on the - ;; terminating newline refering to the articles with + ;; terminating newline referring to the articles with ;; this line. (insert last ?\n) (put-text-property (1- (point)) (point) 'articles alike))) diff --git a/lisp/ielm.el b/lisp/ielm.el index d3d7459bcb..ec7f00a401 100644 --- a/lisp/ielm.el +++ b/lisp/ielm.el @@ -87,7 +87,7 @@ This variable is buffer-local.") (defvar ielm-header (concat "*** Welcome to IELM version " - (substring "$Revision: 1.4 $" 11 -2) + (substring "$Revision: 1.5 $" 11 -2) " *** Type (describe-mode) for help.\n" "IELM has ABSOLUTELY NO WARRANTY; type (describe-no-warranty) for details.\n") "Message to display when IELM is started.") @@ -145,7 +145,7 @@ This variable is buffer-local.") (or ;; the buffer has been modified (not (= btick (buffer-modified-tick))) - ;; a completions buffer has been modifed or created + ;; a completions buffer has been modified or created (if cbuffer (not (= ctick (buffer-modified-tick cbuffer))) (get-buffer "*Completions*"))))) diff --git a/lisp/imenu.el b/lisp/imenu.el index 1b85879963..84731d5006 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -369,7 +369,7 @@ This function is called after the function pointed out by (/ (* 100 (1- pos)) (max total 1))))) ;;; -;;; Function for suporting general looking submenu names. +;;; Function for supporting general looking submenu names. ;;; Uses `imenu-submenu-name-format' for creating the name. ;;; NAME is the base of the new submenu name. ;;; diff --git a/lisp/ledit.el b/lisp/ledit.el index f76aa468d8..9721b0eba0 100644 --- a/lisp/ledit.el +++ b/lisp/ledit.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1985 Free Software Foundation, Inc. ;; Maintainer: FSF -;; Keyord: languages +;; Keyword: languages ;; This file is part of GNU Emacs. diff --git a/lisp/mail/rnews.el b/lisp/mail/rnews.el index c793fa150e..790b25cf81 100644 --- a/lisp/mail/rnews.el +++ b/lisp/mail/rnews.el @@ -43,7 +43,7 @@ ;; tower@prep Sep 3 1986 ;; added news-rotate-buffer-body ;; tower@prep Oct 17 1986 -;; made messages more user friendly, cleanuped news-inews +;; made messages more user friendly, cleaned up news-inews ;; move posting and mail code to new file rnewpost.el ;; tower@prep Oct 29 1986 ;; added caesar-region, rename news-caesar-buffer-body, hacked accordingly @@ -796,7 +796,7 @@ Using ls was found to be too slow in a previous version." (setq tem news-list-of-files) (while tem (if (or (not (string-match "^[0-9]*$" (car tem))) - ;; dont get confused by directories that look like numbers + ;; don't get confused by directories that look like numbers (file-directory-p (concat file-directory "/" (car tem))) (<= (string-to-int (car tem)) end-file-no)) @@ -858,7 +858,7 @@ Using ls was found to be too slow in a previous version." (defun news-add-news-group (gp) "Resubscribe to or add a USENET news group named GROUP (a string)." ; @@ (completing-read ...) -; @@ could be based on news library file ../active (slightly facist) +; @@ could be based on news library file ../active (slightly fascist) ; @@ or (expensive to compute) all directories under the news spool directory (interactive "sAdd news group: ") (let ((file-dir (concat news-path (string-subst-char ?/ ?. gp)))) diff --git a/lisp/mail/rnewspost.el b/lisp/mail/rnewspost.el index 936e3e0edb..f401949319 100644 --- a/lisp/mail/rnewspost.el +++ b/lisp/mail/rnewspost.el @@ -46,7 +46,7 @@ ;; imported from rmail and modified to work with rnews ... ;; Mon Mar 25,1985 at 03:07:04 ads@mit-hermes. ;; this is done so that rnews can operate independently from rmail.el and -;; sendmail and dosen't have to autoload these functions. +;; sendmail and doesn't have to autoload these functions. ;; ;;; >> Nuked by Mly to autoload those functions again, as the duplication of ;;; >> code was making maintenance too difficult. diff --git a/lisp/man.el b/lisp/man.el index 4bbc054a93..86270db1e3 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -35,7 +35,7 @@ ;; ========== Credits and History ========== ;; In mid 1991, several people posted some interesting improvements to ;; man.el from the standard emacs 18.57 distribution. I liked many of -;; these, but wanted everthing in one single package, so I decided +;; these, but wanted everything in one single package, so I decided ;; to incorporate them into a single manual browsing mode. While ;; much of the code here has been rewritten, and some features added, ;; these folks deserve lots of credit for providing the initial @@ -56,7 +56,7 @@ ;; Francesco Potorti` cleaned it up thoroughly, ;; making it faster, more robust and more tolerant of different -;; systems' man idiosynchrasies. +;; systems' man idiosyncrasies. ;; ========== Features ========== ;; + Runs "man" in the background and pipes the results through a diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el index 111c0d479c..0d9ad2c1e0 100644 --- a/lisp/nnbabyl.el +++ b/lisp/nnbabyl.el @@ -354,7 +354,7 @@ ;; If FORCE, delete article no matter how many X-Gnus-Newsgroup ;; headers there are. If LEAVE-DELIM, don't delete the Unix mbox -;; delimeter line. +;; delimiter line. (defun nnbabyl-delete-mail (&optional force leave-delim) ;; Delete the current X-Gnus-Newsgroup line. (or force diff --git a/lisp/nneething.el b/lisp/nneething.el index 0980c4d13c..0ff1a762d4 100644 --- a/lisp/nneething.el +++ b/lisp/nneething.el @@ -201,7 +201,7 @@ nneething-group-alist))))))) (defun nneething-map-file () - ;; We make sure that the .neething directory exists. + ;; We make sure that the .nneething directory exists. (make-directory nneething-map-file-directory 'parents) ;; We store it in a special directory under the user's home dir. (concat (file-name-as-directory nneething-map-file-directory) diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index 17c4d9b1f7..97064ad61b 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -42,7 +42,7 @@ (concat (file-name-as-directory nnfolder-directory) "active") "The name of the active file.") -;; I renamed this variable to somehting more in keeping with the general GNU +;; I renamed this variable to something more in keeping with the general GNU ;; style. -SLB (defvar nnfolder-ignore-active-file nil @@ -566,7 +566,7 @@ such things as moving mail. All buffers always get killed upon server close.") ;; accidentally gotten new mail with something other than Gnus (but why ;; would _that_ ever happen? :-). In that case, we will be in the middle of ;; processing the file, ready to add new X-Gnus article number markers, and -;; we'll run accross a message with no ID yet - the active list _may_not_ be +;; we'll run across a message with no ID yet - the active list _may_not_ be ;; ready for us yet. ;; To handle this, I'm modifying this routine to maintain the maximum ID seen @@ -593,7 +593,7 @@ such things as moving mail. All buffers always get killed upon server close.") activenumber activemin start end) (goto-char (point-min)) ;; - ;; Anytime the active number is 1 or 0, it is supect. In that case, + ;; Anytime the active number is 1 or 0, it is suspect. In that case, ;; search the file manually to find the active number. Or, of course, ;; if we're being paranoid. (This would also be the place to build ;; other lists from the header markers, such as expunge lists, etc., if diff --git a/lisp/nnkiboze.el b/lisp/nnkiboze.el index 65b67432e7..35cbb3b590 100644 --- a/lisp/nnkiboze.el +++ b/lisp/nnkiboze.el @@ -101,7 +101,7 @@ If the stream is opened, return T, otherwise return NIL." "Select article by message number." (nnkiboze-possibly-change-newsgroups newsgroup) (if (not (numberp article)) - ;; This is a real cludge. It might not work at times, but it + ;; This is a real kludge. It might not work at times, but it ;; does no harm I think. The only alternative is to offer no ;; article fetching by message-id at all. (nntp-request-article article newsgroup gnus-nntp-server buffer) diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el index 500bffa959..0e20f0c38b 100644 --- a/lisp/nnmbox.el +++ b/lisp/nnmbox.el @@ -338,7 +338,7 @@ ;; If FORCE, delete article no matter how many X-Gnus-Newsgroup ;; headers there are. If LEAVE-DELIM, don't delete the Unix mbox -;; delimeter line. +;; delimiter line. (defun nnmbox-delete-mail (&optional force leave-delim) ;; Delete the current X-Gnus-Newsgroup line. (or force diff --git a/lisp/nnmh.el b/lisp/nnmh.el index 2a8664ba00..321ca20a91 100644 --- a/lisp/nnmh.el +++ b/lisp/nnmh.el @@ -311,7 +311,7 @@ (and (nnmail-activate 'nnmh) ;; We trick the choosing function into believing that only one - ;; group is availiable. + ;; group is available. (let ((nnmail-split-methods (list (list group "")))) (car (nnmh-save-mail)))) (and diff --git a/lisp/nnml.el b/lisp/nnml.el index 585a0c7155..5b4f3b4589 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -327,7 +327,7 @@ all. This may very well take some time.") (and (nnmail-activate 'nnml) ;; We trick the choosing function into believing that only one - ;; group is availiable. + ;; group is available. (let ((nnmail-split-methods (list (list group "")))) (setq result (car (nnml-save-mail)))) (progn diff --git a/lisp/nnspool.el b/lisp/nnspool.el index 3d1351f89b..7609f68846 100644 --- a/lisp/nnspool.el +++ b/lisp/nnspool.el @@ -366,7 +366,7 @@ Newsgroup must be selected before calling this function." (nnspool-sift-nov-with-sed articles nov) (insert-file-contents nov) ;; First we find the first wanted line. We issue a number - ;; of search-forwards - the first article we are lookign + ;; of search-forwards - the first article we are looking ;; for may be expired, so we have to go on searching until ;; we find one of the articles we want. (while (and articles diff --git a/lisp/nntp.el b/lisp/nntp.el index f610bc1ad7..97c2d00629 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -326,7 +326,7 @@ instead call function `nntp-status-message' to get status message.") (if nntp-server-list-active-group (progn ;; We have read active entries, so we just delete the - ;; superfluos gunk. + ;; superfluous gunk. (goto-char (point-min)) (while (re-search-forward "^[.2-5]" nil t) (delete-region (match-beginning 0) @@ -936,7 +936,7 @@ It will prompt for a password." (accept-process-output) ;; On some Emacs versions the preceding function has ;; a tendency to change the buffer. Perhaps. It's - ;; quite difficult to reporduce, because it only + ;; quite difficult to reproduce, because it only ;; seems to happen once in a blue moon. (set-buffer buf) (while (progn diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el index 30677c4ebd..ef03fb5b70 100644 --- a/lisp/play/gomoku.el +++ b/lisp/play/gomoku.el @@ -266,8 +266,8 @@ is non-nil." ;; please send me a note. Thanks. -;; As we choosed values 0, 1 and 6 to denote empty, X and O squares, the -;; contents of a qtuple is uniquely determined by the sum of its elements and +;; As we chose values 0, 1 and 6 to denote empty, X and O squares, the +;; contents of a qtuple are uniquely determined by the sum of its elements and ;; we just have to set up a translation table. (defconst gomoku-score-trans-table diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el index 346567b2f5..2517b24155 100644 --- a/lisp/play/mpuz.el +++ b/lisp/play/mpuz.el @@ -185,7 +185,7 @@ You may abort a game by typing \\\\[mpuz-offer-abort]." D (* A (/ B 10)) E (* A B)) (or (< C 1000) (< D 1000)))) ; forbid leading zeros in C or D - ;; Individual digits are now put on their respectives squares. + ;; Individual digits are now put on their respective squares. ;; [NB: A square is a pair of the screen.] (mpuz-put-digit-on-board A '(2 . 9)) (mpuz-put-digit-on-board (/ A 10) '(2 . 7)) diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index b82223e829..cb1618ca8a 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -248,7 +248,7 @@ whether to blink the matching beginning.") ;; "set_exponent" "shape" "sign" "sin" "sinh" "size" "spacing" "spread" ;; "sqrt" "sum" "system_clock" "tan" "tanh" "tiny" "transfer" "transpose" ;; "trim" "ubound" "unpack" "verify") - ;; A left paranthesis to avoid highlighting non-procedures. + ;; A left parenthesis to avoid highlighting non-procedures. ;; Real is taken out here to avoid highlighting declarations. (concat "\\<\\(a\\(bs\\|c\\(har\\|os\\)\\|djust[lr]\\|i\\(mag\\|nt\\)\\|ll\\(\\|" diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el index 4157554fde..c8f5568d84 100644 --- a/lisp/progmodes/perl-mode.el +++ b/lisp/progmodes/perl-mode.el @@ -31,7 +31,7 @@ ;; To enter perl-mode automatically, add (autoload 'perl-mode "perl-mode") ;; to your .emacs file and change the first line of your perl script to: ;; #!/usr/bin/perl -- # -*-Perl-*- -;; With argments to perl: +;; With arguments to perl: ;; #!/usr/bin/perl -P- # -*-Perl-*- ;; To handle files included with do 'filename.pl';, add something like ;; (setq auto-mode-alist (append (list (cons "\\.pl\\'" 'perl-mode)) diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 90cfcab2fc..ae6c38f687 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@ -83,7 +83,7 @@ ;; printout than to find 50 single-page printouts). ;; ;; Ps-print has a hook in the kill-emacs-hooks so that you won't -;; accidently quit from Emacs while you have unprinted PostScript +;; accidentally quit from Emacs while you have unprinted PostScript ;; waiting in the spool buffer. If you do attempt to exit with ;; spooled PostScript, you'll be asked if you want to print it, and if ;; you decline, you'll be asked to confirm the exit; this is modeled @@ -198,7 +198,7 @@ ;; Ps-print keeps internal lists of which fonts are bold and which are ;; italic; these lists are built the first time you invoke ps-print. ;; For the sake of efficiency, the lists are built only once; the same -;; lists are referred in later invokations of ps-print. +;; lists are referred in later invocations of ps-print. ;; ;; Because these lists are built only once, it's possible for them to ;; get out of sync, if a face changes, or if new faces are added. To @@ -255,7 +255,7 @@ ;; or variables. Functions are called, and should return a string to ;; show in the header. Variables should contain strings to display in ;; the header. In either case, function or variable, the PostScript -;; strings delimeters are added by ps-print, and should not be part of +;; string delimiters are added by ps-print, and should not be part of ;; the returned value. ;; ;; Here's an example: say we want the left header to display the text @@ -1836,7 +1836,7 @@ EndDSCPage\n")) ;; the postscript was generated without error. (setq completed-safely t)) - ;; Unwind form: If some bad mojo ocurred while generating + ;; Unwind form: If some bad mojo occurred while generating ;; postscript, delete all the postscript that was generated. ;; This protects the previously spooled files from getting ;; corrupted. diff --git a/lisp/s-region.el b/lisp/s-region.el index fa2f855b71..3ddef442a7 100644 --- a/lisp/s-region.el +++ b/lisp/s-region.el @@ -25,7 +25,7 @@ ;; Having loaded this code you can set the region by holding down the ;; shift key and move the cursor to the other end of the region. The -;; functionallity provided by this code is similar to that provided by +;; functionality provided by this code is similar to that provided by ;; the editors of Borland International's compilers for ms-dos. ;; Currently, s-region-move may be bound only to events that are vectors diff --git a/lisp/sun-fns.el b/lisp/sun-fns.el index dd4371cd6e..c36dc7a8a2 100644 --- a/lisp/sun-fns.el +++ b/lisp/sun-fns.el @@ -319,7 +319,7 @@ this command is insensitive to mouse location." relative X divided by window width." (eval-in-window window (if (>= x (1- (window-width))) - ;; When x is maximun (equal to or 1 less than window width), + ;; When x is maximum (equal to or 1 less than window width), ;; goto end of buffer. We check for this special case ;; because the calculated goto-char often goes short of the ;; end due to roundoff error, and we often really want to go diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index e0cdf304b7..e2eabf5955 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -851,7 +851,7 @@ With a prefix argument, un-mark that many files backward." (let ((line-len (- (point) line-start))) (delete-region line-start (point)) ;; - ;; decrement the header-pointer to be in synch... + ;; decrement the header-pointer to be in sync... (setq tar-header-offset (- tar-header-offset line-len)))) ;; ;; delete the data pointer... diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index c11634c15a..0d01b10fae 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el @@ -102,7 +102,7 @@ ;; We have only one font, so... (add-hook 'before-init-hook 'msdos-face-setup) ;; --------------------------------------------------------------------------- -;; More or less useful immitations of certain X-functions. A lot of the +;; More or less useful imitations of certain X-functions. A lot of the ;; values returned are questionable, but usually only the form of the ;; returned value matters. Also, by the way, recall that `ignore' is ;; a useful function for returning 'nil regardless of argument. diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 8064b5e058..7c71d1d53f 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -1324,7 +1324,7 @@ Optional second argument contains the dictionary to use; the default is ;;; multiple lines. ;;; "ispell-filter-continue" is true when we have received only part of a ;;; line as output from a generating function ("output" did not end with \n) -;;; NOTE THAT THIS FUNCTION WILL FAIL IF THE PROCESS OUTPUT DOESNT END WITH \n! +;;; THIS FUNCTION WILL FAIL IF THE PROCESS OUTPUT DOESN'T END WITH \n! ;;; This is the case when a process dies or fails. The default behavior ;;; in this case treats the next input received as fresh input. @@ -1370,7 +1370,7 @@ otherwise it is displayed normally." (inhibit-quit t) ; inhibit interrupt processing here. (buffer-undo-list t)) ; don't clutter the undo list. (delete-region start end) - (insert-char ? (- end start)) ; mimimize amount of redisplay + (insert-char ? (- end start)) ; minimize amount of redisplay (sit-for 0) ; update display (if highlight (setq inverse-video (not inverse-video))) ; toggle video (delete-region start end) ; delete whitespace @@ -2200,7 +2200,7 @@ You can bind this to the key C-c i in GNUS or mail by adding to (point)))) (end (or (and end-c end-fwd (min end-c end-fwd)) end-c end-fwd - ;; defalut to limit of text. + ;; default to limit of text. (marker-position limit)))) (goto-char start) (ispell-region start end) diff --git a/lisp/textmodes/ooutline.el b/lisp/textmodes/ooutline.el index 6046de427c..7e50490433 100644 --- a/lisp/textmodes/ooutline.el +++ b/lisp/textmodes/ooutline.el @@ -145,7 +145,7 @@ in the file it applies to.") (3 . font-lock-comment-face)))) font-lock-variable-name-face)) nil t)) - ;; Highight citations of the form [1] and [Mar94]. + ;; Highlight citations of the form [1] and [Mar94]. ("\\[\\([A-Z][A-Za-z]+\\)*[0-9]+\\]" . font-lock-type-face)) "Additional expressions to highlight in Outline mode.") diff --git a/lisp/textmodes/outline.el b/lisp/textmodes/outline.el index b872557d23..b36e3c7616 100644 --- a/lisp/textmodes/outline.el +++ b/lisp/textmodes/outline.el @@ -145,7 +145,7 @@ in the file it applies to.") (3 . font-lock-comment-face)))) font-lock-variable-name-face)) nil t)) - ;; Highight citations of the form [1] and [Mar94]. + ;; Highlight citations of the form [1] and [Mar94]. ("\\[\\([A-Z][A-Za-z]+\\)*[0-9]+\\]" . font-lock-type-face)) "Additional expressions to highlight in Outline mode.") diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el index f00146a08f..2a5ab9ef4a 100644 --- a/lisp/textmodes/page-ext.el +++ b/lisp/textmodes/page-ext.el @@ -161,7 +161,7 @@ ; You may use either the `C-x C-p d' (pages-directory-for-addresses) ; or the `C-x C-p C-d' (pages-directory) command to construct and -; dislay a directory of all the heading lines. +; display a directory of all the heading lines. ; In the directory, you may position the cursor over a heading line ; and type `C-c C-c' (pages-directory-goto) to go to the entry to diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 497c4d784b..e4b0edf1b3 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -2893,7 +2893,7 @@ The command `@value{foo}' expands to the value." ;; In the original version, include files were ignored by Info but ;; incorporated in to the printed manual. To make references to the ;; included file, the Texinfo source file has to refer to the included -;; files using the `(filename)nodename' format for refering to other +;; files using the `(filename)nodename' format for referring to other ;; Info files. Also, the included files had to be formatted on their ;; own. It was just like they were another file. diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index b8ec387164..f20b1e1582 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -183,7 +183,7 @@ See also variable `vc-consult-headers'.") ;; Insert the contents of FILE into the current buffer. ;; Optional argument LIMIT is a regexp. If present, ;; the file is inserted in chunks of size BLOCKSIZE - ;; (default 8 kByte), until the first occurence of + ;; (default 8 kByte), until the first occurrence of ;; LIMIT is found. The function returns nil if FILE ;; doesn't exist. (erase-buffer) diff --git a/lisp/vc.el b/lisp/vc.el index 0454701a60..e71dd51cef 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -827,7 +827,7 @@ merge in the changes into your working copy." (defun vc-resynch-window (file &optional keep noquery) ;; If the given file is in the current buffer, - ;; either revert on it so we see expanded keyworks, + ;; either revert on it so we see expanded keywords, ;; or unvisit it (depending on vc-keep-workfiles) ;; NOQUERY if non-nil inhibits confirmation for reverting. ;; NOQUERY should be t *only* if it is known the only difference @@ -2006,7 +2006,7 @@ From a program, any arguments are passed to the `rcs2log' script." ;; Automatically retrieves a read-only version of the file with ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise ;; it deletes the workfile. - ;; Adaption for RCS branch support: if this is an explicit checkin, + ;; Adaptation for RCS branch support: if this is an explicit checkin, ;; or if the checkin creates a new branch, set the master file branch ;; accordingly. (message "Checking in %s..." file) @@ -2418,7 +2418,7 @@ Invoke FUNC f ARGS on each non-directory file f underneath it." ;;; during the entire execution of vc-next-action, or (b) detect and ;;; recover from errors resulting from dispatch on an out-of-date state. ;;; -;;; Alternative (a) appears to be unfeasible. The problem is that we can't +;;; Alternative (a) appears to be infeasible. The problem is that we can't ;;; guarantee that the lock will ever be removed. Suppose a user starts a ;;; checkin, the change message buffer pops up, and the user, having wandered ;;; off to do something else, simply forgets about it? -- 2.20.1