diff options
| author | Paul Eggert | 2016-08-30 20:54:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-08-30 20:54:42 -0700 |
| commit | 1393a4d22c4f69fa4cc2f02b70431c28e3c45046 (patch) | |
| tree | ae3bd9a53544a7e8206c584f3540a570eb9f717d | |
| parent | f24011b4d17da2b39b180fb091d2e6b83aee0d57 (diff) | |
| download | emacs-1393a4d22c4f69fa4cc2f02b70431c28e3c45046.tar.gz emacs-1393a4d22c4f69fa4cc2f02b70431c28e3c45046.zip | |
; Spelling and quotation fixes
| -rw-r--r-- | doc/lispref/processes.texi | 2 | ||||
| -rw-r--r-- | etc/NEWS | 22 | ||||
| -rw-r--r-- | lisp/ChangeLog.17 | 6 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 6 | ||||
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 2 | ||||
| -rw-r--r-- | 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 e043578e298..e54cf301d4e 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 | |||
| 528 | is similar than @code{call-process-region}, with process being a shell. | 528 | is similar than @code{call-process-region}, with process being a shell. |
| 529 | The arguments @code{delete}, @code{destination} and the return value | 529 | The arguments @code{delete}, @code{destination} and the return value |
| 530 | are like in @code{call-process-region}. | 530 | are like in @code{call-process-region}. |
| 531 | Note that this funtion doesn't accept additional arguments. | 531 | Note that this function doesn't accept additional arguments. |
| 532 | @end defun | 532 | @end defun |
| 533 | 533 | ||
| 534 | @defun shell-command-to-string command | 534 | @defun shell-command-to-string command |
| @@ -56,7 +56,7 @@ affected by this, as SGI stopped supporting IRIX in December 2013. | |||
| 56 | * Changes in Emacs 25.2 | 56 | * Changes in Emacs 25.2 |
| 57 | 57 | ||
| 58 | +++ | 58 | +++ |
| 59 | ** The new funtion 'call-shell-region' executes a command in an | 59 | ** The new function 'call-shell-region' executes a command in an |
| 60 | inferior shell with the buffer region as input. | 60 | inferior shell with the buffer region as input. |
| 61 | 61 | ||
| 62 | +++ | 62 | +++ |
| @@ -240,13 +240,13 @@ all buffers without asking confirmation; bound to | |||
| 240 | 'U'; 'ibuffer-do-replace-regexp' bound to 'r'. | 240 | 'U'; 'ibuffer-do-replace-regexp' bound to 'r'. |
| 241 | 241 | ||
| 242 | --- | 242 | --- |
| 243 | *** A new command `ibuffer-mark-by-content-regexp' to mark buffers | 243 | *** A new command 'ibuffer-mark-by-content-regexp' to mark buffers |
| 244 | whose content matches a regexp; bound to '% g'. | 244 | whose content matches a regexp; bound to '% g'. |
| 245 | 245 | ||
| 246 | --- | 246 | --- |
| 247 | *** Two new options `ibuffer-never-search-content-name' and | 247 | *** Two new options 'ibuffer-never-search-content-name' and |
| 248 | `ibuffer-never-search-content-mode' used by | 248 | 'ibuffer-never-search-content-mode' used by |
| 249 | `ibuffer-mark-by-content-regexp'. | 249 | 'ibuffer-mark-by-content-regexp'. |
| 250 | 250 | ||
| 251 | ** Compilation mode | 251 | ** Compilation mode |
| 252 | 252 | ||
| @@ -373,7 +373,7 @@ different group ID. | |||
| 373 | Drive onsite repositories. | 373 | Drive onsite repositories. |
| 374 | 374 | ||
| 375 | +++ | 375 | +++ |
| 376 | Setting the "ENV" environment variable in `tramp-remote-process-environment' | 376 | Setting the "ENV" environment variable in 'tramp-remote-process-environment' |
| 377 | enables reading of shell initialization files. | 377 | enables reading of shell initialization files. |
| 378 | 378 | ||
| 379 | --- | 379 | --- |
| @@ -441,7 +441,7 @@ file. | |||
| 441 | 441 | ||
| 442 | * New Modes and Packages in Emacs 25.2 | 442 | * New Modes and Packages in Emacs 25.2 |
| 443 | 443 | ||
| 444 | ** New Elisp data-structure library `radix-tree'. | 444 | ** New Elisp data-structure library 'radix-tree'. |
| 445 | 445 | ||
| 446 | 446 | ||
| 447 | * Incompatible Lisp Changes in Emacs 25.2 | 447 | * Incompatible Lisp Changes in Emacs 25.2 |
| @@ -478,9 +478,9 @@ function 'check-declare-errmsg' has been removed. | |||
| 478 | ** New function undo-amalgamate-change-group to get rid of undo-boundaries | 478 | ** New function undo-amalgamate-change-group to get rid of undo-boundaries |
| 479 | between two states. | 479 | between two states. |
| 480 | 480 | ||
| 481 | ** New var `definition-prefixes' is a hashtable mapping prefixes to the | 481 | ** New var 'definition-prefixes' is a hashtable mapping prefixes to the |
| 482 | files where corresponding definitions can be found. This can be used | 482 | files where corresponding definitions can be found. This can be used |
| 483 | to fetch definitions that are not yet loaded, for example for `C-h f'. | 483 | to fetch definitions that are not yet loaded, for example for 'C-h f'. |
| 484 | 484 | ||
| 485 | ** New var syntax-ppss-table to control the syntax-table used in syntax-ppss. | 485 | ** New var syntax-ppss-table to control the syntax-table used in syntax-ppss. |
| 486 | 486 | ||
| @@ -580,11 +580,11 @@ ABBR is a time zone abbreviation. The affected functions are | |||
| 580 | *** New basic face 'fixed-pitch-serif', for a fixed-width font with serifs. | 580 | *** New basic face 'fixed-pitch-serif', for a fixed-width font with serifs. |
| 581 | The Info-quoted and tex-verbatim faces now default to inheriting from it. | 581 | The Info-quoted and tex-verbatim faces now default to inheriting from it. |
| 582 | 582 | ||
| 583 | ** New built-in function `mapcan' which avoids unnecessary consing (and garbage | 583 | ** New built-in function 'mapcan' which avoids unnecessary consing (and garbage |
| 584 | collection). | 584 | collection). |
| 585 | 585 | ||
| 586 | +++ | 586 | +++ |
| 587 | ** The new functions `make-nearby-temp-file' and `temporary-file-directory' | 587 | ** The new functions 'make-nearby-temp-file' and 'temporary-file-directory' |
| 588 | can be used for creation of temporary files of remote or mounted directories. | 588 | can be used for creation of temporary files of remote or mounted directories. |
| 589 | 589 | ||
| 590 | 590 | ||
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index bbf25b60483..1361e7a8153 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 | |||
| @@ -8033,7 +8033,7 @@ | |||
| 8033 | 2014-08-24 Alan Mackenzie <acm@muc.de> | 8033 | 2014-08-24 Alan Mackenzie <acm@muc.de> |
| 8034 | 8034 | ||
| 8035 | Handle C++11's "auto" and "decltype" constructions. | 8035 | Handle C++11's "auto" and "decltype" constructions. |
| 8036 | * progmodes/cc-engine.el (c-forward-type): Enhance to recognise | 8036 | * progmodes/cc-engine.el (c-forward-type): Enhance to recognize |
| 8037 | and return 'decltype. | 8037 | and return 'decltype. |
| 8038 | (c-forward-decl-or-cast-1): New let variables backup-kwd-sym, | 8038 | (c-forward-decl-or-cast-1): New let variables backup-kwd-sym, |
| 8039 | prev-kwd-sym, new-style-auto. Enhance to handle the new "auto" | 8039 | prev-kwd-sym, new-style-auto. Enhance to handle the new "auto" |
| @@ -13542,7 +13542,7 @@ | |||
| 13542 | 13542 | ||
| 13543 | c-parse-state. Don't "append-lower-brace-pair" in certain | 13543 | c-parse-state. Don't "append-lower-brace-pair" in certain |
| 13544 | circumstances. Also fix an obscure bug where "\\s!" shouldn't be | 13544 | circumstances. Also fix an obscure bug where "\\s!" shouldn't be |
| 13545 | recognised as a comment. | 13545 | recognized as a comment. |
| 13546 | 13546 | ||
| 13547 | * progmodes/cc-engine.el (c-state-pp-to-literal): Check for "\\s!" | 13547 | * progmodes/cc-engine.el (c-state-pp-to-literal): Check for "\\s!" |
| 13548 | as well as normal comment starter. | 13548 | as well as normal comment starter. |
| @@ -17480,7 +17480,7 @@ | |||
| 17480 | after a function declaration with only types (no identifiers) in | 17480 | after a function declaration with only types (no identifiers) in |
| 17481 | the parentheses. Also, accept a function declaration with just a | 17481 | the parentheses. Also, accept a function declaration with just a |
| 17482 | type inside the parentheses, if this type can be positively | 17482 | type inside the parentheses, if this type can be positively |
| 17483 | recognised as such, or if a prefix keyword like "explicit" nails | 17483 | recognized as such, or if a prefix keyword like "explicit" nails |
| 17484 | down the construct as a declaration. | 17484 | down the construct as a declaration. |
| 17485 | 17485 | ||
| 17486 | 2013-10-19 Eli Zaretskii <eliz@gnu.org> | 17486 | 2013-10-19 Eli Zaretskii <eliz@gnu.org> |
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 83ed308e107..2cad2d02422 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." | |||
| 8136 | (and (not context) | 8136 | (and (not context) |
| 8137 | ;; Deal with C++11's "copy-initialization" | 8137 | ;; Deal with C++11's "copy-initialization" |
| 8138 | ;; where we have <type>(<constant>), by | 8138 | ;; where we have <type>(<constant>), by |
| 8139 | ;; contraasting with a typeless | 8139 | ;; contrasting with a typeless |
| 8140 | ;; <name>(<type><parameter>, ...). | 8140 | ;; <name>(<type><parameter>, ...). |
| 8141 | (save-excursion | 8141 | (save-excursion |
| 8142 | (goto-char after-paren-pos) | 8142 | (goto-char after-paren-pos) |
| @@ -9839,7 +9839,7 @@ comment at the start of cc-engine.el for more info." | |||
| 9839 | ;; return t. If point is definitely neither at nor in a brace list, return | 9839 | ;; return t. If point is definitely neither at nor in a brace list, return |
| 9840 | ;; nil. | 9840 | ;; nil. |
| 9841 | ;; | 9841 | ;; |
| 9842 | ;; CONTAINING-SEXP is the position of the brace/paren/braacket enclosing | 9842 | ;; CONTAINING-SEXP is the position of the brace/paren/bracket enclosing |
| 9843 | ;; POINT, or nil if there is no such position, or we do not know it. LIM is | 9843 | ;; POINT, or nil if there is no such position, or we do not know it. LIM is |
| 9844 | ;; a backward search limit. | 9844 | ;; a backward search limit. |
| 9845 | ;; | 9845 | ;; |
| @@ -9856,7 +9856,7 @@ comment at the start of cc-engine.el for more info." | |||
| 9856 | 9856 | ||
| 9857 | (setq res (c-backward-token-2 1 t lim)) | 9857 | (setq res (c-backward-token-2 1 t lim)) |
| 9858 | ;; Checks to do only on the first sexp before the brace. | 9858 | ;; Checks to do only on the first sexp before the brace. |
| 9859 | ;; Have we a C++ initialisation, without an "="? | 9859 | ;; Have we a C++ initialization, without an "="? |
| 9860 | (if (and (c-major-mode-is 'c++-mode) | 9860 | (if (and (c-major-mode-is 'c++-mode) |
| 9861 | (cond | 9861 | (cond |
| 9862 | ((and (not (eq res 0)) | 9862 | ((and (not (eq res 0)) |
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index a23dddf214e..735108ff7dc 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." | |||
| 1205 | (setq start-pos (point)) | 1205 | (setq start-pos (point)) |
| 1206 | (when | 1206 | (when |
| 1207 | ;; The result of the form below is true when we don't recognize a | 1207 | ;; The result of the form below is true when we don't recognize a |
| 1208 | ;; declaration or cast, and we don't recognise a "non-decl", | 1208 | ;; declaration or cast, and we don't recognize a "non-decl", |
| 1209 | ;; typically a brace list. | 1209 | ;; typically a brace list. |
| 1210 | (if (or (and (eq (get-text-property (point) 'face) | 1210 | (if (or (and (eq (get-text-property (point) 'face) |
| 1211 | 'font-lock-keyword-face) | 1211 | 'font-lock-keyword-face) |
diff --git a/test/manual/etags/html-src/software.html b/test/manual/etags/html-src/software.html index dbf82281993..f1abba7cb49 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. | |||
| 168 | Shows the location of the first read error detected. Can extract a disk Id | 168 | Shows the location of the first read error detected. Can extract a disk Id |
| 169 | from the image or the CD itself and build a local database of Ids for | 169 | from the image or the CD itself and build a local database of Ids for |
| 170 | future checking of archived CDs. The Id contains the image length, the MD5 | 170 | future checking of archived CDs. The Id contains the image length, the MD5 |
| 171 | signature and the Volume ID of the disk, so it can automatically recognise | 171 | signature and the Volume ID of the disk, so it can automatically recognize |
| 172 | the CD to check. Contains a small internal database of <A | 172 | the CD to check. Contains a small internal database of <A |
| 173 | HREF="http://www.debian.org/">Debian</A> <A | 173 | HREF="http://www.debian.org/">Debian</A> <A |
| 174 | HREF="http://cdimage.debian.org/">CD images</A>. | 174 | HREF="http://cdimage.debian.org/">CD images</A>. |