diff options
Diffstat (limited to 'lisp')
80 files changed, 139 insertions, 136 deletions
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 702248dd97..4baec98725 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -16735,7 +16735,7 @@ * progmodes/cc-cmds.el (c-beginning-of-statement (and subfunctions)): Adapt c-\(back\|forward\)-over-illiterals such that movement over macros and code are rigorously separated from - eachother. Correct a few incidental bugs. + each other. Correct a few incidental bugs. * progmodes/cc-cmds.el: Restructure c-beginning-of-statement: Improve its doc-string. Improve the handling of certain specific cases. diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index c5d34fc3e3..b2121de260 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -49,7 +49,7 @@ ;; systematically couple overlays, graphics, and other features with ;; allout-governed text. -;;;_: Code (structured with comments that delinieate an allout outline) +;;;_: Code (structured with comments that delineate an allout outline) ;;;_ : General Environment (require 'allout) diff --git a/lisp/allout.el b/lisp/allout.el index 4098ba9ba5..d3d4cf835a 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1544,7 +1544,7 @@ substitution is used against the regexp matches, a la `replace-match'.") "Variable for regexps matching plaintext to remove before encryption. This is used to detect strings in encryption results that would -register as allout mode structural elements, for exmple, as a +register as allout mode structural elements, for example, as a topic prefix. Entries must be symbols that are bound to the desired regexp values. @@ -3543,7 +3543,7 @@ PRIOR-BULLET.) Fifth arg, NUMBER-CONTROL, matters only if `allout-numbered-bullet' is non-nil *and* no specific INSTEAD was specified. Then NUMBER-CONTROL non-nil forces prefix to either numbered or -denumbered format, depending on the value of the sixth arg, INDEX. +unnumbered format, depending on the value of the sixth arg, INDEX. \(Note that NUMBER-CONTROL does *not* apply to level 1 topics. Sorry...) diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index ff7edf40dc..4d6f02a40b 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -68,7 +68,7 @@ ;; ;; Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> for pointing me to ECMA-48. ;; -;; Stefan Monnier <foo@acm.com> explaing obscure font-lock stuff and +;; Stefan Monnier <foo@acm.com> for explaining obscure font-lock stuff and for ;; code suggestions. diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index f011d187a4..f1f7925285 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -125,7 +125,7 @@ "The mode settings for Calc buffer when put in embedded mode.") (defun calc-embedded-save-original-modes () - "Save the current Calc modes when entereding embedded mode." + "Save the current Calc modes when entering embedded mode." (let ((calcbuf (save-excursion (calc-create-buffer) (current-buffer))) @@ -144,7 +144,7 @@ (let ((var (cdr (car v)))) (unless (memq var '(the-language the-display-just)) (setq modes - (cons (cons var (symbol-value var)) + (cons (cons var (symbol-value var)) modes)))) (setq v (cdr v)))) (setq calc-embedded-original-modes (cons lang modes))) @@ -182,7 +182,7 @@ (calc-set-mode-line)))) (setq calc-embedded-original-modes nil))) -;; The variables calc-embed-outer-top, calc-embed-outer-bot, +;; The variables calc-embed-outer-top, calc-embed-outer-bot, ;; calc-embed-top and calc-embed-bot are ;; local to calc-do-embedded, calc-embedded-mark-formula, ;; calc-embedded-duplicate, calc-embedded-new-formula and @@ -195,7 +195,7 @@ ;; The variable calc-embed-arg is local to calc-do-embedded, ;; calc-embedded-update-formula, calc-embedded-edit and -;; calc-do-embedded-activate, but is used by +;; calc-do-embedded-activate, but is used by ;; calc-embedded-make-info, which is called by the above ;; functions. (defvar calc-embed-arg) @@ -208,14 +208,14 @@ ;; The following is to take care of any minor modes which override ;; a Calc command. -(defvar calc-override-minor-modes-map +(defvar calc-override-minor-modes-map (make-sparse-keymap) "A list of keybindings that might be overwritten by minor modes.") ;; Add any keys that might be overwritten here. (define-key calc-override-minor-modes-map "`" 'calc-edit) -(defvar calc-override-minor-modes +(defvar calc-override-minor-modes (cons t calc-override-minor-modes-map)) (defun calc-do-embedded (calc-embed-arg end obeg oend) @@ -279,7 +279,7 @@ (calc-embedded-save-original-modes) (or calc-embedded-globals (calc-find-globals)) - (setq info + (setq info (calc-embedded-make-info (point) nil t calc-embed-arg end obeg oend)) (if (eq (car-safe (aref info 8)) 'error) (progn @@ -564,7 +564,7 @@ The command \\[yank] can retrieve it from there." (goto-char calc-embed-outer-bot) (insert "\n") (setq new-top (point)) - (insert-buffer-substring (current-buffer) + (insert-buffer-substring (current-buffer) calc-embed-outer-top calc-embed-outer-bot) (goto-char (+ new-top (- calc-embed-top calc-embed-outer-top))) (let ((calc-embedded-quiet (if already t 'x))) @@ -659,7 +659,7 @@ The command \\[yank] can retrieve it from there." (equal (symbol-value (car (car v))) value)) (progn (setq changed t) - (if temp (setq calc-embed-prev-modes + (if temp (setq calc-embed-prev-modes (cons (cons (car (car v)) (symbol-value (car (car v)))) calc-embed-prev-modes))) @@ -809,12 +809,12 @@ The command \\[yank] can retrieve it from there." (list modes emodes pmodes))) ;; The variable calc-embed-vars-used is local to calc-embedded-make-info, -;; calc-embedded-evaluate-expr and calc-embedded-update, but is +;; calc-embedded-evaluate-expr and calc-embedded-update, but is ;; used by calc-embedded-find-vars, which is called by the above functions. (defvar calc-embed-vars-used) (defun calc-embedded-make-info (point cbuf fresh &optional - calc-embed-top calc-embed-bot + calc-embed-top calc-embed-bot calc-embed-outer-top calc-embed-outer-bot) (let* ((bufentry (assq (current-buffer) calc-embedded-active)) (found bufentry) @@ -831,7 +831,7 @@ The command \\[yank] can retrieve it from there." (newform (assoc major-mode calc-embedded-open-close-formula-alist)) (newword (assoc major-mode calc-embedded-word-regexp-alist)) (newplain (assoc major-mode calc-embedded-open-close-plain-alist)) - (newnewform + (newnewform (assoc major-mode calc-embedded-open-close-new-formula-alist)) (newmode (assoc major-mode calc-embedded-open-close-mode-alist))) (when newann @@ -874,9 +874,9 @@ The command \\[yank] can retrieve it from there." (aset info 1 (or cbuf (save-excursion (calc-create-buffer) (current-buffer))))) - (if (and + (if (and (or (integerp calc-embed-top) (equal calc-embed-top '(4))) - (not calc-embed-bot)) + (not calc-embed-bot)) ; started with a user-supplied argument (progn (if (equal calc-embed-top '(4)) @@ -1157,7 +1157,7 @@ The command \\[yank] can retrieve it from there." (if need-display (calc-embedded-set-justify (cdr (car calc-embed-prev-modes))))) (t - (set (car (car calc-embed-prev-modes)) + (set (car (car calc-embed-prev-modes)) (cdr (car calc-embed-prev-modes))))) (setq calc-embed-prev-modes (cdr calc-embed-prev-modes)))))) diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 8b816665d9..5429509af8 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -432,7 +432,7 @@ (define-key calc-mode-map "ls" 'calc-spn) (define-key calc-mode-map "lm" 'calc-midi) (define-key calc-mode-map "lf" 'calc-freq) - + (define-key calc-mode-map "l?" 'calc-l-prefix-help) (define-key calc-mode-map "m" nil) @@ -2867,7 +2867,7 @@ If X is not an error form, return 1." (memq (nth 2 expr) '(var-inf var-uinf var-nan))))) ;; The variable math-integral-cache is originally declared in calcalg2.el, -;; but is set by math-defintegral and math-definitegral2. +;; but is set by math-defintegral and math-defintegral-2. (defvar math-integral-cache) (defmacro math-defintegral (funcs &rest code) diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el index 1a4e0d9f6b..2151e9ef53 100644 --- a/lisp/cedet/semantic/bovine/el.el +++ b/lisp/cedet/semantic/bovine/el.el @@ -823,7 +823,7 @@ In Emacs Lisp this is easily defined by parenthesis bounding." (&optional point) "Return a list of tag classes allowed at POINT. Emacs Lisp knows much more about the class of the tag needed to perform -completion than some languages. We distincly know if we are to be a +completion than some languages. We distinctly know if we are to be a function name, variable name, or any type of symbol. We could identify fields and such to, but that is for some other day." (save-excursion diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index f1aee1ef38..6709236c54 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -891,7 +891,7 @@ making the action of homing in on a token faster.") This completion is calculated and saved for future use.") (last-whitespace-completion :type (or null string) :documentation "The last whitespace completion. -For partial completion, SPC will disabiguate over whitespace type +For partial completion, SPC will disambiguate over whitespace type characters. This is the last calculated version.") (current-exact-match :type list :protection :protected @@ -1353,7 +1353,7 @@ to click on the items to aid in completion.") (defmethod semantic-displayor-show-request ((obj semantic-displayor-traditional)) "A request to show the current tags table." - ;; NOTE TO SELF. Find the character to type next, and emphesize it. + ;; NOTE TO SELF. Find the character to type next, and emphasize it. (with-output-to-temp-buffer "*Completions*" (display-completion-list @@ -1377,7 +1377,7 @@ given tag, by highlighting its location.") ) "Abstract displayor supporting `focus'. A displayor which has the ability to focus in on one tag. -Focusing is a way of differentiationg between multiple tags +Focusing is a way of differentiating among multiple tags which have the same name." :abstract t) diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el index 661bc8d684..943ccf2303 100644 --- a/lisp/cedet/semantic/db-file.el +++ b/lisp/cedet/semantic/db-file.el @@ -289,7 +289,7 @@ Argument OBJ is the object to write." (when (and (boundp semantic-show-unmatched-syntax-mode) semantic-show-unmatched-syntax-mode) ;; Only do this if the user runs unmatched syntax - ;; mode display enties. + ;; mode display entries. (oset obj unmatched-syntax (semantic-show-unmatched-lex-tokens-fetch)) ) diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index ce76dddf35..a4c4bd99f2 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el @@ -368,7 +368,7 @@ a master list." (semanticdb-typecache-merge-streams incstream ;; Getting the cache from this table will also cause this - ;; file to update it's cache from it's decendants. + ;; file to update its cache from its decendents. ;; ;; In theory, caches are only built for most includes ;; only once (in the loop before this one), so this ends diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el index f83d30ac12..c9013ed8c9 100644 --- a/lisp/cedet/semantic/db.el +++ b/lisp/cedet/semantic/db.el @@ -606,7 +606,7 @@ The file associated with OBJ does not need to be in a buffer." ;; The lexical table should be good too. (when (featurep 'semantic/lex-spp) (oset table lexical-table (semantic-lex-spp-save-table))) - ;; this implies dirtyness + ;; this implies dirtiness (semanticdb-set-dirty table) ;; Synchronize the index diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index 8115f3c9a1..4ac2733a34 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -537,7 +537,7 @@ This function is for internal use by `semantic-edits-incremental-parser'." ;; We want to take some set of changes, and group them ;; together into a small change group. One change forces ;; a reparse of a larger region (the size of some set of - ;; tags it encompases.) It may contain several tags. + ;; tags it encompasses.) It may contain several tags. ;; That region may have other changes in it (several small ;; changes in one function, for example.) ;; Optimize for the simple cases here, but try to handle diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el index 8a099a9bfb..876ec9bbd4 100644 --- a/lisp/cedet/semantic/format.el +++ b/lisp/cedet/semantic/format.el @@ -603,7 +603,7 @@ This associates a symbol, such as 'public with the st ring \"+\".") "Convert PROTECTION-SYMBOL to a string for UML. By default, uses `semantic-format-tag-protection-symbol-to-string-assoc-list' to convert. -By defaul character returns are: +By default character returns are: public -- + private -- - protected -- #. diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index 5489765dcc..8009a257a7 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -639,7 +639,7 @@ and what valid VAL values are." ;;; Macro Merging ;; -;; Used when token streams from different macros include eachother. +;; Used when token streams from different macros include each other. ;; Merged macro streams perform in place replacements. (defun semantic-lex-spp-merge-streams (raw-stream) diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el index 3fe3f05f1f..d9a3ede360 100644 --- a/lisp/cedet/semantic/sb.el +++ b/lisp/cedet/semantic/sb.el @@ -399,7 +399,7 @@ Returns the tag list, or t for an error." (if (listp out) (condition-case nil (progn - ;; This brings externally defind methods into + ;; This brings externally defined methods into ;; their classes, and creates meta classes for ;; orphans. (setq out (semantic-adopt-external-members out)) diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el index e79953400a..c2f080ce75 100644 --- a/lisp/cedet/semantic/texi.el +++ b/lisp/cedet/semantic/texi.el @@ -597,7 +597,7 @@ Note: TYPE not yet implemented." ;; ;; If we have a string, do the replacement. ;; (delete-region (semantic-tag-start tag) ;; (semantic-tag-end tag)) -;; ;; Use useful functions from the docaument library. +;; ;; Use useful functions from the document library. ;; (srecode-texi-insert-tag-as-doc doctag) ;; ;(semantic-insert-foreign-tag doctag) ;; )) diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index d65cd2b8d8..d3623d6022 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -62,7 +62,7 @@ (dictionary :initarg :dictionary :type (or null srecode-dictionary) :documentation - "List of section dictinaries. + "List of section dictionaries. The compiled template can contain lists of section dictionaries, or values that are expected to be passed down into different section macros. The template section dictionaries are merged in with diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el index 5f6806a06b..62ceff8244 100644 --- a/lisp/cedet/srecode/dictionary.el +++ b/lisp/cedet/srecode/dictionary.el @@ -202,7 +202,7 @@ associated with a buffer or parent." :size 20) :origin origin))) ;; Only set up the default variables if we are being built - ;; directroy for a particular buffer. + ;; directly for a particular buffer. (when initfrombuff ;; Variables from the table we are inserting from. ;; @todo - get a better tree of tables. diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index e297f5dffd..caf1ddebdb 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el @@ -720,7 +720,7 @@ allocating something based on its type." "Convert tag or string PARAM into a name,comment pair. Optional COMMENTLIST is list of previously existing comments to use instead in alist form. If the name doesn't appear in the list of -standard names, then englishify it instead." +standard names, then english it instead." (let ((cmt "") (aso srecode-document-autocomment-param-alist) (fnd nil) diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index cccfe099e7..9fbfc5dc04 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -936,7 +936,7 @@ with the dictionaries found in the dictionary." (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name)) ;; If we have a value, then call the next method (srecode-insert-method-helper sti dictionary 'includedtemplate) - ;; If we don't have a special dictitonary, then just insert with the + ;; If we don't have a special dictionary, then just insert with the ;; current dictionary. (srecode-insert-subtemplate sti dictionary 'includedtemplate)) ) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index b09096978f..b63940cec2 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -347,7 +347,7 @@ This calls touch." ;; Do the operation and record failures. failures (nconc (apply function (append args pending)) failures) - ;; Transfer the elemens of PENDING onto PAST + ;; Transfer the elements of PENDING onto PAST ;; and clear it out. Now PAST contains the first N files ;; specified (for some N), and FILES contains the rest. past (nconc past pending) @@ -1490,7 +1490,7 @@ ARG as in `dired-get-marked-files'. Optional arg MARKER-CHAR as in `dired-create-files'. Optional arg OP1 is an alternate form for OPERATION if there is only one file. -Optional arg HOW-TO determiness how to treat the target. +Optional arg HOW-TO determines how to treat the target. If HOW-TO is nil, use `file-directory-p' to determine if the target is a directory. If so, the marked file(s) are created inside that directory. Otherwise, the target is a plain file; diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index a245a91c5c..8527bc9e64 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -664,8 +664,8 @@ ;; @@@ Enabling automatic advice activation: ;; ========================================= -;; Automatic advice activation is enabled by default. It can be disabled by -;; doint `M-x ad-stop-advice' and enabled again with `M-x ad-start-advice'. +;; Automatic advice activation is enabled by default. It can be disabled with +;; `M-x ad-stop-advice' and enabled again with `M-x ad-start-advice'. ;; @@ Caching of advised definitions: ;; ================================== diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 84aaf8718e..096e91ea4f 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -743,7 +743,7 @@ BYTES and PC are updated after evaluating all the arguments." (defmacro byte-compile-push-bytecode-const2 (opcode const2 bytes pc) "Push OPCODE and the two-byte constant CONST2 onto BYTES, and add 3 to PC. -CONST2 may be evaulated multiple times." +CONST2 may be evaluated multiple times." `(byte-compile-push-bytecodes ,opcode (logand ,const2 255) (lsh ,const2 -8) ,bytes ,pc)) diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 8257c6aebe..265328631e 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -1579,8 +1579,9 @@ KEYWORDS are additional arguments, which can use the following keywords: (while (setq closer (pop closers)) (unless (and closers ;; FIXME: this eliminates prefixes of other - ;; closers, but we should probably elimnate - ;; prefixes of other keywords as well. + ;; closers, but we should probably + ;; eliminate prefixes of other keywords + ;; as well. (string-prefix-p closer (car closers))) (push (aref closer (1- (length closer))) triggers))) (delete-dups triggers))))))) diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 9abb0c8ecc..43d56a5b89 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -607,7 +607,7 @@ will return the parsed command." (setq command (eshell-parse-command (cons beg end) args t))))) (ignore - (message "Expecting completion of delimeter %c ..." + (message "Expecting completion of delimiter %c ..." (if (listp delim) (car delim) delim))) diff --git a/lisp/ezimage.el b/lisp/ezimage.el index e8680b65d9..a356294403 100644 --- a/lisp/ezimage.el +++ b/lisp/ezimage.el @@ -59,7 +59,7 @@ IMAGESPEC is the image data, and DOCSTRING is documentation for the image." (defimage ,variable ,imagespec ,docstring) (put (quote ,variable) 'ezimage t))) -;; This hack is for the ezimage install which has an icons direcory for +;; This hack is for the ezimage install which has an icons directory for ;; the default icons to be used. ;; (add-to-list 'load-path ;; (concat (file-name-directory diff --git a/lisp/ffap.el b/lisp/ffap.el index 97105ed422..74df988332 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -523,7 +523,7 @@ The optional NOMODIFY argument suppresses the extra search." ;; (ffap-file-remote-p "/ffap.el:80") (or (and ffap-ftp-regexp (string-match ffap-ftp-regexp filename) - ;; Convert "/host.com://dir" to "/host:/dir", to handle a dieing + ;; Convert "/host.com://dir" to "/host:/dir", to handle a dying ;; practice of advertising ftp files as "host.dom://filename". (if (string-match "//" filename) ;; (replace-match "/" nil nil filename) diff --git a/lisp/follow.el b/lisp/follow.el index a0e363aea2..aa40c27a7a 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -560,7 +560,7 @@ Keys specific to Follow mode: ;; `scroll-up' and `-down', but for windows in Follow mode. ;; -;; Almost like the real thing, excpet when the cursor ends up outside +;; Almost like the real thing, except when the cursor ends up outside ;; the top or bottom... In our case however, we end up outside the ;; window and hence we are recenterd. Should we let `recenter' handle ;; the point position we would never leave the selected window. To do diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el index ec98b2ff74..2d8587ace3 100644 --- a/lisp/gnus/gnus-srvr.el +++ b/lisp/gnus/gnus-srvr.el @@ -553,7 +553,7 @@ The following commands are available: (gnus-server-list-servers)) (defun gnus-server-copy-server (from to) - "Copy a server definiton to a new name." + "Copy a server definition to a new name." (interactive (list (or (gnus-server-server-name) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 924d974eb3..5f385ec105 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -3582,7 +3582,7 @@ that that variable is buffer-local to the summary buffers." (equal (nth 1 m1) (nth 1 m2))))))) (defsubst gnus-sloppily-equal-method-parameters (m1 m2) - ;; Check parameters for sloppy equalness. + ;; Check parameters for sloppy equality. (let ((p1 (copy-sequence (cddr m1))) (p2 (copy-sequence (cddr m2))) e1 e2) diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el index 345e7c19a6..dade86ab17 100644 --- a/lisp/gnus/html2text.el +++ b/lisp/gnus/html2text.el @@ -123,7 +123,7 @@ If this list contains the element \"font\".") This is an alist where each dotted pair consists of a tag, and then the name of a function to be called when this tag is found. The function is called with the arguments p1, p2, p3 and p4. These are -demontrated below: +demonstrated below: \"<b> This is bold text </b>\" ^ ^ ^ ^ diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 1d0830afd2..176857633e 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -2503,7 +2503,7 @@ Return the number of headers removed." (point-max))) (goto-char (point-min))) -;; FIXME: clarify diffference: message-narrow-to-head, +;; FIXME: clarify difference: message-narrow-to-head, ;; message-narrow-to-headers-or-head, message-narrow-to-headers (defun message-narrow-to-head () "Narrow the buffer to the head of the message. diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index db7ac1b44f..a798e22902 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -72,7 +72,7 @@ ;; * nndiary-get-new-mail, nndiary-mail-source and nndiary-split-methods: ;; NNDiary has some experimental parts, in the sense Gnus normally uses only ;; one mail back ends for mail retreival and splitting. This back end is -;; also an attempt to make it behave differently. For Gnus developpers: as +;; also an attempt to make it behave differently. For Gnus developers: as ;; you can see if you snarf into the code, that was not a very difficult ;; thing to do. Something should be done about the respooling breakage ;; though. diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index 66ed90be82..9d6011e657 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -1634,7 +1634,7 @@ search in raw mode." (nnheader-message 3 "Couldn't find original article")))) (defun nnmairix-determine-original-group-from-registry (mid) - "Try to determinale original group for message-id MID from the registry." + "Try to determine original group for message-id MID from the registry." (when (gnus-bound-and-true-p 'gnus-registry-enabled) (unless (string-match "^<" mid) (set mid (concat "<" mid))) diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 46db428068..0dee4157d7 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -480,7 +480,7 @@ This is the opposite of `hilit-chg-hide-changes'." (defun hilit-chg-make-ov (prop start end) (or prop (error "hilit-chg-make-ov: prop is nil")) - ;; For the region create overlays with a distincive face + ;; For the region create overlays with a distinctive face ;; and the text property 'hilit-chg. (let ((ov (make-overlay start end)) (face (if (eq prop 'hilit-chg-delete) diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index deb241ce7f..56859269e0 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -586,7 +586,7 @@ If a window system is unavailable, calls `hfy-fallback-colour-values'." (defvar hfy-cperl-mode-kludged-p nil) (defun hfy-kludge-cperl-mode () - "CPerl mode does its damndest not to do some of its fontification when not + "CPerl mode does its damnedest not to do some of its fontification when not in a windowing system - try to trick it..." (if (not hfy-cperl-mode-kludged-p) (progn (if (not window-system) @@ -1773,7 +1773,7 @@ Strips any leading \"./\" from each filename." (mapcar (lambda (F) (if (string-match "^./\\(.*\\)" F) (match-string 1 F) F)) (split-string (shell-command-to-string hfy-find-cmd))) ) -;; strip the filename off, return a directiry name +;; strip the filename off, return a directory name ;; not a particularly thorough implementaion, but it will be ;; fed pretty carefully, so it should be Ok: (defun hfy-dirname (file) diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 777779e5ec..9f6520c723 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -700,7 +700,7 @@ Internal use only. Should be called at startup time." ;; HPHEBREW8 8-bit character set ;; "HP-Japanese15" [36] ;; HPJAPAN15 15-bit character set, -;; modified from industry defacto +;; modified from industry de facto ;; standard Shift-JIS ;; "HP-Kana8" [36] ;; HPKANA8 8-bit character set diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index ad055ac906..757322aa0c 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -305,7 +305,7 @@ SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy (cond ((looking-at "PROMPT:[ \t]*") (goto-char (match-end 0)) (setq tit-prompt (tit-read-key-value)) - ;; Some TIT dictionaies that are encoded by + ;; Some TIT dictionaries that are encoded by ;; euc-china contains invalid character at the tail. (let* ((last (aref tit-prompt (1- (length tit-prompt)))) (split (split-char last))) diff --git a/lisp/kmacro.el b/lisp/kmacro.el index e47f571db7..eea3009faf 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -1020,7 +1020,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', (setq executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events)) next-index executing-kbd-macro-index))))) - ;; Query the user; stop macro exection temporarily + ;; Query the user; stop macro execution temporarily. (let ((macro executing-kbd-macro) (executing-kbd-macro nil) (defining-kbd-macro nil)) diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el index 22ccd56dab..13a645a997 100644 --- a/lisp/language/ethiopic.el +++ b/lisp/language/ethiopic.el @@ -61,7 +61,7 @@ (features ethio-util) (sample-text . "ፊደል") (documentation . -"This language envrironment provides these function key bindings: +"This language environment provides these function key bindings: [f3] ethio-fidel-to-sera-buffer [S-f3] ethio-fidel-to-sera-region [C-f3] ethio-fidel-to-sera-marker diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 0b56919993..da20e4cb7c 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -144,7 +144,7 @@ These are symbols with hooklike values whose names don't end in pertinent symbols.") (defvar unload-function-defs-list nil - "List of defintions in the Lisp library being unloaded. + "List of definitions in the Lisp library being unloaded. This is meant to be used by `FEATURE-unload-function'; see the documentation of `unload-feature' for details.") diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 1ba8ec9f82..47583e3f86 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -83,7 +83,7 @@ ;; work properly. If you don't know what custom is all about and want ;; to edit your user option elisp variables the old fashioned way, ;; just imagine that all the "defcustom" stuff you see below is really -;; "defvar", and ignore everthing else. For info about custom, see +;; "defvar", and ignore everything else. For info about custom, see ;; <URL:http://www.dina.kvl.dk/~abraham/custom/>. ;; ;; This code does in elisp a superset of the stuff that used to be done diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 5054f1d232..89c7db241d 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -412,7 +412,7 @@ element is not omitted." (program &optional infile destination display &rest args) "Calls `call-process' on the local host. This is needed because for some Emacs flavors Tramp has -defadviced `call-process' to behave like `process-file'. The +defadvised `call-process' to behave like `process-file'. The Lisp error raised when PROGRAM is nil is trapped also, returning 1." (let ((default-directory (if (file-remote-p default-directory) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 1b00e81ef5..50a3c1fca5 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -549,7 +549,7 @@ as given in your `~/.profile'." "*List of environment variables to be set on the remote host. Each element should be a string of the form ENVVARNAME=VALUE. An -entry ENVVARNAME= diables the corresponding environment variable, +entry ENVVARNAME= disables the corresponding environment variable, which might have been set in the init files like ~/.profile. Special handling is applied to the PATH environment, which should diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a47e7fa8f6..0ee6ad8dea 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -152,7 +152,7 @@ local host, so if you want to use `~' in those commands, you should choose a shell here which groks tilde expansion. `/bin/sh' normally does not understand tilde expansion. -For encoding and deocding, commands like the following are executed: +For encoding and decoding, commands like the following are executed: /bin/sh -c COMMAND < INPUT > OUTPUT diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index b1a8a4b9fd..6279ed3df0 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -2125,7 +2125,7 @@ the currently selected interval size." "Write out a clock table at position IPOS in the current buffer. TABLES is a list of tables with clocking data as produced by `org-clock-get-table-data'. PARAMS is the parameter property list obtained -from the dynamic block defintion." +from the dynamic block definition." ;; This function looks quite complicated, mainly because there are a ;; lot of options which can add or remove columns. I have massively ;; commented this function, the I hope it is understandable. If diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index 896acc5aea..5e4935caa7 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -272,7 +272,7 @@ Works on both Emacs and XEmacs." nil)) (defmacro org-xemacs-without-invisibility (&rest body) - "Turn off exents with invisibility while executing BODY." + "Turn off extents with invisibility while executing BODY." `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol) 'all-extents-closed-open 'invisible)) ext-inv-specs) diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index 14b3e12c88..1a14c71d51 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -681,7 +681,7 @@ Assume point is at an item." (cond ((<= (point) lim-up) ;; At upward limit: if we ended at an item, store it, - ;; else dimiss useless data recorded above BEG-CELL. + ;; else dismiss useless data recorded above BEG-CELL. ;; Jump to part 2. (throw 'exit (setq itm-lst diff --git a/lisp/org/org.el b/lisp/org/org.el index 5d988b3cec..f88ed3c7eb 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1482,7 +1482,7 @@ in the search text." :type '(choice (const :tag "Use fuzy text search" nil) (const :tag "Match only exact headline" t) - (const :tag "Match extact headline or query to create it" + (const :tag "Match exact headline or query to create it" query-to-create))) (defcustom org-link-frame-setup @@ -5052,7 +5052,7 @@ The time stamps may be either active or inactive.") (defvar org-emph-face nil) (defun org-do-emphasis-faces (limit) - "Run through the buffer and add overlays to emphasised strings." + "Run through the buffer and add overlays to emphasized strings." (let (rtn a) (while (and (not rtn) (re-search-forward org-emph-re limit t)) (if (not (= (char-after (match-beginning 3)) @@ -14835,7 +14835,7 @@ user." (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day) t nil ans))) - ;; Help matching dottet european dates + ;; Help matching dotted european dates (when (string-match "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans) (setq year (if (match-end 3) diff --git a/lisp/play/animate.el b/lisp/play/animate.el index facdfa2f34..ec0cacc4a6 100644 --- a/lisp/play/animate.el +++ b/lisp/play/animate.el @@ -93,7 +93,7 @@ (defvar animation-buffer-name nil "*String naming the default buffer for animations. -When nil animations dipslayed in the buffer named *Animation*.") +When nil animations displayed in the buffer named *Animation*.") ;;;###autoload (defun animate-string (string vpos &optional hpos) diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el index b9ce669533..4d4ea71cd7 100644 --- a/lisp/play/decipher.el +++ b/lisp/play/decipher.el @@ -672,7 +672,7 @@ X: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z * 11 14 9% 1 1 1 2 1 1 2 5 7 This says that X comes before D once, and after B once. X begins 5 words, and ends 3 words (`*' represents a space). X comes before 8 -different letters, after 7 differerent letters, and is next to a total +different letters, after 7 different letters, and is next to a total of 11 different letters. It occurs 14 times, making up 9% of the ciphertext." (interactive (list (upcase (following-char)))) diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el index f0e6670fe5..8629baf35d 100644 --- a/lisp/play/landmark.el +++ b/lisp/play/landmark.el @@ -1584,7 +1584,7 @@ If the game is finished, this command requests for another game." ;;;_ - something which doesn't work ; no-a-worka!! -;(defum landmark-sum-list (list) +;(defun landmark-sum-list (list) ; (if (> (length list) 0) ; (+ (car list) (landmark-sum-list (cdr list))) ; 0)) diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 4cf00cd3cf..0cfdab2370 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -1163,7 +1163,8 @@ If OTHER-FRAME is non-nil, display the cross-reference in another frame." (defun ada-goto-declaration-other-frame (pos) "Display the declaration of the identifier around POS. -The declation is shown in another frame if `ada-xref-other-buffer' is non-nil." +The declaration is shown in another frame if `ada-xref-other-buffer' is +non-nil." (interactive "d") (ada-goto-declaration pos t)) diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 74f9acab5b..aa1289cd63 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -776,7 +776,7 @@ (setq anchor (point)) (search-forward-regexp c-awk-harmless-string*-here-re nil t) ;; We are now looking at either a " or a /. - ;; Do our thing on the string, regexp or divsion sign. + ;; Do our thing on the string, regexp or division sign. (setq anchor-state-/div (if (looking-at "_?\"") (c-awk-syntax-tablify-string) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 13858ad0da..1925d16ba5 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -1304,7 +1304,7 @@ versions of Emacs." (get-text-property (point) 'syntax-type)) '(here-doc pod))] "----" - ["CPerl pretty print (exprmntl)" cperl-ps-print + ["CPerl pretty print (experimental)" cperl-ps-print (fboundp 'ps-extend-face-list)] "----" ["Syntaxify region" cperl-find-pods-heres-region @@ -5793,7 +5793,7 @@ indentation and initial hashes. Behaves usually outside of comment." ;; "\\|") '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0 font-lock-function-name-face keep) ; Not very good, triggers at "[a-z]" - ;; This highlights declarations and definitions differenty. + ;; This highlights declarations and definitions differently. ;; We do not try to highlight in the case of attributes: ;; it is already done by `cperl-find-pods-heres' (list (concat "\\<sub" @@ -8946,7 +8946,7 @@ do extra unwind via `cperl-unwind-to-safe'." ;; Called when any modification is made to buffer text. (defun cperl-after-change-function (beg end old-len) ;; We should have been informed about changes by `font-lock'. Since it - ;; does not inform as which calls are defered, do it ourselves + ;; does not inform as which calls are deferred, do it ourselves (if cperl-syntax-done-to (setq cperl-syntax-done-to (min cperl-syntax-done-to beg)))) diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index 597d84619a..f98f3d191d 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -2084,7 +2084,7 @@ special." "*Specify extra width for arrow shape drawing. The extra width is used to avoid that the arrowhead and the terminal border -overlap. It depens on `ebnf-arrow-shape' and `ebnf-line-width'." +overlap. It depends on `ebnf-arrow-shape' and `ebnf-line-width'." :type 'number :version "22" :group 'ebnf-shape) diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index d321e9c138..13cba0fe70 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -1144,7 +1144,7 @@ error message." (setq order tag-order)) ;; We throw out on match, so only get here if there were no matches. ;; Clear out the markers we use to avoid duplicate matches so they - ;; don't slow down editting and are immediately available for GC. + ;; don't slow down editing and are immediately available for GC. (while tag-lines-already-matched (set-marker (car tag-lines-already-matched) nil nil) (setq tag-lines-already-matched (cdr tag-lines-already-matched))) diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index b54b2dc5f4..c60e8d72ab 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -3387,7 +3387,7 @@ This event can be examined by forms in `gud-tooltip-display'.") (defun gud-tooltip-dereference (&optional arg) "Toggle whether tooltips should show `* expr' or `expr'. -With arg, dereference expr if ARG is positive, otherwise do not derereference." +With arg, dereference expr if ARG is positive, otherwise do not dereference." (interactive "P") (setq gud-tooltip-dereference (if (null arg) diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 8d8966ee15..a2dd67a0f1 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -705,7 +705,8 @@ Those words in `idlwave-completion-help-links' have links. The ;; we kill the help frame before the return-frame is selected. ;; To protect the workings, we wait for up to one second ;; and check if the return-frame *is* now selected. - ;; This is marked "eperimental" since we are not sure when its OK. + ;; This is marked "experimental" since we are not sure when + ;; it's OK. (let ((maxtime 1.0) (time 0.) (step 0.1)) (select-frame idlwave-help-return-frame) (while (and (sit-for step) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 4040a5c431..0e3fdc78a3 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3352,7 +3352,7 @@ If one hasn't been set, or if it's stale, prompt for a new one." ;; etc. and produce maddening "unbalanced parenthesis" errors. ;; When we attempt to find the error and scroll to the portion of ;; the buffer containing the problem, JIT-lock will apply the - ;; correct syntax to the regular expresion literal and the problem + ;; correct syntax to the regular expression literal and the problem ;; will mysteriously disappear. ;; FIXME: We should actually do this fontification lazily by adding ;; calls to syntax-propertize wherever it's really needed. diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index 958c1bfb0c..d0a34179cc 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -161,7 +161,7 @@ "[ \t\f]+\\(\\sw+\\|\\s_+\\|\\s.+\\)") '((1 font-lock-keyword-face) (2 font-lock-function-name-face))) - ;; binary macro defintions: <leveldef> x operator y + ;; binary macro definitions: <leveldef> x operator y (cons (concat "\\<" macro-keywords-2 "\\>" "[ \t\f]+\\(\\sw+\\)" "[ \t\f]*\\(\\sw+\\|\\s.+\\)" diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index fe6bab0160..8d2e671544 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -119,7 +119,7 @@ (1 font-lock-type-face)) ;; Built-ins. (The next three blocks are from ;; `__builtin__.__dict__.keys()' in Python 2.7) These patterns - ;; are debateable, but they at least help to spot possible + ;; are debatable, but they at least help to spot possible ;; shadowing of builtins. (,(rx symbol-start (or ;; exceptions diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 3a3c7f0baa..2d8334bcb7 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -913,7 +913,7 @@ the MSB or LSB of a signal inside an AUTORESET." (put 'verilog-assignment-delay 'safe-local-variable 'stringp) (defcustom verilog-auto-arg-sort nil - "*If set, AUTOARG signal names will be sorted, not in delaration order. + "*If set, AUTOARG signal names will be sorted, not in declaration order. Declaration order is advantageous with order based instantiations and is the default for backward compatibility. Sorted order reduces changes when declarations are moved around in a file, and @@ -2151,7 +2151,7 @@ find the errors." "interface" "endinterface" "module" "macromodule" "endmodule" "package" "endpackage" - "primitive" "endprimative" + "primitive" "endprimitive" "program" "endprogram" "property" "endproperty" "sequence" "randsequence" "endsequence" @@ -3579,7 +3579,7 @@ With ARG, first kill any existing labels." "Move backward to beginning of statement." (interactive) ;; Move back token by token until we see the end - ;; of some ealier line. + ;; of some earlier line. (let (h) (while ;; If the current point does not begin a new diff --git a/lisp/ses.el b/lisp/ses.el index b1d7d7bfb9..c71c603726 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -980,7 +980,7 @@ if the cell's value is unchanged and FORCE is nil." (error "Circular references: %s" ses--deferred-recalc)) (message " ")) ;; Can't use save-excursion here: if the cell under point is updated, - ;; save-excusion's marker will move past the cell. + ;; save-excursion's marker will move past the cell. (goto-char pos))) @@ -3204,7 +3204,7 @@ By passing in REST some flags one can configure the way the range is read and how it is formatted. In the sequel we assume that cells A1, B1, A2 B2 have respective values -1 2 3 and 4 for examplication. +1 2 3 and 4. Readout direction is specified by a `>v', '`>^', `<v', `<^', `v>', `v<', `^>', `^<' flag. For historical reasons, in absence @@ -3230,7 +3230,7 @@ vector or a matrix depending on the number of rows, `*1' will flatten the result to a one row vector, and `*2' will make a matrix whatever the number of rows. -Warning: interaction with Calc is expermimental and may produce +Warning: interaction with Calc is experimental and may produce confusing results if you are not aware of Calc data format. Use `math-format-value' as a printer for Calc objects." (let (result-row diff --git a/lisp/simple.el b/lisp/simple.el index ca50282df1..e70d37588a 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2409,7 +2409,7 @@ and only used if a buffer is displayed." 1)) 1))) ;; Don't use the echo area if the output buffer is - ;; already dispayed in the selected frame. + ;; already displayed in the selected frame. (not (get-buffer-window (current-buffer)))) ;; Echo area (goto-char (point-max)) diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 00f68a0b45..23a91888c1 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -631,7 +631,7 @@ with `.' followed by extensions, followed by full-filenames." (substring (car extlist) 1))) (setq regex2 (concat regex2 (if regex2 "\\|" "") (car extlist)))) (setq extlist (cdr extlist))) - ;; concat all the sub-exressions together, making sure all types + ;; Concatenate all the subexpressions together, making sure all types ;; of parts exist during concatenation. (concat "\\(" (if regex1 (concat "\\(\\.\\(" regex1 "\\)\\)") "") @@ -2105,7 +2105,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )." (let ((sf (cdr (reverse speedbar-shown-directories)))) (setq speedbar-shown-directories (list (expand-file-name default-directory))) - ;; exand them all as we find them + ;; Expand them all as we find them. (while sf (if (speedbar-goto-this-file (car sf)) (progn @@ -3292,7 +3292,7 @@ With universal argument ARG, flush cached data." Optional argument ARG indicates that any cache should be flushed." (interactive "P") (speedbar-expand-line arg) - ;; Now, inside the area expaded here, expand all subnodes of + ;; Now, inside the area expanded here, expand all subnodes of ;; the same descendant type. (save-excursion (speedbar-next 1) ;; Move into the list. diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 0e9de519c8..5b21913c32 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -118,7 +118,7 @@ ;; function keys F11->F42 from the termcap/terminfo information. On ;; a PC-style keyboard these keys correspond to ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The - ;; code here subsitutes the corresponding defintions in + ;; code here subsitutes the corresponding definitions in ;; function-key-map. This substitution is needed because if a key ;; definition if found in function-key-map, there are no further ;; lookups in other keymaps. diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 20d9c18c43..d13437f4c7 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -2514,7 +2514,7 @@ This function returns a point-list." ;; -;; functions for accessing endoints and elements in object requiring +;; functions for accessing endpoints and elements in object requiring ;; 2 endpoints ;; @@ -3582,7 +3582,7 @@ FILL-INFO is a list of vectors on the form [X Y ELLIPSE-WIDTH-ON-THIS-LINE]." (width (abs (- x2 x1))) (height (abs (- y2 y1))) ;; When drawing our circle, we want it to through the cursor - ;; just as when drawing the ellispe, but we have to take + ;; just as when drawing the ellipse, but we have to take ;; care for the aspect-ratio. ;; The equation for the ellipse (where a is the x-radius and ;; b is the y-radius): diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 9b924ba7ad..7de15c66ce 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -59,7 +59,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (error "Not on a crossref macro argument")) (setq reftex-call-back-to-this-buffer (current-buffer)) - + (cond ((string-match "\\`\\\\cite\\|cite\\*?\\'\\|bibentry" macro) ;; A citation macro: search for bibitems or BibTeX entries @@ -87,7 +87,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (format reftex-find-index-entry-regexp-format (regexp-quote key)) 3 nil nil))) - (t + (t (reftex-access-scan-info arg) (catch 'exit (let ((list reftex-view-crossref-extra) @@ -97,14 +97,14 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." action (nth 1 entry) group (nth 2 entry)) (when (string-match mre macro) - (setq dw (reftex-view-regexp-match + (setq dw (reftex-view-regexp-match (format action key) group nil nil)) (throw 'exit t)))) (error "Not on a crossref macro argument")))) (if (and (eq arg 2) (windowp dw)) (select-window dw))))) - + (defun reftex-view-cr-cite (arg key how) - ;; View crossreference of a ref cite. HOW can have the values + ;; View crossreference of a ref cite. HOW can have the values ;; nil: Show in another window. ;; echo: Show one-line info in echo area. ;; tmp-window: Show in small window and arrange for window to disappear. @@ -114,7 +114,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (if (eq how 'tmp-window) ;; Remember the window configuration - (put 'reftex-auto-view-crossref 'last-window-conf + (put 'reftex-auto-view-crossref 'last-window-conf (current-window-configuration))) (let (files size item (pos (point)) (win (selected-window)) pop-win @@ -130,7 +130,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (setq item t files (reftex-uniquify (mapcar 'cdr - (reftex-all-assq + (reftex-all-assq 'thebib (symbol-value reftex-docstruct-symbol)))))) (reftex-default-bibliography (setq item nil @@ -169,17 +169,17 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (select-window pop-win))))) (defun reftex-view-cr-ref (arg label how) - ;; View crossreference of a ref macro. HOW can have the values + ;; View crossreference of a ref macro. HOW can have the values ;; nil: Show in another window. ;; echo: Show one-line info in echo area. ;; tmp-window: Show in small window and arrange for window to disappear. ;; Ensure access to scanning info (reftex-access-scan-info (or arg current-prefix-arg)) - + (if (eq how 'tmp-window) ;; Remember the window configuration - (put 'reftex-auto-view-crossref 'last-window-conf + (put 'reftex-auto-view-crossref 'last-window-conf (current-window-configuration))) (let* ((xr-data (assoc 'xr (symbol-value reftex-docstruct-symbol))) @@ -191,14 +191,14 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." ;; Label is defined in external document (save-excursion (save-match-data - (set-buffer + (set-buffer (or (reftex-get-file-buffer-force (cdr (assoc (match-string 1 label) (nth 1 xr-data)))) (error "Problem with external label %s" label)))) (setq label (substring label (match-end 1))) (reftex-access-scan-info) - (setq entry + (setq entry (assoc label (symbol-value reftex-docstruct-symbol))))) (if (eq how 'echo) ;; Display in echo area @@ -234,7 +234,7 @@ With argument, actually select the window showing the cross reference." (defun reftex-view-crossref-when-idle () ;; Display info about crossref at point in echo area or a window. - ;; This function was desigend to work with an idle timer. + ;; This function was designed to work with an idle timer. ;; We try to get out of here as quickly as possible if the call is useless. (and reftex-mode ;; Make sure message area is free if we need it. @@ -244,7 +244,7 @@ With argument, actually select the window showing the cross reference." reftex-mouse-view-crossref))) ;; Quick precheck if this might be a relevant spot ;; `reftex-view-crossref' will do a more thorough check. - (save-excursion + (save-excursion (search-backward "\\" nil t) (looking-at "\\\\[a-zA-Z]*\\(cite\\|ref\\|bibentry\\)")) @@ -262,12 +262,12 @@ With argument, actually select the window showing the cross reference." (set-window-configuration (get 'reftex-auto-view-crossref 'last-window-conf)) (put 'reftex-auto-view-crossref 'last-window-conf nil) (remove-hook 'pre-command-hook 'reftex-restore-window-conf)) - + (defun reftex-echo-ref (label entry docstruct) ;; Display crossref info in echo area. (cond ((null docstruct) - (message "%s" + (message "%s" (substitute-command-keys (format reftex-no-info-message "ref")))) ((null entry) (message "ref: unknown label: %s" label)) @@ -293,14 +293,14 @@ With argument, actually select the window showing the cross reference." (unless reftex-revisit-to-echo (setq files (reftex-visited-files files))) - (setq entry + (setq entry (condition-case nil (save-excursion (reftex-pop-to-bibtex-entry key files nil nil item t)) (error (if (and files (= (length all-files) (length files))) (message "cite: no such database entry: %s" key) - (message "%s" (substitute-command-keys + (message "%s" (substitute-command-keys (format reftex-no-info-message "cite")))) nil))) (when entry @@ -337,7 +337,7 @@ will display info in the echo area." (if (featurep 'xemacs) (if reftex-use-itimer-in-xemacs (start-itimer "RefTeX Idle Timer" - 'reftex-view-crossref-when-idle + 'reftex-view-crossref-when-idle reftex-idle-time reftex-idle-time t) (add-hook 'post-command-hook 'reftex-start-itimer-once) t) @@ -352,7 +352,7 @@ will display info in the echo area." (not (itimer-live-p reftex-auto-view-crossref-timer)) (setq reftex-auto-view-crossref-timer (start-itimer "RefTeX Idle Timer" - 'reftex-view-crossref-when-idle + 'reftex-view-crossref-when-idle reftex-idle-time nil t)))) (declare-function bibtex-beginning-of-entry "bibtex" ()) @@ -364,7 +364,7 @@ prompts upon first use for a buffer in RefTeX mode. To reset this link to a document, call the function with with a prefix arg. Calling this function several times find successive citation locations." (interactive "P") - (when arg + (when arg ;; Break connection to reference buffer (put 'reftex-bibtex-view-cite-locations :ref-buffer nil)) (let ((ref-buffer (get 'reftex-bibtex-view-cite-locations :ref-buffer))) @@ -372,10 +372,10 @@ Calling this function several times find successive citation locations." (unless ref-buffer (setq ref-buffer (save-current-buffer - (completing-read + (completing-read "Reference buffer: " (delq nil - (mapcar + (mapcar (lambda (b) (set-buffer b) (if reftex-mode (list (buffer-name b)) nil)) diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index b7978fb37b..bf46635c47 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -230,7 +230,7 @@ one with the `xr' package." ;; Save all document buffers before this operation (reftex-save-all-document-buffers) - ;; First test to check for erros + ;; First test to check for errors. (setq n (reftex-translate files search-re translate-alist error-fmt 'test)) diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index dbed09c9cc..d8b5384c6d 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -470,7 +470,7 @@ Label context is only displayed when the labels are there as well." (defun reftex-toc-max-level (arg) "Set the maximum level of toc lines in this buffer to value of prefix ARG. When no prefix is given, set the max level to a large number, so that all -levels are shown. For eaxample, to set the level to 3, type `3 m'." +levels are shown. For example, to set the level to 3, type `3 m'." (interactive "P") (setq reftex-toc-max-level (if arg (prefix-numeric-value arg) @@ -850,7 +850,7 @@ When finished, we exit with an error message." (defun reftex-toc-rename-label () "Rename the currently selected label in the *TOC* buffer. This launches a global search and replace in order to rename a label. -Renaming a label is hardly ever necessary - the only exeption is after +Renaming a label is hardly ever necessary - the only exception is after promotion/demotion in connection with a package like fancyref, where the label prefix determines the wording of a reference." (interactive) diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index c4dbd365c4..b73056a803 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -42,7 +42,7 @@ ;; - For XEmacs 21.x, you need to install the RefTeX plug-in package ;; available from the XEmacs distribution sites. ;; - If you have downloaded this file from the maintainers webpage, follow -;; the instructions in the INSTALL file of the distrubution. +;; the instructions in the INSTALL file of the distribution. ;; ;; To turn RefTeX Mode on and off in a buffer, use `M-x reftex-mode'. ;; diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 1194742a24..094885bb0d 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -620,7 +620,7 @@ if large. You can use `Info-split' to do this manually." "var{\\|" "w{\\|" "xref{\\|" - "@-\\|" ; @- is a descretionary hyphen (not an accent) (a noop). + "@-\\|" ; @- is a discretionary hyphen (not an accent) (a noop). texinfo-accent-commands "\\)" ) diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el index bb937a4442..8a7bb76160 100644 --- a/lisp/url/url-ldap.el +++ b/lisp/url/url-ldap.el @@ -173,7 +173,7 @@ URL can be a URL string, or a URL vector of the type returned by (if attributes (setq attributes (mapcar 'url-unhex-string (split-string attributes ",")))) - ;; Parse out the exentions + ;; Parse out the extensions. (if extensions (setq extensions (mapcar (lambda (ext) (if (string-match "\\([^=]*\\)=\\(.*\\)" ext) diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index 42d33553e1..cfb98c6937 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el @@ -335,7 +335,7 @@ Currently supported methods: `socks': Connect through a socks server; `tls': Connect with TLS; `ssl': Connect with SSL (deprecated, use `tls' instead); -`native': Connect directy." +`native': Connect directly." :type '(radio (const :tag "Telnet to gateway host" :value telnet) (const :tag "Rlogin to gateway host" :value rlogin) (const :tag "Use SOCKS proxy" :value socks) diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index 46b95130ca..f6340392dc 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el @@ -502,7 +502,7 @@ It is expected to call the function.") (if (or (null cvs-version) (or (>= (cdr cvs-version) 10) (> (car cvs-version) 1))) ;; Supposedly some recent versions of CVS output some directory info - ;; as they recurse downthe tree, but it's not good enough in the case + ;; as they recurse down the tree, but it's not good enough in the case ;; where we run "cvs status foo bar/foo". '("status") t) diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el index 311841d37a..4915cb9bf7 100644 --- a/lisp/vc/pcvs-util.el +++ b/lisp/vc/pcvs-util.el @@ -307,7 +307,7 @@ If it is \\[universal-argument] \\[universal-argument], behave just See `cvs-prefix-set' for further description of the behavior.")) (defvar ,cps (let ((defaults ,defaults)) - ;; sanity ensurance + ;; sanity insurance (unless (>= (length defaults) cvs-prefix-number) (setq defaults (append defaults (make-list (1- cvs-prefix-number) diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 5595dc0b03..256719d4c8 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -620,7 +620,7 @@ If non-nil, NEW means to create a new buffer no matter what." (str (car hf)) (done "") (tin (ewoc-nth cvs-cookies 0))) - ;; look for the first *real* fileinfo (to determine emptyness) + ;; look for the first *real* fileinfo (to determine emptiness) (while (and tin (memq (cvs-fileinfo->type (ewoc-data tin)) diff --git a/lisp/window.el b/lisp/window.el index 6de37c1d16..4550526b44 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -3432,7 +3432,7 @@ is non-nil." "Balance the sizes of windows of WINDOW-OR-FRAME. WINDOW-OR-FRAME is optional and defaults to the selected frame. If WINDOW-OR-FRAME denotes a frame, balance the sizes of all -windows of that frame. If WINDOW-OR-FRAME denots a window, +windows of that frame. If WINDOW-OR-FRAME denotes a window, recursively balance the sizes of all child windows of that window." (interactive) diff --git a/lisp/woman.el b/lisp/woman.el index 4999a08bb7..a16bfa39c8 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -2023,7 +2023,7 @@ Optional argument REDRAW, if non-nil, forces mode line to be updated." ;; Both advices are disabled because "a file in Emacs should not put ;; advice on a function in Emacs" (see Info node "(elisp)Advising ;; Functions"). Counting the formatting time is useful for -;; developping, but less applicable for daily use. The advice for +;; developing, but less applicable for daily use. The advice for ;; `Man-getpage-in-background' can be discarded, because the ;; key-binding in `woman-mode-map' has been remapped to call `woman' ;; but `man'. Michael Albinus <michael.albinus@gmx.de> |