summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2017-02-16 09:17:45 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2017-02-16 09:18:21 -0800
commitcb70725584a754a491ddad82c42278f17c714a2f (patch)
treeb5ad6679f60932e516cb4769d878f37ec9814780
parent0b544b676473dedf34c6cb6a3315bec1f42d7162 (diff)
downloademacs-cb70725584a754a491ddad82c42278f17c714a2f.tar.gz
; Spelling, punctuation and minor wording fixes
-rw-r--r--ChangeLog.32
-rw-r--r--etc/NEWS27
-rw-r--r--lisp/emacs-lisp/byte-opt.el2
-rw-r--r--lisp/emacs-lisp/bytecomp.el6
-rw-r--r--lisp/international/characters.el4
-rw-r--r--src/ChangeLog.112
-rw-r--r--src/lisp.h2
7 files changed, 23 insertions, 22 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3
index 835ee08ba0a..1c2f5b1d2fa 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -5090,7 +5090,7 @@
(image-dired-cmd-rotate-thumbnail-program)
(image-dired-cmd-write-exif-data-program)
(image-dired-cmd-read-exif-data-program):
- Use executable-find to set the defaut value of this option.
+ Use executable-find to set the default value of this option.
(image-dired-cmd-rotate-original-program): Idem.
Search for program 'convert' if 'jpegtran' is not available.
(image-dired-cmd-rotate-original-options):
diff --git a/etc/NEWS b/etc/NEWS
index a54c655c36d..0ceb878a8e7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -340,9 +340,10 @@ the file's actual content before prompting the user.
** Title case characters are properly converted to upper case.
'upcase', 'upcase-region' et al. convert title case characters (such
-as Dz) into their upper case form (such as DZ). As a downside,
-'capitalize' and 'upcase-initials' produce awkward words where first
-two letters are upper case, e.g. DŽungla (instead of Džungla).
+as the single character "Dz") into their upper case form (such as "DZ").
+As a downside, 'capitalize' and 'upcase-initials' produce awkward
+words where first character is upper rather than title case, e.g.,
+"DŽungla" instead of "Džungla".
* Changes in Specialized Modes and Packages in Emacs 26.1
@@ -375,24 +376,24 @@ method is an NNTP select method.
+++
*** A new command for sorting articles by readedness marks has been
-added: `C-c C-s C-m C-m'.
+added: 'C-c C-s C-m C-m'.
** Ibuffer
---
-*** New filter commands `ibuffer-filter-by-basename',
-`ibuffer-filter-by-file-extension', `ibuffer-filter-by-directory',
-`ibuffer-filter-by-starred-name', `ibuffer-filter-by-modified'
-and `ibuffer-filter-by-visiting-file'; bound respectively
+*** New filter commands 'ibuffer-filter-by-basename',
+'ibuffer-filter-by-file-extension', 'ibuffer-filter-by-directory',
+'ibuffer-filter-by-starred-name', 'ibuffer-filter-by-modified'
+and 'ibuffer-filter-by-visiting-file'; bound respectively
to '/b', '/.', '//', '/*', '/i' and '/v'.
---
*** Two new commands 'ibuffer-filter-chosen-by-completion'
-and `ibuffer-and-filter', the second bound to '/&'.
+and 'ibuffer-and-filter', the second bound to '/&'.
---
-*** The commands `ibuffer-pop-filter', `ibuffer-pop-filter-group',
-`ibuffer-or-filter' and `ibuffer-filter-disable' have the alternative
+*** The commands 'ibuffer-pop-filter', 'ibuffer-pop-filter-group',
+'ibuffer-or-filter' and 'ibuffer-filter-disable' have the alternative
bindings '/<up>', '/S-<up>', '/|' and '/DEL', respectively.
---
@@ -894,9 +895,9 @@ consistency with the new functions. For compatibility, 'sxhash'
remains as an alias to 'sxhash-equal'.
+++
-** New function `add-variable-watcher' can be used to call a function
+** New function 'add-variable-watcher' can be used to call a function
when a symbol's value is changed. This is used to implement the new
-debugger command `debug-on-variable-change'.
+debugger command 'debug-on-variable-change'.
+++
** Time conversion functions that accept a time zone rule argument now
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index f3cc3d5992e..004f2e28653 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1421,7 +1421,7 @@
when (and (listp el) ;; make sure we're at the correct op
(eq (nth 1 el) 'byte-constant)
(eq (nth 2 el) orig-table))
- ;; jump tables are never resused, so we do this exactly
+ ;; Jump tables are never reused, so do this exactly
;; once.
do (setf (nth 2 el) last-constant) and return nil))))
;; lap = ( [ (pc . (op . arg)) ]* )
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e96ba0b6edd..25513bd0248 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -912,7 +912,7 @@ CONST2 may be evaluated multiple times."
(dolist (bytes-tail patchlist)
(setq pc (caar bytes-tail)) ; Pick PC from goto's tag.
;; Splits PC's value into 2 bytes. The jump address is
- ;; "reconstructued" by the `FETCH2' macro in `bytecode.c'.
+ ;; "reconstructed" by the `FETCH2' macro in `bytecode.c'.
(setcar (cdr bytes-tail) (logand pc 255))
(setcar bytes-tail (lsh pc -8))
;; FIXME: Replace this by some workaround.
@@ -4085,7 +4085,7 @@ Return a list of the form ((TEST . VAR) ((VALUE BODY) ...))"
;; varref var
;; constant #s(hash-table purecopy t data (val1 (TAG1) val2 (TAG2)))
;; switch
- ;; goto DEFAUT-TAG
+ ;; goto DEFAULT-TAG
;; TAG1
;; <clause body>
;; goto DONETAG
@@ -4103,7 +4103,7 @@ Return a list of the form ((TEST . VAR) ((VALUE BODY) ...))"
;; When the opcode argument is `byte-goto', `byte-compile-goto' sets
;; `byte-compile-depth' to `nil'. However, we need `byte-compile-depth'
;; to be non-nil for generating tags for all cases. Since
- ;; `byte-compile-depth' will increase by atmost 1 after compiling
+ ;; `byte-compile-depth' will increase by at most 1 after compiling
;; all of the clause (which is further enforced by cl-assert below)
;; it should be safe to preserve it's value.
(let ((byte-compile-depth byte-compile-depth))
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index b2c0e39741a..9e993e7060a 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -675,10 +675,10 @@ with L, LRE, or LRO Unicode bidi character type.")
(unicode-property-table-internal 'general-category))
;; Ⅰ through Ⅻ had word syntax in the past so set it here as well.
- ;; General category of those characers is Number, Letter.
+ ;; The general category of those characters is Number, Letter.
(modify-syntax-entry '(#x2160 . #x216b) "w " syn-tab)
- ;; ⓐ thourgh ⓩ are symbols, other according to Unicode but Emacs set
+ ;; ⓐ through ⓩ are symbols, other according to Unicode but Emacs set
;; their syntax to word in the past so keep backwards compatibility.
(modify-syntax-entry '(#x24D0 . #x24E9) "w " syn-tab))
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index c9ebce99265..365fc277a9a 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -10673,7 +10673,7 @@
Try font from Ffont_get_system_font.
Do not get font from x_default_parameter if we got one from
Ffont_get_system_font.
- (Fx_select_font): Get the defaut font name from :name of FRAME_FONT(f).
+ (Fx_select_font): Get the default font name from :name of FRAME_FONT(f).
* w32font.c (w32font_driver): Initialize all members.
diff --git a/src/lisp.h b/src/lisp.h
index f1e2685702d..080bcf74ce6 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4615,7 +4615,7 @@ struct for_each_tail_internal
This macro uses maybe_quit because of an excess of caution. The
call to maybe_quit should not be needed in practice, as a very long
list, whether circular or not, will cause Emacs to be so slow in
- other noninterruptible areas (e.g., garbage collection) that there
+ other uninterruptible areas (e.g., garbage collection) that there
is little point to calling maybe_quit here. */
#define FOR_EACH_TAIL_INTERNAL(tail, cycle, check_quit) \