emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 1393a4d: ; Spelling and quotation fixes


From: Paul Eggert
Subject: [Emacs-diffs] master 1393a4d: ; Spelling and quotation fixes
Date: Wed, 31 Aug 2016 03:54:46 +0000 (UTC)

branch: master
commit 1393a4d22c4f69fa4cc2f02b70431c28e3c45046
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    ; Spelling and quotation fixes
---
 doc/lispref/processes.texi               |    2 +-
 etc/NEWS                                 |   22 +++++++++++-----------
 lisp/ChangeLog.17                        |    6 +++---
 lisp/progmodes/cc-engine.el              |    6 +++---
 lisp/progmodes/cc-fonts.el               |    2 +-
 test/manual/etags/html-src/software.html |    2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index e043578..e54cf30 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -528,7 +528,7 @@ standard input to an inferior shell running @var{command}.  
This function
 is similar than @code{call-process-region}, with process being a shell.
 The arguments @code{delete}, @code{destination} and the return value
 are like in @code{call-process-region}.
-Note that this funtion doesn't accept additional arguments.
+Note that this function doesn't accept additional arguments.
 @end defun
 
 @defun shell-command-to-string command
diff --git a/etc/NEWS b/etc/NEWS
index ee2bc3a..18975cb 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -56,7 +56,7 @@ affected by this, as SGI stopped supporting IRIX in December 
2013.
 * Changes in Emacs 25.2
 
 +++
-** The new funtion 'call-shell-region' executes a command in an
+** The new function 'call-shell-region' executes a command in an
 inferior shell with the buffer region as input.
 
 +++
@@ -240,13 +240,13 @@ all buffers without asking confirmation;  bound to
 'U'; 'ibuffer-do-replace-regexp' bound to 'r'.
 
 ---
-*** A new command `ibuffer-mark-by-content-regexp' to mark buffers
+*** A new command 'ibuffer-mark-by-content-regexp' to mark buffers
 whose content matches a regexp; bound to '% g'.
 
 ---
-*** Two new options `ibuffer-never-search-content-name' and
-`ibuffer-never-search-content-mode' used by
-`ibuffer-mark-by-content-regexp'.
+*** Two new options 'ibuffer-never-search-content-name' and
+'ibuffer-never-search-content-mode' used by
+'ibuffer-mark-by-content-regexp'.
 
 ** Compilation mode
 
@@ -373,7 +373,7 @@ different group ID.
 Drive onsite repositories.
 
 +++
-Setting the "ENV" environment variable in `tramp-remote-process-environment'
+Setting the "ENV" environment variable in 'tramp-remote-process-environment'
 enables reading of shell initialization files.
 
 ---
@@ -441,7 +441,7 @@ file.
 
 * New Modes and Packages in Emacs 25.2
 
-** New Elisp data-structure library `radix-tree'.
+** New Elisp data-structure library 'radix-tree'.
 
 
 * Incompatible Lisp Changes in Emacs 25.2
@@ -478,9 +478,9 @@ function 'check-declare-errmsg' has been removed.
 ** New function undo-amalgamate-change-group to get rid of undo-boundaries
 between two states.
 
-** New var `definition-prefixes' is a hashtable mapping prefixes to the
+** New var 'definition-prefixes' is a hashtable mapping prefixes to the
 files where corresponding definitions can be found.  This can be used
-to fetch definitions that are not yet loaded, for example for `C-h f'.
+to fetch definitions that are not yet loaded, for example for 'C-h f'.
 
 ** New var syntax-ppss-table to control the syntax-table used in syntax-ppss.
 
@@ -580,11 +580,11 @@ ABBR is a time zone abbreviation.  The affected functions 
are
 *** New basic face 'fixed-pitch-serif', for a fixed-width font with serifs.
 The Info-quoted and tex-verbatim faces now default to inheriting from it.
 
