diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog.7 | 2 | ||||
-rw-r--r-- | lisp/ChangeLog.8 | 2 | ||||
-rw-r--r-- | lisp/bookmark.el | 2 | ||||
-rw-r--r-- | lisp/emacs-lisp/comp-cstr.el | 2 | ||||
-rw-r--r-- | lisp/emacs-lisp/map-ynp.el | 2 | ||||
-rw-r--r-- | lisp/erc/erc.el | 2 | ||||
-rw-r--r-- | lisp/language/japan-util.el | 2 | ||||
-rw-r--r-- | lisp/net/dictionary.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/cc-awk.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/cc-engine.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/elisp-mode.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/hideif.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/vhdl-mode.el | 2 | ||||
-rw-r--r-- | lisp/textmodes/bibtex.el | 8 | ||||
-rw-r--r-- | lisp/windmove.el | 2 |
15 files changed, 18 insertions, 18 deletions
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 3de3f2f1571..3dd8313c6a3 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -15867,7 +15867,7 @@ the key line of an entry. * bibtex.el (bibtex-autokey-year-use-crossref-entry): New variable - to determine if crossreferenced entry should be used for autokey + to determine if cross-referenced entry should be used for autokey generation, if year field of current entry is absent. (bibtex-generate-autokey): Use this new variable. diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index 3027463e539..39e757bfff1 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -1147,7 +1147,7 @@ (bibtex-submit-bug-report): Use bibtex-version and bibtex-maintainer-salutation. (bibtex-entry-field-alist): Made booktitle field optional for - @inproceedings entries when crossreferenced. + @inproceedings entries when cross-referenced. (bibtex-entry-field-alist): Add booktitle field to proceedings entry type (for cross referencing). Thanks to Wagner Toledo Correa for the suggestion. diff --git a/lisp/bookmark.el b/lisp/bookmark.el index ff9b8ab1388..b340d379b3f 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -27,7 +27,7 @@ ;; associates a string with a location in a certain file. Thus, you ;; can navigate your way to that location by providing the string. ;; -;; Type `M-x customize-group RET boomark RET' for user options. +;; Type `M-x customize-group RET bookmark RET' for user options. ;;; Code: diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el index 3c5578217aa..6a3f6046d1c 100644 --- a/lisp/emacs-lisp/comp-cstr.el +++ b/lisp/emacs-lisp/comp-cstr.el @@ -152,7 +152,7 @@ Integer values are handled in the `range' slot.") (defun comp-cstrs-homogeneous (cstrs) "Check if constraints CSTRS are all homogeneously negated or non-negated. Return `pos' if they are all positive, `neg' if they are all -negated or nil othewise." +negated or nil otherwise." (cl-loop for cstr in cstrs unless (comp-cstr-neg cstr) diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el index 0522b31f577..b95f11eab64 100644 --- a/lisp/emacs-lisp/map-ynp.el +++ b/lisp/emacs-lisp/map-ynp.el @@ -79,7 +79,7 @@ of the alist has the form (KEY FUNCTION HELP), where KEY is a character; FUNCTION is a function of one argument (an object from LIST); and HELP is a string. When the user presses KEY, FUNCTION is called; if it returns non-nil, the object is considered to have been \"acted upon\", -and `map-y-or-n-p' proceeeds to the next object from LIST. If +and `map-y-or-n-p' proceeds to the next object from LIST. If FUNCTION returns nil, the prompt is re-issued for the same object: this comes in handy if FUNCTION produces some display that will allow the user to make an intelligent decision whether the object in question diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 73202016ba7..e0fda41f8ed 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -2271,7 +2271,7 @@ first element is the certificate key file name, and the second element is the certificate file name itself, or t, which means that `auth-source' will be queried for the key and the certificate. Authenticating using a TLS client certificate is -also refered to as \"CertFP\" (Certificate Fingerprint) +also referred to as \"CertFP\" (Certificate Fingerprint) authentication by various IRC networks. Example usage: diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el index f3e3590645b..feb75a198e2 100644 --- a/lisp/language/japan-util.el +++ b/lisp/language/japan-util.el @@ -145,7 +145,7 @@ and HANKAKU belongs to `japanese-jisx0201-kana'.") (?p . ?p) (?q . ?q) (?r . ?r) (?s . ?s) (?t . ?t) (?u . ?u) (?v . ?v) (?w . ?w) (?x . ?x) (?y . ?y) (?z . ?z)) "Japanese JISX0208 alpha numeric character table. -Each element is of the form (ALPHA-NUMERIC . ASCII), where ALPHA-NUMERIC +Each element is of the form (ALPHANUMERIC . ASCII), where ALPHANUMERIC belongs to `japanese-jisx0208', ASCII belongs to `ascii'.") ;; Put properties 'jisx0208 and 'ascii to each Japanese alpha numeric diff --git a/lisp/net/dictionary.el b/lisp/net/dictionary.el index f33cbaf1126..0f42af0911b 100644 --- a/lisp/net/dictionary.el +++ b/lisp/net/dictionary.el @@ -86,7 +86,7 @@ You can specify here: (defcustom dictionary-port 2628 "The port of the dictionary server. -This port is propably always 2628 so there should be no need to modify it." +This port is probably always 2628 so there should be no need to modify it." :group 'dictionary :set #'dictionary-set-server-var :type 'number diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 334e82114fc..f1bc25db7f7 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -658,7 +658,7 @@ ;; prevent a repeat invocation. See elisp/lispref page "Search-based ;; Fontification". ;; - ;; This function gives invalid GAWK namepace separators (::) + ;; This function gives invalid GAWK namespace separators (::) ;; font-lock-warning-face. "Invalid" here means there are spaces, etc., ;; around a separator, or there are more than one of them in an identifier. ;; Invalid separators inside function declaration parentheses are handled diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index c305cae754e..77da98f6262 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -7422,7 +7422,7 @@ multi-line strings (but not C++, for example)." t) (save-excursion (goto-char (match-end 1)) - (if (c-in-literal) ; a psuedo closer. + (if (c-in-literal) ; a pseudo closer. t (setq saved-match-data (match-data)) (setq found t) diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 542f8ad0b1b..ef36c1f0877 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -1452,7 +1452,7 @@ Elisp eldoc behaviour. Consider variable docstrings and function signatures only, in this order. If none applies, returns nil. Changes to `eldoc-documentation-functions' and `eldoc-documentation-strategy' are _not_ reflected here. As such -it is preferrable to use ElDoc's interfaces directly.") +it is preferable to use ElDoc's interfaces directly.") (make-obsolete 'elisp-eldoc-documentation-function "use ElDoc's interfaces instead." "28.1") diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index 4a1da62c7e9..a2f5d7286ac 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -682,7 +682,7 @@ that form should be displayed.") (defconst hif-valid-token-list (mapcar 'cdr hif-token-alist)) (defconst hif-token-regexp - ;; The ordering of regexp grouping is crutial to `hif-strtok' + ;; The ordering of regexp grouping is crucial to `hif-strtok' (concat ;; hex/binary: "\\([+-]?0[xXbB]\\([[:xdigit:]']+\\)?\\.?\\([[:xdigit:]']+\\)?\\([pP]\\([+-]?[0-9]+\\)\\)?" diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index 5eeac8af3b8..3fe67fabf19 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -4700,7 +4700,7 @@ Usage: `vhdl-project-alist'. - SPECIAL MENUES: + SPECIAL MENUS: As an alternative to the speedbar, an index menu can be added (set option `vhdl-index-menu' to non-nil) or made accessible as a mouse menu (e.g. add \"(global-set-key [S-down-mouse-3] \\='imenu)\" to your start-up diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 5cece1aa3c6..d5671ce14f9 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -113,7 +113,7 @@ page-dashes Change double dashes in page field to single dash whitespace Delete whitespace at the beginning and end of fields. inherit-booktitle If entry contains a crossref field and the booktitle field is empty, set the booktitle field to the content - of the title field of the crossreferenced entry. + of the title field of the cross-referenced entry. realign Realign entries, so that field texts and perhaps equal signs (depending on the value of `bibtex-align-at-equal-sign') begin in the same column. @@ -1228,9 +1228,9 @@ See `bibtex-generate-autokey' for details." :type 'integer) (defcustom bibtex-autokey-use-crossref t - "If non-nil use fields from crossreferenced entry if necessary. + "If non-nil use fields from cross-referenced entry if necessary. If this variable is non-nil and some field has no entry, but a -valid crossref entry, the field from the crossreferenced entry is used. +valid crossref entry, the field from the cross-referenced entry is used. See `bibtex-generate-autokey' for details." :group 'bibtex-autokey :type 'boolean) @@ -2975,7 +2975,7 @@ The year part: `bibtex-autokey-year-length' digits (useful values are 2 and 4). 2. If both the year and date fields are absent, but the entry has a valid crossref field and `bibtex-autokey-use-crossref' is - non-nil, use the date or year field of the crossreferenced entry + non-nil, use the date or year field of the cross-referenced entry instead. The title part diff --git a/lisp/windmove.el b/lisp/windmove.el index f747c409431..ef970bb6c96 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -170,7 +170,7 @@ placement bugs in old versions of Emacs." (defcustom windmove-allow-all-windows nil "Whether the windmove commands are allowed to target all type of windows. -If this variable is set to non-nil, all windmove commmands will +If this variable is set to non-nil, all windmove commands will ignore the `no-other-window' parameter applied by `display-buffer-alist' or `set-window-parameter'." :type 'boolean |