diff options
Diffstat (limited to 'lisp')
39 files changed, 67 insertions, 71 deletions
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 1c2f2b5b015..a1cba0a9cd9 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -9383,7 +9383,7 @@ 2002-10-06 Glenn Morris <gmorris@ast.cam.ac.uk> - * progmodes/fortran.el (fortran-beginning-do): Ignore labelled DO + * progmodes/fortran.el (fortran-beginning-do): Ignore labeled DO loops. 2002-10-05 Stefan Monnier <monnier@cs.yale.edu> @@ -23550,4 +23550,3 @@ See ChangeLog.9 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 7ef7fe9dffc..ed7ee443c4c 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -4923,10 +4923,10 @@ (fortran-blink-matching-if, fortran-blink-matching-do) (fortran-indent-new-line): Bind case-fold-search. (fortran-end-do, fortran-beginning-do, fortran-end-if) - (fortran-beginning-if): Bind case-fold-search. Allow labelled blocks. + (fortran-beginning-if): Bind case-fold-search. Allow labeled blocks. Use fortran-end-prog-re. (fortran-if-start-re): New variable. - (fortran-calculate-indent): Allow labelled blocks. Simplify the conds. + (fortran-calculate-indent): Allow labeled blocks. Simplify the conds. Make select case indentation work. (fortran-is-in-string-p): Ignore Emacs 18 bug kluge. (fortran-fill): Allow double quotes in check for string. @@ -21766,9 +21766,9 @@ * f90.el (f90-no-block-limit): Fixed bug for indentation of elsewhere and elseif. - (f90-looking-at-where-or-forall): Now allows for labelled forall + (f90-looking-at-where-or-forall): Now allows for labeled forall and where statements. - (f90-font-lock-keywords-2): New highlighting for labelled where + (f90-font-lock-keywords-2): New highlighting for labeled where and forall. Fixed small bug with else highlighting. (f90-fill-region): Moved indentation to f90-break-line. (f90-break-line): Will now always indent the second line. @@ -23123,4 +23123,3 @@ See ChangeLog.6 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index edfe26fbc03..d2d6409cdd3 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -14191,7 +14191,7 @@ * international/ja-dic-cnv.el: Renamed from skkdic-cnv.el. Provide ja-dic-cnv instead of skkdic-cnv. - (ja-dic-filename): Renamed from skkdic-filename. Referers changed. + (ja-dic-filename): Renamed from skkdic-filename. Referrers changed. (iso-2022-7bit-short): Add safe-charsets property. (skkdic-convert-postfix): Search Japanese chou-on character in addition to Hiragana character. @@ -20709,4 +20709,3 @@ See ChangeLog.8 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index 162da1f4815..472615039bb 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -1632,7 +1632,7 @@ We return the item-widget corresponding to the item at point." (defun allout-redecorate-item (item-widget) "Resituate ITEM-WIDGET decorations, disregarding context. -Use this to redecorate only the item, when you know that it's +Use this to redecorate only the item, when you know that its situation with respect to siblings, parent, and offspring is unchanged from its last decoration. Use `allout-decorate-item-and-context' instead to reassess and adjust diff --git a/lisp/allout.el b/lisp/allout.el index 18cc3c80dc6..6b1542cd3f8 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -5473,7 +5473,7 @@ header and body. The elements of that list are: "invalid format" format)))) (list depth prefix strings)) result)) - ;; Reasses format, if any: + ;; Reassess format, if any: (if (and format (listp format)) (cond ((= new-depth depth) (setq format (cons (1+ (car format)) diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el index 63991c54e7f..718fdf58b11 100644 --- a/lisp/cedet/ede/makefile-edit.el +++ b/lisp/cedet/ede/makefile-edit.el @@ -71,7 +71,7 @@ (end-of-line) (= (preceding-char) ?\\))) -;;; Programatic editing of a Makefile +;;; Programmatic editing of a Makefile ;; (defun makefile-move-to-macro (macro &optional next) "Move to the definition of MACRO. Return t if found. diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el index 4d68e1544a7..1c9b9bea0f4 100644 --- a/lisp/cedet/ede/proj-misc.el +++ b/lisp/cedet/ede/proj-misc.el @@ -50,7 +50,7 @@ All listed sources are included in the distribution.") (defvar ede-misc-source (ede-sourcecode "ede-misc-source" - :name "Miscelaneous" + :name "Miscellaneous" :sourcepattern ".*") "Miscellaneous field definition.") diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el index 1dfbb72d416..036a6f38724 100644 --- a/lisp/cedet/semantic/bovine.el +++ b/lisp/cedet/semantic/bovine.el @@ -240,7 +240,7 @@ list of semantic tokens found." matchlist nil) ;;generate exit condition (if (not end) (setq out nil))) - ;; Nothin? + ;; Nothing? )) (setq result (if (eq s starting-stream) diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 1076402ac91..af293a10348 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -1092,7 +1092,7 @@ Optional argument STAR and REF indicate the number of * and & in the typedef." ;; `throws' as a common name for things that toss ;; exceptions about. :throws (nth 5 tokenpart) - ;; Reemtrant is a C++ thingy. Add it here + ;; Reentrant is a C++ thingy. Add it here :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t) ;; A function post-const is funky. Try stuff :methodconst-flag (if (member "const" (nth 6 tokenpart)) t) diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 34718d1fdd2..74c4d8e3788 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -862,7 +862,7 @@ instead." (let ((tab (car (car tmp))) (tags (cdr (car tmp)))) (dolist (T tags) - ;; Normilzation gives specialty database tables a chance + ;; Normalization gives specialty database tables a chance ;; to convert into a more stable tag format. (let* ((norm (semanticdb-normalize-one-tag tab T)) (ntab (car norm)) diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index e7e1da55ce3..35d9ff04a2a 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -96,7 +96,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil." (defcustom semantic-imenu-bucketize-type-members t "*Non-nil if members of a type should be grouped into buckets. A nil value means to keep them in the same order. -Overriden to nil if `semantic-imenu-bucketize-file' is nil." +Overridden to nil if `semantic-imenu-bucketize-file' is nil." :group 'semantic-imenu :type 'boolean) (make-variable-buffer-local 'semantic-imenu-bucketize-type-members) diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index 84964a9e8b4..cccfe099e74 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -255,7 +255,7 @@ ST can be a class, or an object." (let ((c (oref st code))) (srecode-push st) (srecode-insert-code-stream c dictionary)) - ;; Poping the stack is protected + ;; Popping the stack is protected. (srecode-pop st))) (defun srecode-insert-code-stream (code dictionary) diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index 5a407aad135..0a99b7869e8 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el @@ -483,7 +483,7 @@ section or ? for an ask variable." (if (> start (point)) ;; If our starting point is after the found point, that - ;; means we are not inside the macro. Retur nil. + ;; means we are not inside the macro. Return nil. nil ;; We are inside the macro, extract the text so far. (let* ((macroend (match-beginning 0)) diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 7b98ade2422..0630f5f4e4e 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -527,7 +527,7 @@ ;; However, don't actually bother calling `ignore'. `(prog1 nil . ,(mapcar 'byte-optimize-form (cdr form)))) - ;; Neeeded as long as we run byte-optimize-form after cconv. + ;; Needed as long as we run byte-optimize-form after cconv. ((eq fn 'internal-make-closure) form) ((byte-code-function-p fn) diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index cad7c8419b2..95d93eb113d 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -759,7 +759,7 @@ Possible return values: (indirect-function 'smie-op-left) halfsexp)) -;;; Miscellanous commands using the precedence parser. +;;; Miscellaneous commands using the precedence parser. (defun smie-backward-sexp-command (&optional n) "Move backward through N logical elements." diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index 75c9a01323d..e16970c6804 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -321,7 +321,7 @@ This mode is usually not used directly; instead, other major modes are derived from it, using `define-derived-mode'. In this major mode, the buffer is divided into multiple columns, -which are labelled using the header line. Each non-empty line +which are labeled using the header line. Each non-empty line belongs to one \"entry\", and the entries can be sorted according to their column values. diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el index 1b245ec2e33..7ae15307a55 100644 --- a/lisp/erc/erc-notify.el +++ b/lisp/erc/erc-notify.el @@ -88,7 +88,7 @@ strings." (defun erc-notify-install-message-catalogs () (erc-define-catalog 'english - '((notify_current . "Notificated people online: %l") + '((notify_current . "Notified people online: %l") (notify_list . "Current notify list: %l") (notify_on . "Detected %n on IRC network %m") (notify_off . "%n has left IRC network %m")))) @@ -250,4 +250,3 @@ with args, toggle notify status of people." ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/generic-x.el b/lisp/generic-x.el index 2c00229c76e..b0ef0439404 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -1446,7 +1446,7 @@ like an INI file. You can add this hook to `find-file-hook'." "REGDB_STRING" "REGDB_UNINSTALL_NAME" "REMOTE_DRIVE" - "REMOVALE_DRIVE" + "REMOVEABLE_DRIVE" "REPLACE_ITEM" "REPLACE" "RESET" diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index f1a2ed43e26..17af1a38333 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el @@ -430,7 +430,7 @@ inheritance." regexp list-topic topic-level) "List all newsgroups with unread articles of level LEVEL or lower. Use the `gnus-group-topics' to sort the groups. -If PREDICTE is a function, list groups that the function returns non-nil; +If PREDICATE is a function, list groups that the function returns non-nil; if it is t, list groups that have no unread articles. If LOWEST is non-nil, list all newsgroups of level LOWEST or higher." (set-buffer gnus-group-buffer) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 30223e69ae0..f3e7caab174 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -638,7 +638,7 @@ These properties are determined by the Image mode variables `image-transform-resize' and `image-transform-rotation'. The return value is suitable for appending to an image spec. -Recaling and rotation properties only take effect if Emacs is +Rescaling and rotation properties only take effect if Emacs is compiled with ImageMagick support." (when (or image-transform-resize (not (equal image-transform-rotation 0.0))) diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index cccf65b8051..efb910a3ef6 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -958,7 +958,7 @@ the current buffer." (insert "\n ---<fallback to the default of the default fontset>---") (put-text-property (line-beginning-position) (point) 'face 'highlight))) (if (and start1 end2) - ;; Reoder the printed information to match with the font + ;; Reorder the printed information to match with the font ;; searching strategy; i.e. FONTSET, the default fontset, ;; default of FONTSET, default of the default fontset. (transpose-regions start1 end1 start2 end2)) diff --git a/lisp/language/european.el b/lisp/language/european.el index 6dfc03d0f5f..5bdec6dec7b 100644 --- a/lisp/language/european.el +++ b/lisp/language/european.el @@ -146,8 +146,8 @@ These languages are supported with the Latin-3 (ISO-8859-3) character set: (input-method . "latin-4-postfix") (documentation . "\ These languages are supported with the Latin-4 (ISO-8859-4) character set: - Danish, English, Estonian, Finnish, German, Greenlandic, Lappish, - Latvian, Lithuanian, and Norwegian.")) + Danish, English, Estonian, Finnish, German, Greenlandic, Latvian, + Lithuanian, Norwegian, and Sami.")) '("European")) @@ -226,7 +226,7 @@ See also the Turkish environment.")) "ISO 2022 based 8-bit encoding for Latin-8 (MIME:ISO-8859-14)." :coding-type 'charset ;; `W' for `Welsh', since `C' for `Celtic' is taken. - :mnemonic ?W + :mnemonic ?W :charset-list '(iso-8859-14) :mime-charset 'iso-8859-14) @@ -610,7 +610,7 @@ method and applying Turkish case rules for the characters i, I, $(D)E(B, $(D* (define-coding-system 'mac-roman "Mac Roman Encoding (MIME:MACINTOSH)." :coding-type 'charset - :mnemonic ?M + :mnemonic ?M :charset-list '(mac-roman) :mime-charset 'macintosh) diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el index b9c250fd700..25a10633a28 100644 --- a/lisp/language/romanian.el +++ b/lisp/language/romanian.el @@ -35,7 +35,7 @@ (unibyte-display . iso-8859-2) (tutorial . "TUTORIAL.ro") (sample-text . "Bună ziua, bine ați venit!") - (documentation . "Rmoanian environment using Latin-2 encoding. + (documentation . "Romanian environment using Latin-2 encoding. An environment for generic Latin-10 encoding is also available.")) '("European")) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 0ce53fcb9a3..8847c16bfb4 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -27789,7 +27789,7 @@ This mode is usually not used directly; instead, other major modes are derived from it, using `define-derived-mode'. In this major mode, the buffer is divided into multiple columns, -which are labelled using the header line. Each non-empty line +which are labeled using the header line. Each non-empty line belongs to one \"entry\", and the entries can be sorted according to their column values. diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index c3a7da41823..12826001d86 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el @@ -1961,7 +1961,7 @@ place. It affects how `mail-extract-address-components' works." ("gw" "Guinea-Bissau") ("gy" "Guyana") ("hk" "Hong Kong") - ("hm" "Heard Island and Mcdonald Islands") + ("hm" "Heard Island and McDonald Islands") ("hn" "Honduras") ("hr" "Croatia" "Croatia (Hrvatska)") ("ht" "Haiti") diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el index 882a8771e28..eceb7a5fe3a 100644 --- a/lisp/mh-e/mh-comp.el +++ b/lisp/mh-e/mh-comp.el @@ -504,7 +504,7 @@ See also `mh-compose-forward-as-mime-flag', folder msg) ;; Was inserted before us, move to end of file to preserve order (goto-char (point-max))))))) - ;; Postition just before forwarded message + ;; Position just before forwarded message. (if (re-search-forward "^------- Forwarded Message" nil t) (forward-line -1) (goto-char (mh-mail-header-end)) diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 458993ca8f1..b614cdb7991 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -2478,7 +2478,7 @@ of citations entirely, choose \"None\"." "Original-NNTP-" ; mail to news "Original-Path:" ; mail to news "Original-Received:" ; mail to news - "Original-Recipt:" ; RFC 2298 + "Original-Recipient:" ; RFC 2298 "Original-To:" ; mail to news "Original-X-" ; mail to news "Origination-Client:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 10a1fa5afc5..89948a2c81a 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -389,7 +389,7 @@ Defaults to the value of `browse-url-epiphany-arguments' at the time :type '(repeat (string :tag "Argument")) :group 'browse-url) -;; GNOME means of invoking either Mozilla or Netrape. +;; GNOME means of invoking either Mozilla or Netscape. (defvar browse-url-gnome-moz-program "gnome-moz-remote") (defcustom browse-url-gnome-moz-arguments '() diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el index 9fa5eb32d43..88deef46862 100644 --- a/lisp/net/secrets.el +++ b/lisp/net/secrets.el @@ -431,7 +431,7 @@ returned, and it will be stored in `secrets-session-path'." (secrets-get-collections))) (defun secrets-collection-path (collection) - "Return the object path of collection labelled COLLECTION. + "Return the object path of collection labeled COLLECTION. If COLLECTION is nil, return the session collection path. If there is no such COLLECTION, return nil." (or @@ -454,7 +454,7 @@ If there is no such COLLECTION, return nil." (throw 'collection-found collection-path)))))) (defun secrets-create-collection (collection) - "Create collection labelled COLLECTION if it doesn't exist. + "Create collection labeled COLLECTION if it doesn't exist. Return the D-Bus object path for collection." (let ((collection-path (secrets-collection-path collection))) ;; Create the collection. @@ -480,7 +480,7 @@ For the time being, only the alias \"default\" is supported." "Label")) (defun secrets-set-alias (collection alias) - "Set ALIAS as alias of collection labelled COLLECTION. + "Set ALIAS as alias of collection labeled COLLECTION. For the time being, only the alias \"default\" is supported." (let ((collection-path (secrets-collection-path collection))) (unless (secrets-empty-path collection-path) @@ -497,7 +497,7 @@ For the time being, only the alias \"default\" is supported." alias :object-path secrets-empty-path)) (defun secrets-unlock-collection (collection) - "Unlock collection labelled COLLECTION. + "Unlock collection labeled COLLECTION. If successful, return the object path of the collection." (let ((collection-path (secrets-collection-path collection))) (unless (secrets-empty-path collection-path) @@ -509,7 +509,7 @@ If successful, return the object path of the collection." collection-path)) (defun secrets-delete-collection (collection) - "Delete collection labelled COLLECTION." + "Delete collection labeled COLLECTION." (let ((collection-path (secrets-collection-path collection))) (unless (secrets-empty-path collection-path) (secrets-prompt @@ -636,7 +636,7 @@ The object path of the created item is returned." (car result))))) (defun secrets-item-path (collection item) - "Return the object path of item labelled ITEM in COLLECTION. + "Return the object path of item labeled ITEM in COLLECTION. If there is no such item, return nil." (let ((collection-path (secrets-unlock-collection collection))) (catch 'item-found @@ -645,7 +645,7 @@ If there is no such item, return nil." (throw 'item-found item-path)))))) (defun secrets-get-secret (collection item) - "Return the secret of item labelled ITEM in COLLECTION. + "Return the secret of item labeled ITEM in COLLECTION. If there is no such item, return nil." (let ((item-path (secrets-item-path collection item))) (unless (secrets-empty-path item-path) @@ -656,7 +656,7 @@ If there is no such item, return nil." "GetSecret" :object-path secrets-session-path)))))) (defun secrets-get-attributes (collection item) - "Return the lookup attributes of item labelled ITEM in COLLECTION. + "Return the lookup attributes of item labeled ITEM in COLLECTION. If there is no such item, or the item has no attributes, return nil." (unless (stringp collection) (setq collection "default")) (let ((item-path (secrets-item-path collection item))) @@ -669,7 +669,7 @@ If there is no such item, or the item has no attributes, return nil." secrets-interface-item "Attributes"))))) (defun secrets-get-attribute (collection item attribute) - "Return the value of ATTRIBUTE of item labelled ITEM in COLLECTION. + "Return the value of ATTRIBUTE of item labeled ITEM in COLLECTION. If there is no such item, or the item doesn't own this attribute, return nil." (cdr (assoc attribute (secrets-get-attributes collection item)))) diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 24361e3667a..c7e78cb282a 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -1327,7 +1327,7 @@ Here is the current list of valid syntactic element symbols: statement-case-open -- The first line in a case block starting with brace. substatement -- The first line after an if/while/for/do/else. substatement-open -- The brace that opens a substatement block. - substatement-label -- Labelled line after an if/while/for/do/else. + substatement-label -- Labeled line after an if/while/for/do/else. case-label -- A \"case\" or \"default\" label. access-label -- C++ private/protected/public access label. label -- Any ordinary label. @@ -1625,7 +1625,7 @@ names).")) (defvar c-macro-with-semi-re nil ;; Regular expression which matches a (#define'd) symbol whose expansion ;; ends with a semicolon. - ;; + ;; ;; This variable should be set by `c-make-macros-with-semi-re' rather than ;; directly. ) @@ -1651,7 +1651,7 @@ names).")) (t (error "c-make-macro-with-semi-re: invalid \ c-macro-names-with-semicolon: %s" c-macro-names-with-semicolon)))))) - + (defvar c-macro-names-with-semicolon '("Q_OBJECT" "Q_PROPERTY" "Q_DECLARE" "Q_ENUMS") "List of #defined symbols whose expansion ends with a semicolon. diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index c027b2b7454..597d84619ab 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -5037,7 +5037,7 @@ killed after process termination." (when gen-func (setq error-msg "EMPTY RULES" tree (ebnf-eliminate-empty-rules tree)) - (setq error-msg "OPTMIZE" + (setq error-msg "OPTIMIZE" tree (ebnf-optimize tree)) (setq error-msg "DIMENSIONS" tree (ebnf-dimensions tree)) diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index fd3d42685f0..cb0b02ff350 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -1462,7 +1462,7 @@ Return point or nil." (defun fortran-beginning-do () "Search backwards for first unmatched DO [WHILE]. -Return point or nil. Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)." +Return point or nil. Ignores labeled DO loops (ie DO 10 ... 10 CONTINUE)." (let ((case-fold-search t) (dostart-re "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]")) (if (save-excursion @@ -1482,7 +1482,7 @@ Return point or nil. Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)." (skip-chars-forward " \t0-9") (cond ((looking-at dostart-re) (setq count (1- count))) - ;; Note labelled loop ends not considered. + ;; Note labeled loop ends not considered. ((looking-at "end[ \t]*do\\b") (setq count (1+ count))))) (and (zerop count) diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 2f06afaa5ef..a8ff759717e 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -3117,7 +3117,7 @@ STRING are replaced by `-' and substrings are converted to lower case." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Menues +;;; Menus ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 3e707ff3832..31609232884 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -2100,7 +2100,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )." (if (= index 0) ;; If the shown files variable has extra directories, then ;; it is our responsibility to redraw them all - ;; Luckilly, the nature of inserting items into this list means + ;; Luckily, the nature of inserting items into this list means ;; that by reversing it, we can easilly go in the right order (let ((sf (cdr (reverse speedbar-shown-directories)))) (setq speedbar-shown-directories diff --git a/lisp/startup.el b/lisp/startup.el index 842548577c5..877ba1987f6 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1132,7 +1132,7 @@ the `--debug-init' option to view a complete error backtrace." (eq orig-enable-multibyte (default-value 'enable-multibyte-characters))) ;; Init file changed to unibyte. Reset existing multibyte - ;; buffers (probably *scratch*, *Messages*, *Minibuff-0*). + ;; buffers (probably *scratch*, *Messages*, *Minibuf-0*). ;; Arguably this should only be done if they're free of ;; multibyte characters. (mapc (lambda (buffer) diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 2325d7b26ff..be14e90e000 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -2437,7 +2437,7 @@ in the coord." point-list)) ;; artist-save-chars-under-point-list -;; Remebers the chars that were there before we did draw the line. +;; Remembers the chars that were there before we did draw the line. ;; Returns point-list. ;; (defun artist-save-chars-under-point-list (point-list) diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 741b6cd904c..4459ac10098 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -3941,7 +3941,7 @@ If `bibtex-files' is non-nil, search all these files. Otherwise the search is limited to the current buffer. Return position of entry if CROSSREF-KEY is found or nil otherwise. If CROSSREF-KEY is in the same buffer like current entry but before it -an error is signaled. If NOERRER is non-nil this error is suppressed. +an error is signaled. If NOERROR is non-nil this error is suppressed. Optional arg PNT is the position of the referencing entry. It defaults to position of point. If optional arg SPLIT is non-nil, split window so that both the referencing and the crossrefed entry are displayed. diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index ccdab49750b..6a3a7bef244 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -139,7 +139,7 @@ No active TAGS table is required." (set (make-local-variable 'TeX-master) master) (erase-buffer) (insert " MULTIPLE LABELS IN CURRENT DOCUMENT:\n") - (insert + (insert " Move point to label and type `r' to run a query-replace on the label\n" " and its references. Type `q' to exit this buffer.\n\n") (insert " LABEL FILE\n") @@ -190,15 +190,15 @@ This command should be used with care, in particular in multifile documents. You should not use it if another document refers to this one with the `xr' package." (interactive) - ;; Resan the entire document + ;; Rescan the entire document (reftex-access-scan-info 1) ;; Get some insurance (if (and (reftex-is-multi) (not (yes-or-no-p "Replacing all simple labels in multiple files is risky. Continue? "))) (error "Abort")) ;; Make the translation list - (let* ((re-core (concat "\\(" - (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|") + (let* ((re-core (concat "\\(" + (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|") "\\)")) (label-re (concat "\\`" re-core "\\([0-9]+\\)\\'")) (search-re (concat "[{,]\\(" re-core "\\([0-9]+\\)\\)[,}]")) @@ -231,11 +231,11 @@ one with the `xr' package." (reftex-save-all-document-buffers) ;; First test to check for erros - (setq n (reftex-translate + (setq n (reftex-translate files search-re translate-alist error-fmt 'test)) ;; Now the real thing. - (if (yes-or-no-p + (if (yes-or-no-p (format "Replace %d items at %d places in %d files? " (length translate-alist) n (length files))) (progn @@ -253,9 +253,9 @@ one with the `xr' package." (defun reftex-translate (files search-re translate-alist error-fmt test) ;; In FILES, look for SEARCH-RE and replace match 1 of it with - ;; its association in TRANSLATE-ALSIT. + ;; its association in TRANSLATE-ALSIT. ;; If we do not find an association and TEST is non-nil, query - ;; to ignore the problematic string. + ;; to ignore the problematic string. ;; If TEST is nil, it is ignored without query. ;; Return the number of replacements. (let ((n 0) file label match-data buf macro pos cell) @@ -281,7 +281,7 @@ one with the `xr' package." (or (looking-at "\\\\ref") (looking-at "\\\\[a-zA-Z]*ref\\(range\\)?[^a-zA-Z]") (looking-at "\\\\ref[a-zA-Z]*[^a-zA-Z]") - (looking-at (format + (looking-at (format reftex-find-label-regexp-format (regexp-quote label))))) ;; OK, we should replace it. @@ -351,7 +351,7 @@ Also checks if buffers visiting the files are in read-only mode." (defun reftex-isearch-wrap-function () (if (not isearch-word) - (switch-to-buffer + (switch-to-buffer (funcall isearch-next-buffer-function (current-buffer) t))) (goto-char (if isearch-forward (point-min) (point-max)))) @@ -435,7 +435,7 @@ With no argument, this command toggles `reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off." (interactive "P") (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode)) - (setq reftex-isearch-minor-mode + (setq reftex-isearch-minor-mode (not (or (and (null arg) reftex-isearch-minor-mode) (<= (prefix-numeric-value arg) 0)))) (unless (eq reftex-isearch-minor-mode old-reftex-isearch-minor-mode) @@ -471,7 +471,7 @@ With no argument, this command toggles ;; Force modeline redisplay. (set-buffer-modified-p (buffer-modified-p)))) -(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil +(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil 'reftex-isearch-minor-mode) ;;; reftex-global.el ends here diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index eeaa2cfa927..787a8b7c0f1 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -81,7 +81,7 @@ that Ediff doesn't know about.") ;; so that `kill-all-local-variables' (called by major-mode setting ;; commands) won't destroy Ediff control variables. ;; -;; Plagiarised from `emerge-defvar-local' for XEmacs. +;; Plagiarized from `emerge-defvar-local' for XEmacs. (defmacro ediff-defvar-local (var value doc) "Defines VAR as a local variable." (declare (indent defun)) |