aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-08-16 23:52:30 -0700
committerPaul Eggert2015-08-16 23:53:04 -0700
commitabd838ef8bab125f4360b8618ffe742e1e045625 (patch)
tree2a616ce1f98df4cdf5923496a5981fdcd0e6b565
parent9a6d63fe2a6f8e46af83beefa48c18a05a47497b (diff)
downloademacs-abd838ef8bab125f4360b8618ffe742e1e045625.tar.gz
emacs-abd838ef8bab125f4360b8618ffe742e1e045625.zip
Spelling fixes
-rw-r--r--lisp/mail/rmail.el4
-rw-r--r--lisp/progmodes/elisp-mode.el8
-rw-r--r--test/automated/elisp-mode-tests.el14
3 files changed, 13 insertions, 13 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 1ccf5e2aea6..90a140b272c 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4652,7 +4652,7 @@ Argument MIME is non-nil if this is a mime message."
4652 4652
4653 (when (and (null decrypts) 4653 (when (and (null decrypts)
4654 mime mime-disabled) 4654 mime mime-disabled)
4655 ;; Re-enable mime processinjg 4655 ;; Re-enable mime processing.
4656 (rmail-mime) 4656 (rmail-mime)
4657 ;; Find each Show button and show that part. 4657 ;; Find each Show button and show that part.
4658 (while (search-forward " Show " nil t) 4658 (while (search-forward " Show " nil t)
@@ -4672,7 +4672,7 @@ Argument MIME is non-nil if this is a mime message."
4672 4672
4673 (unless decrypts 4673 (unless decrypts
4674 (error "Nothing to decrypt"))))) 4674 (error "Nothing to decrypt")))))
4675 4675
4676 4676
4677;;;; Desktop support 4677;;;; Desktop support
4678 4678
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 8392df2a6b9..6ad803d9be8 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -604,7 +604,7 @@ It can be quoted, or be inside a quoted form."
604 (`apropos 604 (`apropos
605 (elisp--xref-find-apropos id)))) 605 (elisp--xref-find-apropos id))))
606 606
607;; WORKAROUND: This is nominally a constant, but the text properities 607;; WORKAROUND: This is nominally a constant, but the text properties
608;; are not preserved thru dump if use defconst. See bug#21237. 608;; are not preserved thru dump if use defconst. See bug#21237.
609(defvar elisp--xref-format 609(defvar elisp--xref-format
610 (let ((str "(%s %s)")) 610 (let ((str "(%s %s)"))
@@ -612,7 +612,7 @@ It can be quoted, or be inside a quoted form."
612 (put-text-property 4 6 'face 'font-lock-function-name-face str) 612 (put-text-property 4 6 'face 'font-lock-function-name-face str)
613 str)) 613 str))
614 614
615;; WORKAROUND: This is nominally a constant, but the text properities 615;; WORKAROUND: This is nominally a constant, but the text properties
616;; are not preserved thru dump if use defconst. See bug#21237. 616;; are not preserved thru dump if use defconst. See bug#21237.
617(defvar elisp--xref-format-extra 617(defvar elisp--xref-format-extra
618 (let ((str "(%s %s %s)")) 618 (let ((str "(%s %s %s)"))
@@ -693,12 +693,12 @@ otherwise build the summary from TYPE and SYMBOL."
693 ;; specializers. 693 ;; specializers.
694 ;; 694 ;;
695 ;; If the default method is declared by the cl-defgeneric 695 ;; If the default method is declared by the cl-defgeneric
696 ;; declaration, it will have the same location as teh 696 ;; declaration, it will have the same location as the
697 ;; cl-defgeneric, so we want to exclude it from the 697 ;; cl-defgeneric, so we want to exclude it from the
698 ;; result. In this case, it will have a null doc 698 ;; result. In this case, it will have a null doc
699 ;; string. User declarations of default methods may also 699 ;; string. User declarations of default methods may also
700 ;; have null doc strings, but we hope that is 700 ;; have null doc strings, but we hope that is
701 ;; rare. Perhaps this hueristic will discourage that. 701 ;; rare. Perhaps this heuristic will discourage that.
702 (dolist (method (cl--generic-method-table generic)) 702 (dolist (method (cl--generic-method-table generic))
703 (let* ((info (cl--generic-method-info method));; qual-string combined-args doconly 703 (let* ((info (cl--generic-method-info method));; qual-string combined-args doconly
704 (specializers (cl--generic-method-specializers method)) 704 (specializers (cl--generic-method-specializers method))
diff --git a/test/automated/elisp-mode-tests.el b/test/automated/elisp-mode-tests.el
index 47212e919c6..64b3f665a03 100644
--- a/test/automated/elisp-mode-tests.el
+++ b/test/automated/elisp-mode-tests.el
@@ -117,7 +117,7 @@
117;;; xref 117;;; xref
118 118
119(defun xref-elisp-test-descr-to-target (xref) 119(defun xref-elisp-test-descr-to-target (xref)
120 "Return an appropiate `looking-at' match string for XREF." 120 "Return an appropriate `looking-at' match string for XREF."
121 (let* ((loc (xref-item-location xref)) 121 (let* ((loc (xref-item-location xref))
122 (type (or (xref-elisp-location-type loc) 122 (type (or (xref-elisp-location-type loc)
123 'defun))) 123 'defun)))
@@ -176,11 +176,11 @@
176 ))) 176 )))
177 177
178 178
179(defun xref-elisp-test-run (xrefs expecteds) 179(defun xref-elisp-test-run (xrefs expected-xrefs)
180 (should (= (length xrefs) (length expecteds))) 180 (should (= (length xrefs) (length expected-xrefs)))
181 (while xrefs 181 (while xrefs
182 (let ((xref (pop xrefs)) 182 (let ((xref (pop xrefs))
183 (expected (pop expecteds))) 183 (expected (pop expected-xrefs)))
184 184
185 (should (equal xref 185 (should (equal xref
186 (or (when (consp expected) (car expected)) expected))) 186 (or (when (consp expected) (car expected)) expected)))
@@ -297,11 +297,11 @@ to (xref-elisp-test-descr-to-target xref)."
297 "non-default for separate-default") 297 "non-default for separate-default")
298 298
299(cl-defmethod xref-elisp-generic-implicit-generic () 299(cl-defmethod xref-elisp-generic-implicit-generic ()
300 "doc string implict-generic default" 300 "doc string implicit-generic default"
301 "default for implicit generic") 301 "default for implicit generic")
302 302
303(cl-defmethod xref-elisp-generic-implicit-generic ((this xref-elisp-root-type)) 303(cl-defmethod xref-elisp-generic-implicit-generic ((this xref-elisp-root-type))
304 "doc string implict-generic xref-elisp-root-type" 304 "doc string implicit-generic xref-elisp-root-type"
305 "non-default for implicit generic") 305 "non-default for implicit generic")
306 306
307 307
@@ -460,7 +460,7 @@ to (xref-elisp-test-descr-to-target xref)."
460;; for more comments. 460;; for more comments.
461;; 461;;
462;; IMPROVEME: return defvar instead of defun if source near starting 462;; IMPROVEME: return defvar instead of defun if source near starting
463;; point indicates the user is searching for a varible, not a 463;; point indicates the user is searching for a variable, not a
464;; function. 464;; function.
465(require 'compile) ;; not loaded by default at test time 465(require 'compile) ;; not loaded by default at test time
466(xref-elisp-deftest find-defs-defun-defvar-el 466(xref-elisp-deftest find-defs-defun-defvar-el