-** New built-in function `mapcan' which avoids unnecessary consing (and garbage
+** New built-in function 'mapcan' which avoids unnecessary consing (and garbage
 collection).
 
 +++
-** The new functions `make-nearby-temp-file' and `temporary-file-directory'
+** The new functions 'make-nearby-temp-file' and 'temporary-file-directory'
 can be used for creation of temporary files of remote or mounted directories.
 
 
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index bbf25b6..1361e7a 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -8033,7 +8033,7 @@
 2014-08-24  Alan Mackenzie  <address@hidden>
 
        Handle C++11's "auto" and "decltype" constructions.
-       * progmodes/cc-engine.el (c-forward-type): Enhance to recognise
+       * progmodes/cc-engine.el (c-forward-type): Enhance to recognize
        and return 'decltype.
        (c-forward-decl-or-cast-1): New let variables backup-kwd-sym,
        prev-kwd-sym, new-style-auto.  Enhance to handle the new "auto"
@@ -13542,7 +13542,7 @@
 
        c-parse-state.  Don't "append-lower-brace-pair" in certain
        circumstances.  Also fix an obscure bug where "\\s!" shouldn't be
-       recognised as a comment.
+       recognized as a comment.
 
        * progmodes/cc-engine.el (c-state-pp-to-literal): Check for "\\s!"
        as well as normal comment starter.
@@ -17480,7 +17480,7 @@
        after a function declaration with only types (no identifiers) in
        the parentheses.  Also, accept a function declaration with just a
        type inside the parentheses, if this type can be positively
-       recognised as such, or if a prefix keyword like "explicit" nails
+       recognized as such, or if a prefix keyword like "explicit" nails
        down the construct as a declaration.
 
 2013-10-19  Eli Zaretskii  <address@hidden>
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 83ed308..2cad2d0 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8136,7 +8136,7 @@ comment at the start of cc-engine.el for more info."
                                (and (not context)
                                     ;; Deal with C++11's "copy-initialization"
                                     ;; where we have <type>(<constant>), by
-                                    ;; contraasting with a typeless
+                                    ;; contrasting with a typeless
                                     ;; <name>(<type><parameter>, ...).
                                     (save-excursion
                                       (goto-char after-paren-pos)
@@ -9839,7 +9839,7 @@ comment at the start of cc-engine.el for more info."
   ;; return t.  If point is definitely neither at nor in a brace list, return
   ;; nil.
   ;;
-  ;; CONTAINING-SEXP is the position of the brace/paren/braacket enclosing
+  ;; CONTAINING-SEXP is the position of the brace/paren/bracket enclosing
   ;; POINT, or nil if there is no such position, or we do not know it.  LIM is
   ;; a backward search limit.
   ;;
@@ -9856,7 +9856,7 @@ comment at the start of cc-engine.el for more info."
 
       (setq res (c-backward-token-2 1 t lim))
       ;; Checks to do only on the first sexp before the brace.
-      ;; Have we a C++ initialisation, without an "="?
+      ;; Have we a C++ initialization, without an "="?
       (if (and (c-major-mode-is 'c++-mode)
               (cond
                ((and (not (eq res 0))
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index a23dddf..735108f 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1205,7 +1205,7 @@ casts and declarations are fontified.  Used on level 2 
and higher."
         (setq start-pos (point))
         (when
          ;; The result of the form below is true when we don't recognize a
-         ;; declaration or cast, and we don't recognise a "non-decl",
+         ;; declaration or cast, and we don't recognize a "non-decl",
          ;; typically a brace list.
          (if (or (and (eq (get-text-property (point) 'face)
                           'font-lock-keyword-face)
diff --git a/test/manual/etags/html-src/software.html 
b/test/manual/etags/html-src/software.html
index dbf8228..f1abba7 100644
--- a/test/manual/etags/html-src/software.html
+++ b/test/manual/etags/html-src/software.html
@@ -168,7 +168,7 @@ if that happens so I can update this page.
     Shows the location of the first read error detected.  Can extract a disk Id
     from the image or the CD itself and build a local database of Ids for
     future checking of archived CDs.  The Id contains the image length, the MD5
-    signature and the Volume ID of the disk, so it can automatically recognise
+    signature and the Volume ID of the disk, so it can automatically recognize
     the CD to check.  Contains a small internal database of <A
     HREF="http://www.debian.org/";>Debian</A> <A
     HREF="http://cdimage.debian.org/";>CD images</A>.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]