diff options
| -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: 1. Is the bug report written in a way to be easy to reproduce (starts from emacs -Q, etc.)? If not, ask the reporter to try and reproduce it on an emacs without customization. - 2. Is the bug report written against the lastest emacs? If not, try to + 2. Is the bug report written against the latest emacs? If not, try to reproduce on the latest version, and if it can't be reproduced, ask the reporter to try again with the latest version. 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], g | gf | gfi | gfil | gfile ) val=gfile ;; w | w3 | w32 ) val=w32 ;; * ) AC_MSG_ERROR(['--with-file-notification=$withval' is invalid; -this option's value should be 'yes', 'no', 'inotify', 'kqeue', 'gfile' or 'w32'. +this option's value should be 'yes', 'no', 'inotify', 'kqueue', 'gfile' or 'w32'. 'yes' is a synonym for 'w32' on MS-Windows, for 'no' on Nextstep, otherwise for the first of 'inotify', 'kqueue' or 'gfile' that is usable.]) ;; 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. 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 /* At this point, old_dl, new_dl and pending_dl shall be empty. deleted_dl might not be empty when there was a rename to a - nonexisting file. Let's make a check for this (might be removed + nonexistent file. Let's make a check for this (might be removed once the code is stable). */ if (! NILP (old_dl)) 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 files in ~/test/automated/lisp/progmodes/flymake-tests.el~ should reside in a directory called ~/test/automated/lisp/progmodes/flymake-resources~. -No guidance is given for the organisation of resource files inside the -~-resource~ directory; files can be organised at the author's discretion. +No guidance is given for the organization of resource files inside the +~-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.") (cdr file-notify--test-remote-enabled-checked)) (defun file-notify--test-library () - "The used libray for the test, as string. + "The used library for the test, as a string. In the remote case, it is the process name which runs on the remote host, or nil." (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 @@ ;; example mentioned in RFC3986, section 5.4. Reference Resolution Examples (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)))) -(ert-deftest url-generic-parse-url/same-decument-reference () +(ert-deftest url-generic-parse-url/same-document-reference () "RFC 3986, section 4.4. Same-Document Reference / same-document reference: empty or number sign (\"#\") followed by a fragment identifier" (should (equal (url-generic-parse-url "") (url-parse-make-urlobj nil nil nil nil nil "" nil nil nil))) (should (equal (url-generic-parse-url "#") (url-parse-make-urlobj nil nil nil nil nil "" "" nil nil))) |