summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-12-06 18:37:20 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2012-12-06 18:37:20 -0800
commitf24f2e22aab32f2ec9613bcce95d995052f78009 (patch)
tree300218bafe2cad69def84e36a8b6b77c8b97e92d /lisp
parent39670ef4675252df65122fa9c7cf32454a1abf51 (diff)
downloademacs-f24f2e22aab32f2ec9613bcce95d995052f78009.tar.gz
Spelling fixes.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/faces.el2
-rw-r--r--lisp/mh-e/mh-e.el4
-rw-r--r--lisp/subr.el2
3 files changed, 4 insertions, 4 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 2a0b77b19c4..280d85c34e9 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1622,7 +1622,7 @@ the face's attributes on existing frames."
(if (memq spec-type '(reset saved-face))
(put face 'customized-face nil))
;; Setting the face spec via Custom empties out any override spec,
- ;; similar to how setting a variable via Custom changes its valus.
+ ;; similar to how setting a variable via Custom changes its values.
(if (memq spec-type '(customized-face saved-face reset))
(put face 'face-override-spec nil))
;; If we reset the face based on its custom spec, it is unmodified
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 69968dac5f7..3b37b9e799c 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2663,7 +2663,7 @@ of citations entirely, choose \"None\"."
"X-Mail-from:" ; fastmail.fm
"X-MAIL-INFO:" ; NetZero
"X-Mailer_"
- "X-MailFlowPolicy:" ; Cicso ironport (http://www.ironport.com)
+ "X-MailFlowPolicy:" ; Cisco Email Security (formerly IronPort; http://www.ironport.com)
"X-Mailing-List:" ; Unknown mailing list managers
"X-MailingID:"
"X-Mailman-Approved-At:" ; Mailman mailing list manager
@@ -2743,7 +2743,7 @@ of citations entirely, choose \"None\"."
"X-Scanned-By:"
"X-Sender-ID:" ; Google+
"X-Sender:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
- "X-Sendergroup:" ; Cicso ironport (http://www.ironport.com)
+ "X-Sendergroup:" ; Cisco Email Security (formerly IronPort; http://www.ironport.com)
"X-Server-Date:"
"X-Server-Uuid:"
"X-Service-Code:"
diff --git a/lisp/subr.el b/lisp/subr.el
index c0cb026fdf9..edc2927d673 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2628,7 +2628,7 @@ This variable is meaningful on MS-DOG and MS-Windows.
On those systems, it is automatically local in every buffer.
On other systems, this variable is normally always nil.
-WARNING: This variable is obsolete and will disapper Real Soon Now.
+WARNING: This variable is obsolete and will disappear Real Soon Now.
Don't use it!")
;; The `assert' macro from the cl package signals