diff options
| author | Paul Eggert | 2016-01-04 14:46:35 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-01-04 14:47:01 -0800 |
| commit | 61e83e902b388490b609677a76f3d49740439f24 (patch) | |
| tree | e2329fd5e9f6ec1c72b26a68765e8f982f788b29 | |
| parent | 989bcc77ab576d7a83cb0194a9fc73ce51939042 (diff) | |
| download | emacs-61e83e902b388490b609677a76f3d49740439f24.tar.gz emacs-61e83e902b388490b609677a76f3d49740439f24.zip | |
Spelling fixes
| -rw-r--r-- | admin/notes/triage | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lisp/Makefile.in | 2 | ||||
| -rw-r--r-- | lisp/linum.el | 2 | ||||
| -rw-r--r-- | lisp/net/puny.el | 16 | ||||
| -rw-r--r-- | lisp/org/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | src/kqueue.c | 2 | ||||
| -rw-r--r-- | test/file-organisation.org | 4 | ||||
| -rw-r--r-- | test/lisp/filenotify-tests.el | 2 | ||||
| -rw-r--r-- | test/lisp/url/url-parse-tests.el | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/admin/notes/triage b/admin/notes/triage index bc91b6c26f7..5b0e35c144c 100644 --- a/admin/notes/triage +++ b/admin/notes/triage | |||
| @@ -57,7 +57,7 @@ For each new bug, ask the following questions: | |||
| 57 | 1. Is the bug report written in a way to be easy to reproduce (starts from | 57 | 1. Is the bug report written in a way to be easy to reproduce (starts from |
| 58 | emacs -Q, etc.)? If not, ask the reporter to try and reproduce it on an | 58 | emacs -Q, etc.)? If not, ask the reporter to try and reproduce it on an |
| 59 | emacs without customization. | 59 | emacs without customization. |
| 60 | 2. Is the bug report written against the lastest emacs? If not, try to | 60 | 2. Is the bug report written against the latest emacs? If not, try to |
| 61 | reproduce on the latest version, and if it can't be reproduced, ask the | 61 | reproduce on the latest version, and if it can't be reproduced, ask the |
| 62 | reporter to try again with the latest version. | 62 | reporter to try again with the latest version. |
| 63 | 3. Is the bug the same as another bug? If so, merge the bugs. | 63 | 3. Is the bug the same as another bug? If so, merge the bugs. |
diff --git a/configure.ac b/configure.ac index 2baafb99112..0aa863afe34 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -365,7 +365,7 @@ AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB], | |||
| 365 | g | gf | gfi | gfil | gfile ) val=gfile ;; | 365 | g | gf | gfi | gfil | gfile ) val=gfile ;; |
| 366 | w | w3 | w32 ) val=w32 ;; | 366 | w | w3 | w32 ) val=w32 ;; |
| 367 | * ) AC_MSG_ERROR(['--with-file-notification=$withval' is invalid; | 367 | * ) AC_MSG_ERROR(['--with-file-notification=$withval' is invalid; |
| 368 | this option's value should be 'yes', 'no', 'inotify', 'kqeue', 'gfile' or 'w32'. | 368 | this option's value should be 'yes', 'no', 'inotify', 'kqueue', 'gfile' or 'w32'. |
| 369 | 'yes' is a synonym for 'w32' on MS-Windows, for 'no' on Nextstep, | 369 | 'yes' is a synonym for 'w32' on MS-Windows, for 'no' on Nextstep, |
| 370 | otherwise for the first of 'inotify', 'kqueue' or 'gfile' that is usable.]) | 370 | otherwise for the first of 'inotify', 'kqueue' or 'gfile' that is usable.]) |
| 371 | ;; | 371 | ;; |
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) | |||
| 185 | --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$@")))' \ | 185 | --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$@")))' \ |
| 186 | -f batch-update-autoloads ${SUBDIRS_ALMOST} | 186 | -f batch-update-autoloads ${SUBDIRS_ALMOST} |
| 187 | 187 | ||
| 188 | # autoloads only runs when loaddefs.el is non-existant, although it | 188 | # autoloads only runs when loaddefs.el is nonexistent, although it |
| 189 | # generates a number of different files. Provide a force option to enable | 189 | # generates a number of different files. Provide a force option to enable |
| 190 | # regeneration of all these files. | 190 | # regeneration of all these files. |
| 191 | autoloads-force .PHONY: | 191 | 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." | |||
| 121 | (setq linum-overlays nil) | 121 | (setq linum-overlays nil) |
| 122 | (dolist (w (get-buffer-window-list (current-buffer) nil t)) | 122 | (dolist (w (get-buffer-window-list (current-buffer) nil t)) |
| 123 | ;; restore margins if needed FIXME: This still fails if the | 123 | ;; restore margins if needed FIXME: This still fails if the |
| 124 | ;; "other" mode has incidently set margins to exactly what linum | 124 | ;; "other" mode has incidentally set margins to exactly what linum |
| 125 | ;; had: see bug#20674 for a similar workaround in nlinum.el | 125 | ;; had: see bug#20674 for a similar workaround in nlinum.el |
| 126 | (let ((set-margins (window-parameter w 'linum--set-margins)) | 126 | (let ((set-margins (window-parameter w 'linum--set-margins)) |
| 127 | (current-margins (window-margins w))) | 127 | (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 @@ | |||
| 30 | (require 'seq) | 30 | (require 'seq) |
| 31 | 31 | ||
| 32 | (defun puny-encode-domain (domain) | 32 | (defun puny-encode-domain (domain) |
| 33 | "Encode DOMAIN according to the IDNA/punycode algorith. | 33 | "Encode DOMAIN according to the IDNA/punycode algorithm. |
| 34 | For instance, \"fśf.org\" => \"xn--ff-2sa.org\"." | 34 | For instance, \"fśf.org\" => \"xn--ff-2sa.org\"." |
| 35 | ;; The vast majority of domain names are not IDNA domain names, so | 35 | ;; The vast majority of domain names are not IDNA domain names, so |
| 36 | ;; add a check first to avoid doing unnecessary work. | 36 | ;; add a check first to avoid doing unnecessary work. |
| @@ -54,7 +54,7 @@ For instance, \"bücher\" => \"xn--bcher-kva\"." | |||
| 54 | (puny-encode-complex (length ascii) string))))) | 54 | (puny-encode-complex (length ascii) string))))) |
| 55 | 55 | ||
| 56 | (defun puny-decode-domain (domain) | 56 | (defun puny-decode-domain (domain) |
| 57 | "Decode DOMAIN according to the IDNA/punycode algorith. | 57 | "Decode DOMAIN according to the IDNA/punycode algorithm. |
| 58 | For instance, \"xn--ff-2sa.org\" => \"fśf.org\"." | 58 | For instance, \"xn--ff-2sa.org\" => \"fśf.org\"." |
| 59 | (mapconcat 'puny-decode-string (split-string domain "[.]") ".")) | 59 | (mapconcat 'puny-decode-string (split-string domain "[.]") ".")) |
| 60 | 60 | ||
| @@ -215,12 +215,12 @@ using homographs." | |||
| 215 | #x058A ; ARMENIAN HYPHEN | 215 | #x058A ; ARMENIAN HYPHEN |
| 216 | #x05F3 ; HEBREW PUNCTUATION GERESH | 216 | #x05F3 ; HEBREW PUNCTUATION GERESH |
| 217 | #x05F4 ; HEBREW PUNCTUATION GERSHAYIM | 217 | #x05F4 ; HEBREW PUNCTUATION GERSHAYIM |
| 218 | #x0F0B ; IBETAN MARK INTERSYLLABIC TSHEG | 218 | #x0F0B ; TIBETAN MARK INTERSYLLABIC TSHEG |
| 219 | #x200C ; ERO WIDTH NON-JOINER* | 219 | #x200C ; ZERO WIDTH NON-JOINER* |
| 220 | #x200D ; ERO WIDTH JOINER* | 220 | #x200D ; ZERO WIDTH JOINER* |
| 221 | #x2010 ; YPHEN | 221 | #x2010 ; HYPHEN |
| 222 | #x2019 ; IGHT SINGLE QUOTATION MARK | 222 | #x2019 ; RIGHT SINGLE QUOTATION MARK |
| 223 | #x2027 ; YPHENATION POINT | 223 | #x2027 ; HYPHENATION POINT |
| 224 | #x30A0 ; KATAKANA-HIRAGANA DOUBLE HYPHEN | 224 | #x30A0 ; KATAKANA-HIRAGANA DOUBLE HYPHEN |
| 225 | #x30FB)) ; KATAKANA MIDDLE DOT | 225 | #x30FB)) ; KATAKANA MIDDLE DOT |
| 226 | t | 226 | 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 @@ | |||
| 5285 | * ox-html.el (org-html-link): Don't skip the link description when | 5285 | * ox-html.el (org-html-link): Don't skip the link description when |
| 5286 | it matches the name of the headline it targets. | 5286 | it matches the name of the headline it targets. |
| 5287 | 5287 | ||
| 5288 | * ox-ascii.el (ascii): Remove inexistant function. | 5288 | * ox-ascii.el (ascii): Remove nonexistent function. |
| 5289 | 5289 | ||
| 5290 | * ox-icalendar.el (icalendar): Ignore footnotes. | 5290 | * ox-icalendar.el (icalendar): Ignore footnotes. |
| 5291 | (org-icalendar--combine-files): Small refactoring. | 5291 | (org-icalendar--combine-files): Small refactoring. |
diff --git a/src/kqueue.c b/src/kqueue.c index 1830040637e..e0ee5fb9d7b 100644 --- a/src/kqueue.c +++ b/src/kqueue.c | |||
| @@ -257,7 +257,7 @@ kqueue_compare_dir_list | |||
| 257 | 257 | ||
| 258 | /* At this point, old_dl, new_dl and pending_dl shall be empty. | 258 | /* At this point, old_dl, new_dl and pending_dl shall be empty. |
| 259 | deleted_dl might not be empty when there was a rename to a | 259 | deleted_dl might not be empty when there was a rename to a |
| 260 | nonexisting file. Let's make a check for this (might be removed | 260 | nonexistent file. Let's make a check for this (might be removed |
| 261 | once the code is stable). */ | 261 | once the code is stable). */ |
| 262 | if (! NILP (old_dl)) | 262 | if (! NILP (old_dl)) |
| 263 | report_file_error ("Old list not empty", old_dl); | 263 | report_file_error ("Old list not empty", old_dl); |
diff --git a/test/file-organisation.org b/test/file-organisation.org index b7540001cc4..226e12d5330 100644 --- a/test/file-organisation.org +++ b/test/file-organisation.org | |||
| @@ -50,5 +50,5 @@ directory as the feature. Hence, the lisp file ~flymake.el~ should have test | |||
| 50 | files in ~/test/automated/lisp/progmodes/flymake-tests.el~ should reside in a | 50 | files in ~/test/automated/lisp/progmodes/flymake-tests.el~ should reside in a |
| 51 | directory called ~/test/automated/lisp/progmodes/flymake-resources~. | 51 | directory called ~/test/automated/lisp/progmodes/flymake-resources~. |
| 52 | 52 | ||
| 53 | No guidance is given for the organisation of resource files inside the | 53 | No guidance is given for the organization of resource files inside the |
| 54 | ~-resource~ directory; files can be organised at the author's discretion. | 54 | ~-resource~ directory; files can be organized at the author's discretion. |
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index d6322c22c0e..376904dd65c 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el | |||
| @@ -136,7 +136,7 @@ being the result.") | |||
| 136 | (cdr file-notify--test-remote-enabled-checked)) | 136 | (cdr file-notify--test-remote-enabled-checked)) |
| 137 | 137 | ||
| 138 | (defun file-notify--test-library () | 138 | (defun file-notify--test-library () |
| 139 | "The used libray for the test, as string. | 139 | "The used library for the test, as a string. |
| 140 | In the remote case, it is the process name which runs on the | 140 | In the remote case, it is the process name which runs on the |
| 141 | remote host, or nil." | 141 | remote host, or nil." |
| 142 | (if (null (file-remote-p temporary-file-directory)) | 142 | (if (null (file-remote-p temporary-file-directory)) |
diff --git a/test/lisp/url/url-parse-tests.el b/test/lisp/url/url-parse-tests.el index 154e0917a43..443034a603e 100644 --- a/test/lisp/url/url-parse-tests.el +++ b/test/lisp/url/url-parse-tests.el | |||
| @@ -156,7 +156,7 @@ | |||
| 156 | ;; example mentioned in RFC3986, section 5.4. Reference Resolution Examples | 156 | ;; example mentioned in RFC3986, section 5.4. Reference Resolution Examples |
| 157 | (should (equal (url-generic-parse-url "http://a/b/c/d;p?q") (url-parse-make-urlobj "http" nil nil "a" nil "/b/c/d;p?q" nil nil t)))) | 157 | (should (equal (url-generic-parse-url "http://a/b/c/d;p?q") (url-parse-make-urlobj "http" nil nil "a" nil "/b/c/d;p?q" nil nil t)))) |
| 158 | 158 | ||
| 159 | (ert-deftest url-generic-parse-url/same-decument-reference () | 159 | (ert-deftest url-generic-parse-url/same-document-reference () |
| 160 | "RFC 3986, section 4.4. Same-Document Reference / same-document reference: empty or number sign (\"#\") followed by a fragment identifier" | 160 | "RFC 3986, section 4.4. Same-Document Reference / same-document reference: empty or number sign (\"#\") followed by a fragment identifier" |
| 161 | (should (equal (url-generic-parse-url "") (url-parse-make-urlobj nil nil nil nil nil "" nil nil nil))) | 161 | (should (equal (url-generic-parse-url "") (url-parse-make-urlobj nil nil nil nil nil "" nil nil nil))) |
| 162 | (should (equal (url-generic-parse-url "#") (url-parse-make-urlobj nil nil nil nil nil "" "" nil nil))) | 162 | (should (equal (url-generic-parse-url "#") (url-parse-make-urlobj nil nil nil nil nil "" "" nil nil))) |