summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-01-04 14:46:35 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2016-01-04 14:47:01 -0800
commit61e83e902b388490b609677a76f3d49740439f24 (patch)
treee2329fd5e9f6ec1c72b26a68765e8f982f788b29 /lisp
parent989bcc77ab576d7a83cb0194a9fc73ce51939042 (diff)
downloademacs-61e83e902b388490b609677a76f3d49740439f24.tar.gz
emacs-61e83e902b388490b609677a76f3d49740439f24.tar.bz2
emacs-61e83e902b388490b609677a76f3d49740439f24.zip
Spelling fixes
Diffstat (limited to 'lisp')
-rw-r--r--lisp/Makefile.in2
-rw-r--r--lisp/linum.el2
-rw-r--r--lisp/net/puny.el16
-rw-r--r--lisp/org/ChangeLog.12
4 files changed, 11 insertions, 11 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 164df255585..ca69c0a154a 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -185,7 +185,7 @@ $(lisp)/loaddefs.el: $(LOADDEFS)
--eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$@")))' \
-f batch-update-autoloads ${SUBDIRS_ALMOST}
-# autoloads only runs when loaddefs.el is non-existant, although it
+# autoloads only runs when loaddefs.el is nonexistent, although it
# generates a number of different files. Provide a force option to enable
# regeneration of all these files.
autoloads-force .PHONY:
diff --git a/lisp/linum.el b/lisp/linum.el
index 4e0bc56877a..903586a4153 100644
--- a/lisp/linum.el
+++ b/lisp/linum.el
@@ -121,7 +121,7 @@ Linum mode is a buffer-local minor mode."
(setq linum-overlays nil)
(dolist (w (get-buffer-window-list (current-buffer) nil t))
;; restore margins if needed FIXME: This still fails if the
- ;; "other" mode has incidently set margins to exactly what linum
+ ;; "other" mode has incidentally set margins to exactly what linum
;; had: see bug#20674 for a similar workaround in nlinum.el
(let ((set-margins (window-parameter w 'linum--set-margins))
(current-margins (window-margins w)))
diff --git a/lisp/net/puny.el b/lisp/net/puny.el
index f2fa3464348..b3a82a29328 100644
--- a/lisp/net/puny.el
+++ b/lisp/net/puny.el
@@ -30,7 +30,7 @@
(require 'seq)
(defun puny-encode-domain (domain)
- "Encode DOMAIN according to the IDNA/punycode algorith.
+ "Encode DOMAIN according to the IDNA/punycode algorithm.
For instance, \"fśf.org\" => \"xn--ff-2sa.org\"."
;; The vast majority of domain names are not IDNA domain names, so
;; add a check first to avoid doing unnecessary work.
@@ -54,7 +54,7 @@ For instance, \"bücher\" => \"xn--bcher-kva\"."
(puny-encode-complex (length ascii) string)))))
(defun puny-decode-domain (domain)
- "Decode DOMAIN according to the IDNA/punycode algorith.
+ "Decode DOMAIN according to the IDNA/punycode algorithm.
For instance, \"xn--ff-2sa.org\" => \"fśf.org\"."
(mapconcat 'puny-decode-string (split-string domain "[.]") "."))
@@ -215,12 +215,12 @@ using homographs."
#x058A ; ARMENIAN HYPHEN
#x05F3 ; HEBREW PUNCTUATION GERESH
#x05F4 ; HEBREW PUNCTUATION GERSHAYIM
- #x0F0B ; IBETAN MARK INTERSYLLABIC TSHEG
- #x200C ; ERO WIDTH NON-JOINER*
- #x200D ; ERO WIDTH JOINER*
- #x2010 ; YPHEN
- #x2019 ; IGHT SINGLE QUOTATION MARK
- #x2027 ; YPHENATION POINT
+ #x0F0B ; TIBETAN MARK INTERSYLLABIC TSHEG
+ #x200C ; ZERO WIDTH NON-JOINER*
+ #x200D ; ZERO WIDTH JOINER*
+ #x2010 ; HYPHEN
+ #x2019 ; RIGHT SINGLE QUOTATION MARK
+ #x2027 ; HYPHENATION POINT
#x30A0 ; KATAKANA-HIRAGANA DOUBLE HYPHEN
#x30FB)) ; KATAKANA MIDDLE DOT
t
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index 35e6ef1eccd..2c78ce064d1 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -5285,7 +5285,7 @@
* ox-html.el (org-html-link): Don't skip the link description when
it matches the name of the headline it targets.
- * ox-ascii.el (ascii): Remove inexistant function.
+ * ox-ascii.el (ascii): Remove nonexistent function.
* ox-icalendar.el (icalendar): Ignore footnotes.
(org-icalendar--combine-files): Small refactoring.