aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2013-11-04 23:44:14 -0800
committerPaul Eggert2013-11-04 23:44:14 -0800
commita67c4ae05909874c97f86b11dcb8ddc88b3e960c (patch)
tree24080844d67cc6e7ba3fa0f043f56612fa679edf /lisp
parentdf5b49306e8e82e2f18ed3243700c11ca7835750 (diff)
downloademacs-a67c4ae05909874c97f86b11dcb8ddc88b3e960c.tar.gz
emacs-a67c4ae05909874c97f86b11dcb8ddc88b3e960c.zip
Spelling fixes.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/composite.el4
-rw-r--r--lisp/emacs-lisp/ert.el2
-rw-r--r--lisp/progmodes/verilog-mode.el4
3 files changed, 5 insertions, 5 deletions
diff --git a/lisp/composite.el b/lisp/composite.el
index e0585f80880..f2f4437cadb 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -630,14 +630,14 @@ All non-spacing characters have this function in
630 ((and (= class 0) 630 ((and (= class 0)
631 (eq (get-char-code-property (lglyph-char glyph) 631 (eq (get-char-code-property (lglyph-char glyph)
632 'general-category) 'Me)) 632 'general-category) 'Me))
633 ;; Artificially layouting glyphs in an enclosing 633 ;; Artificially laying out glyphs in an enclosing
634 ;; mark is difficult. All we can do is to adjust 634 ;; mark is difficult. All we can do is to adjust
635 ;; the x-offset and width of the base glyph to 635 ;; the x-offset and width of the base glyph to
636 ;; align it at the center of the glyph of the 636 ;; align it at the center of the glyph of the
637 ;; enclosing mark hoping that the enclosing mark 637 ;; enclosing mark hoping that the enclosing mark
638 ;; is big enough. We also have to adjust the 638 ;; is big enough. We also have to adjust the
639 ;; x-offset and width of the mark ifself properly 639 ;; x-offset and width of the mark ifself properly
640 ;; depending on how the glyph is designed 640 ;; depending on how the glyph is designed.
641 641
642 ;; (non-spacing or not). For instance, when we 642 ;; (non-spacing or not). For instance, when we
643 ;; have these glyphs: 643 ;; have these glyphs:
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index ed7633e2795..a131f48c488 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -436,7 +436,7 @@ failed."
436 436
437(cl-defmacro ert--skip-unless (form) 437(cl-defmacro ert--skip-unless (form)
438 "Evaluate FORM. If it returns nil, skip the current test. 438 "Evaluate FORM. If it returns nil, skip the current test.
439Errors during evaluation are catched and handled like nil." 439Errors during evaluation are caught and handled like nil."
440 (declare (debug t)) 440 (declare (debug t))
441 (ert--expand-should `(skip-unless ,form) form 441 (ert--expand-should `(skip-unless ,form) form
442 (lambda (inner-form form-description-form _value-var) 442 (lambda (inner-form form-description-form _value-var)
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 7044943d5cb..e67639b671b 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -5460,7 +5460,7 @@ Return a list of two elements: (INDENT-TYPE INDENT-LEVEL)."
5460 (catch 'continue 5460 (catch 'continue
5461 (cond 5461 (cond
5462 ((equal (char-after) ?\{) 5462 ((equal (char-after) ?\{)
5463 ;; block type returned based on outer contraint { or inner 5463 ;; block type returned based on outer constraint { or inner
5464 (if (verilog-at-constraint-p) 5464 (if (verilog-at-constraint-p)
5465 (cond (inconstraint (throw 'nesting 'constraint)) 5465 (cond (inconstraint (throw 'nesting 'constraint))
5466 (t (throw 'nesting 'statement))))) 5466 (t (throw 'nesting 'statement)))))
@@ -11101,7 +11101,7 @@ Templates:
11101 it is a good idea to do this for all connections in a template, 11101 it is a good idea to do this for all connections in a template,
11102 as then they will work for any width signal, and with AUTOWIRE. 11102 as then they will work for any width signal, and with AUTOWIRE.
11103 See PTL_BUS becoming PTL_BUSNEW below. 11103 See PTL_BUS becoming PTL_BUSNEW below.
11104 11104
11105 Inside a template, a [] in a connection name (with nothing else inside 11105 Inside a template, a [] in a connection name (with nothing else inside
11106 the brackets) will be replaced by the same bus subscript as it is being 11106 the brackets) will be replaced by the same bus subscript as it is being
11107 connected to, or the [] will be removed if it is a single bit signal. 11107 connected to, or the [] will be removed if it is a single bit signal.