[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118100: Spelling fixes.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r118100: Spelling fixes. |
Date: |
Sun, 12 Oct 2014 20:09:20 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118100
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2014-10-12 13:09:15 -0700
message:
Spelling fixes.
modified:
admin/versioning versioning-20141010075246-umch0hjhjohbsypk-1
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/org/org.el org.el-20091113204419-o5vbwnq5f7feedwu-8617
lisp/progmodes/cc-engine.el
ccengine.el-20091113204419-o5vbwnq5f7feedwu-1227
lisp/progmodes/cc-langs.el cclangs.el-20091113204419-o5vbwnq5f7feedwu-1228
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/font.c font.c-20091113204419-o5vbwnq5f7feedwu-8540
src/keymap.c keymap.c-20091113204419-o5vbwnq5f7feedwu-219
src/lread.c lread.c-20091113204419-o5vbwnq5f7feedwu-266
src/process.c process.c-20091113204419-o5vbwnq5f7feedwu-462
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
=== modified file 'admin/versioning'
--- a/admin/versioning 2014-10-10 07:54:08 +0000
+++ b/admin/versioning 2014-10-12 20:09:15 +0000
@@ -6,7 +6,7 @@
chosen, and lightly documents the previous schemes. It was prompted
by http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00872.html.
-Releated info:
+Related info:
- [[file:FOR-RELEASE][FOR-RELEASE]]
- [[file:make-tarball.txt][make-tarball.txt]]
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-12 18:27:37 +0000
+++ b/lisp/ChangeLog 2014-10-12 20:09:15 +0000
@@ -3305,7 +3305,7 @@
outside of ignored environments.
(tildify-build-regexp): Remove function since it is now
incorporated in `tildify-foreach-region-outside-env' where it is
- optimised and simplified by the use of `mapconcat'.
+ optimized and simplified by the use of `mapconcat'.
(tildify-tildify): Return number of substitutions made so that…
(tildify-count): …can be removed.
(tildify-find-env): Accept a new PAIRS argument which was
@@ -3318,7 +3318,7 @@
and instead using or.
* textmodes/tildify.el (tildify-ignored-environments-alist):
- Optimise environments regexes
+ Optimize environments regexes
Each time beginning of an environment to ignore is found,
`tildify-find-env' needs to identify regexp for the ending
@@ -3400,7 +3400,7 @@
The most trivial fix would be to replace `expression' in the
true-part of the if-statement with `aux', but instead, this commit
- optimises `tildify-find-env' by changing it to use `mapconcat'
+ optimizes `tildify-find-env' by changing it to use `mapconcat'
rather than open-coded while-loop.
2014-06-05 Mario Lang <address@hidden>
@@ -16622,7 +16622,7 @@
2013-06-04 Alan Mackenzie <address@hidden>
- Remove faulty optimisation from indentation calculation.
+ Remove faulty optimization from indentation calculation.
* progmodes/cc-engine.el (c-guess-basic-syntax): Don't calculate
search limit based on 2000 characters back from indent-point.
=== modified file 'lisp/org/org.el'
--- a/lisp/org/org.el 2014-10-03 15:44:46 +0000
+++ b/lisp/org/org.el 2014-10-12 20:09:15 +0000
@@ -7571,7 +7571,7 @@
in the current line after point \(see `org-M-RET-may-split-line'
on how to modify this behavior).
-With one universal prefirx argument, set the user option
+With one universal prefix argument, set the user option
`org-insert-heading-respect-content' to t for the duration of
the command. This modifies the behavior described above in this
ways: on list items and at the beginning of normal lines, force
=== modified file 'lisp/progmodes/cc-engine.el'
--- a/lisp/progmodes/cc-engine.el 2014-10-04 04:03:49 +0000
+++ b/lisp/progmodes/cc-engine.el 2014-10-12 20:09:15 +0000
@@ -5162,7 +5162,7 @@
;; Now loop, one decl spot per iteration. We already have the first
;; match in `cfd-match-pos'.
(while (progn
- ;; Go foward over "false matches", one per iteration.
+ ;; Go forward over "false matches", one per iteration.
(while (and
(< cfd-match-pos cfd-limit)
=== modified file 'lisp/progmodes/cc-langs.el'
--- a/lisp/progmodes/cc-langs.el 2014-10-04 04:03:49 +0000
+++ b/lisp/progmodes/cc-langs.el 2014-10-12 20:09:15 +0000
@@ -1591,7 +1591,7 @@
;; The Emacs variables beginning-of-defun-function and end-of-defun-function
;; will be set so that commands like `mark-defun' and `narrow-to-defun' work
;; right. In older Emacsen, the key sequences C-M-a and C-M-e are, however,
-;; bound directly to the CC Mode functions, allowing optimisation for large n.
+;; bound directly to the CC Mode functions, allowing optimization for large n.
;; From Emacs 23, this isn't necessary any more, since n is passed to the two
;; functions.
(c-lang-defconst beginning-of-defun-function
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-10-12 18:02:47 +0000
+++ b/src/ChangeLog 2014-10-12 20:09:15 +0000
@@ -10445,7 +10445,7 @@
(imagemagick_get_animation_cache): Fix a double-free error.
(imagemagick_load_image): Remove the ping_wand code, which only
apparently saved time on invalid animated images, and slowed down
- everything else. Optimise for the common case.
+ everything else. Optimize for the common case.
2013-08-16 Xue Fuqiao <address@hidden>
=== modified file 'src/font.c'
--- a/src/font.c 2014-10-07 16:00:35 +0000
+++ b/src/font.c 2014-10-12 20:09:15 +0000
@@ -1184,14 +1184,14 @@
val = prop[XLFD_ENCODING_INDEX];
if (! NILP (val))
{
- AUTO_STRING (stardash, "*-");
- val = concat2 (stardash, SYMBOL_NAME (val));
+ AUTO_STRING (star_dash, "*-");
+ val = concat2 (star_dash, SYMBOL_NAME (val));
}
}
else if (NILP (prop[XLFD_ENCODING_INDEX]))
{
- AUTO_STRING (dashstar, "-*");
- val = concat2 (SYMBOL_NAME (val), dashstar);
+ AUTO_STRING (dash_star, "-*");
+ val = concat2 (SYMBOL_NAME (val), dash_star);
}
else
{
@@ -5028,7 +5028,7 @@
if (FONTP (arg))
{
Lisp_Object tail, elt;
- AUTO_STRING (equalstr, "=");
+ AUTO_STRING (equal, "=");
val = Ffont_xlfd_name (arg, Qt);
for (tail = AREF (arg, FONT_EXTRA_INDEX); CONSP (tail);
@@ -5038,16 +5038,15 @@
if (EQ (XCAR (elt), QCscript)
&& SYMBOLP (XCDR (elt)))
val = concat3 (val, SYMBOL_NAME (QCscript),
- concat2 (equalstr, SYMBOL_NAME (XCDR (elt))));
+ concat2 (equal, SYMBOL_NAME (XCDR (elt))));
else if (EQ (XCAR (elt), QClang)
&& SYMBOLP (XCDR (elt)))
val = concat3 (val, SYMBOL_NAME (QClang),
- concat2 (equalstr, SYMBOL_NAME (XCDR (elt))));
+ concat2 (equal, SYMBOL_NAME (XCDR (elt))));
else if (EQ (XCAR (elt), QCotf)
&& CONSP (XCDR (elt)) && SYMBOLP (XCAR (XCDR (elt))))
val = concat3 (val, SYMBOL_NAME (QCotf),
- concat2 (equalstr,
- SYMBOL_NAME (XCAR (XCDR (elt)))));
+ concat2 (equal, SYMBOL_NAME (XCAR (XCDR (elt)))));
}
arg = val;
}
=== modified file 'src/keymap.c'
--- a/src/keymap.c 2014-10-08 22:05:48 +0000
+++ b/src/keymap.c 2014-10-12 20:09:15 +0000
@@ -1339,8 +1339,8 @@
*p = 0;
c = reorder_modifiers (c);
- AUTO_STRING (new_modstring, new_mods);
- keystring = concat2 (new_modstring, XCDR (assoc));
+ AUTO_STRING (new_mods_string, new_mods);
+ keystring = concat2 (new_mods_string, XCDR (assoc));
error ("To bind the key %s, use [?%s], not [%s]",
SDATA (SYMBOL_NAME (c)), SDATA (keystring),
@@ -2245,9 +2245,9 @@
if (CONSP (key) && INTEGERP (XCAR (key)) && INTEGERP (XCDR (key)))
/* An interval from a map-char-table. */
{
- AUTO_STRING (dotdot, "..");
+ AUTO_STRING (dot_dot, "..");
return concat3 (Fsingle_key_description (XCAR (key), no_angles),
- dotdot,
+ dot_dot,
Fsingle_key_description (XCDR (key), no_angles));
}
=== modified file 'src/lread.c'
--- a/src/lread.c 2014-10-02 14:01:27 +0000
+++ b/src/lread.c 2014-10-12 20:09:15 +0000
@@ -3661,8 +3661,8 @@
We don't use Fexpand_file_name because that would make
the directory absolute now. */
{
- AUTO_STRING (dotdotlisp, "../lisp/");
- elt = concat2 (dotdotlisp, Ffile_name_nondirectory (elt));
+ AUTO_STRING (dot_dot_lisp, "../lisp/");
+ elt = concat2 (dot_dot_lisp, Ffile_name_nondirectory (elt));
}
}
else if (EQ (elt, Vload_file_name)
=== modified file 'src/process.c'
--- a/src/process.c 2014-10-01 03:28:16 +0000
+++ b/src/process.c 2014-10-12 20:09:15 +0000
@@ -4099,9 +4099,9 @@
#endif
default:
caller = Fnumber_to_string (make_number (connect_counter));
- AUTO_STRING (space_lessthan, " <");
- AUTO_STRING (greaterthan, ">");
- caller = concat3 (space_lessthan, caller, greaterthan);
+ AUTO_STRING (space_less_than, " <");
+ AUTO_STRING (greater_than, ">");
+ caller = concat3 (space_less_than, caller, greater_than);
break;
}
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2014-10-08 22:05:48 +0000
+++ b/test/ChangeLog 2014-10-12 20:09:15 +0000
@@ -313,7 +313,7 @@
2014-06-05 Michal Nazarewicz <address@hidden>
- * automated/tildify-tests.el (tildify-test--test): Optimise the test
+ * automated/tildify-tests.el (tildify-test--test): Optimize the test
slightly by reusing the same temporary buffer across multiple test
cases.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118100: Spelling fixes.,
Paul Eggert <=