aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2015-11-29 21:50:59 -0800
committerPaul Eggert2015-11-29 21:52:17 -0800
commit36649e0150fa7be91040b9d74009ccc085f8a363 (patch)
treedc4b50ef757c194423c72352b8a21e8936441713 /lisp
parent50b8c55617931e64c666eec99c6c7e6b4fdb24ea (diff)
downloademacs-36649e0150fa7be91040b9d74009ccc085f8a363.tar.gz
emacs-36649e0150fa7be91040b9d74009ccc085f8a363.zip
Spelling and grammar fixes
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/bytecomp.el2
-rw-r--r--lisp/emacs-lisp/smie.el2
-rw-r--r--lisp/progmodes/cc-bytecomp.el2
-rw-r--r--lisp/progmodes/cc-engine.el2
-rw-r--r--lisp/replace.el4
5 files changed, 6 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 14173494eeb..b5b618e87d7 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2366,7 +2366,7 @@ list that represents a doc string reference.
2366 hist-new prov-cons) 2366 hist-new prov-cons)
2367 (apply 'require args) 2367 (apply 'require args)
2368 2368
2369 ;; Record the functions defined by the require in `byte-compille-new-defuns'. 2369 ;; Record the functions defined by the require in `byte-compile-new-defuns'.
2370 (setq hist-new load-history) 2370 (setq hist-new load-history)
2371 (setq prov-cons (cons 'provide (car args))) 2371 (setq prov-cons (cons 'provide (car args)))
2372 (while (and hist-new 2372 (while (and hist-new
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 197861fbae2..25ea4bbb588 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -811,7 +811,7 @@ Possible return values:
811 (indirect-function smie-backward-token-function) 811 (indirect-function smie-backward-token-function)
812 (lambda (n) 812 (lambda (n)
813 (if (bobp) 813 (if (bobp)
814 ;; Arguably backward-sexp hould signal this error for us. 814 ;; Arguably backward-sexp should signal this error for us.
815 (signal 'scan-error 815 (signal 'scan-error
816 (list "Beginning of buffer" (point) (point))) 816 (list "Beginning of buffer" (point) (point)))
817 (backward-sexp n))) 817 (backward-sexp n)))
diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 1470b080264..d3b4db74c16 100644
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -315,7 +315,7 @@ CONDITION should not be quoted."
315 '(progn))) 315 '(progn)))
316 316
317(defmacro cc-conditional-require-after-load (cc-part file condition) 317(defmacro cc-conditional-require-after-load (cc-part file condition)
318 "If the CONDITION is satified at compile time, (i) force the 318 "If the CONDITION is satisfied at compile time, (i) force the
319file CC-PART.el in the current directory to be loaded at compile 319file CC-PART.el in the current directory to be loaded at compile
320time, (ii) generate an `eval-after-load' form to load CC-PART.el 320time, (ii) generate an `eval-after-load' form to load CC-PART.el
321after the loading of FILE. 321after the loading of FILE.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 9e9bee8752f..acc2eddff73 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8065,7 +8065,7 @@ brace.
8065Note that this function might do hidden buffer changes. See the 8065Note that this function might do hidden buffer changes. See the
8066comment at the start of cc-engine.el for more info." 8066comment at the start of cc-engine.el for more info."
8067 ;; Note to maintainers: this function consumes a great mass of CPU cycles. 8067 ;; Note to maintainers: this function consumes a great mass of CPU cycles.
8068 ;; It's use should thus be minimised as far as possible. 8068 ;; Its use should thus be minimized as far as possible.
8069 (let ((paren-state (c-parse-state))) 8069 (let ((paren-state (c-parse-state)))
8070 (or (not (c-most-enclosing-brace paren-state)) 8070 (or (not (c-most-enclosing-brace paren-state))
8071 (c-search-uplist-for-classkey paren-state)))) 8071 (c-search-uplist-for-classkey paren-state))))
diff --git a/lisp/replace.el b/lisp/replace.el
index 76f8d312c7c..21a830da9ca 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -318,7 +318,7 @@ to be replaced will match a sequence of whitespace chars defined by the
318regexp in `search-whitespace-regexp'. 318regexp in `search-whitespace-regexp'.
319 319
320If `replace-character-fold' is non-nil, matching uses character folding, 320If `replace-character-fold' is non-nil, matching uses character folding,
321i.e. it ignores diacriticals and other differences between equivalent 321i.e. it ignores diacritics and other differences between equivalent
322character strings. 322character strings.
323 323
324Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace 324Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
@@ -563,7 +563,7 @@ to be replaced will match a sequence of whitespace chars defined by the
563regexp in `search-whitespace-regexp'. 563regexp in `search-whitespace-regexp'.
564 564
565If `replace-character-fold' is non-nil, matching uses character folding, 565If `replace-character-fold' is non-nil, matching uses character folding,
566i.e. it ignores diacriticals and other differences between equivalent 566i.e. it ignores diacritics and other differences between equivalent
567character strings. 567character strings.
568 568
569Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace 569Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace