[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115955: Spelling fixes.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r115955: Spelling fixes. |
Date: |
Fri, 10 Jan 2014 07:10:51 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115955
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2014-01-09 23:10:37 -0800
message:
Spelling fixes.
* mail/unrmail.el (unrmail-mbox-format): Choice is mboxo, not mboxro.
* woman.el (woman-mark-horizontal-position):
Rename from woman-mark-horizonal-position. Use changed.
modified:
doc/misc/autotype.texi
autotype.texi-20091113204419-o5vbwnq5f7feedwu-6289
doc/misc/calc.texi calc.texi-20091113204419-o5vbwnq5f7feedwu-6290
doc/misc/gnus.texi gnus.texi-20091113204419-o5vbwnq5f7feedwu-6305
doc/misc/idlwave.texi
idlwave.texi-20091113204419-o5vbwnq5f7feedwu-6307
etc/ORG-NEWS orgnews-20120426170211-2f5ift22efexnj6i-1
etc/echo.msg echo.msg-20091113204419-o5vbwnq5f7feedwu-1518
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/cedet/semantic/bovine/c.el c.el-20091113204419-o5vbwnq5f7feedwu-11246
lisp/cedet/srecode/map.el map.el-20091113204419-o5vbwnq5f7feedwu-11335
lisp/emacs-lisp/eieio-opt.el
eieioopt.el-20091113204419-o5vbwnq5f7feedwu-10971
lisp/mail/uce.el uce.el-20091113204419-o5vbwnq5f7feedwu-1101
lisp/mail/unrmail.el unrmail.el-20091113204419-o5vbwnq5f7feedwu-511
lisp/progmodes/verilog-mode.el
verilogmode.el-20091113204419-o5vbwnq5f7feedwu-8207
lisp/term/README readme-20091113204419-o5vbwnq5f7feedwu-553
lisp/textmodes/tex-mode.el texmode.el-20091113204419-o5vbwnq5f7feedwu-132
lisp/woman.el woman.el-20091113204419-o5vbwnq5f7feedwu-1805
msdos/inttypes.h inttypes.h-20110430103022-9u31wz13pzkt7g2z-1
nt/inc/inttypes.h inttypes.h-20110427211418-uedsi1uznwqh9pq1-1
src/font.c font.c-20091113204419-o5vbwnq5f7feedwu-8540
test/indent/pascal.pas pascal.pas-20111213152608-1lfkfh2fgqkiq72i-1
=== modified file 'doc/misc/autotype.texi'
--- a/doc/misc/autotype.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/autotype.texi 2014-01-10 07:10:37 +0000
@@ -302,7 +302,7 @@
Various characters usually appear in pairs. When, for example, you insert
an open parenthesis, no matter whether you are programming or writing prose,
you will surely enter a closing one later. By entering both at the same time
-and leaving the cursor inbetween, Emacs can guarantee you that such
+and leaving the cursor in between, Emacs can guarantee you that such
parentheses are always balanced. And if you have a non-qwerty keyboard, where
typing some of the stranger programming language symbols makes you bend your
fingers backwards, this can be quite relieving too.
=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/calc.texi 2014-01-10 07:10:37 +0000
@@ -28053,8 +28053,8 @@
based on a fundamental physical process (although there are efforts to
change this) is the kilogram, which was originally defined as the mass
of one liter of water, but is now defined as the mass of the
-International Prototype Kilogram (IPK), a cylinder of platinum-iridium
-kept at the Bureau International des Poids et Mesures in address@hidden,
+international prototype of the kilogram (IPK), a cylinder of platinum-iridium
+kept at the Bureau international des poids et mesures in address@hidden,
France. (There are several copies of the IPK throughout the world.)
The British imperial units, once defined in terms of physical objects,
were redefined in 1963 in terms of SI units. The US customary units,
=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi 2014-01-01 08:31:29 +0000
+++ b/doc/misc/gnus.texi 2014-01-10 07:10:37 +0000
@@ -10229,8 +10229,8 @@
If given a positive numerical prefix, fetch that many articles back into
the ancestry. If given a negative numerical prefix, fetch just that
ancestor. So if you say @kbd{3 ^}, Gnus will fetch the parent, the
-grandparent and the grandgrandparent of the current article. If you say
address@hidden ^}, Gnus will only fetch the grandgrandparent of the current
+grandparent and the great-grandparent of the current article. If you say
address@hidden ^}, Gnus will only fetch the great-grandparent of the current
article.
@item A R (Summary)
=== modified file 'doc/misc/idlwave.texi'
--- a/doc/misc/idlwave.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/idlwave.texi 2014-01-10 07:10:37 +0000
@@ -591,7 +591,7 @@
Restart Emacs, and re-indent the program we developed in the first part
of this tutorial with @kbd{C-c h} and @kbd{C-M-\}. You may want to keep
-these lines in @file{.emacs}, with values adjusted to your likings. If
+these lines in @file{.emacs}, with values adjusted to your liking. If
you want to get more information about any of these variables, type,
e.g., @kbd{C-h v idlwave-main-block-indent @key{RET}}. To find which
variables can be customized, look for items marked @samp{User Option:}
=== modified file 'etc/ORG-NEWS'
--- a/etc/ORG-NEWS 2014-01-01 07:43:34 +0000
+++ b/etc/ORG-NEWS 2014-01-10 07:10:37 +0000
@@ -1062,7 +1062,7 @@
| =k= | |
[[doc::org-agenda-capture][org-agenda-capture]] |
| C-c , | , | [[doc::org-priority][org-priority]]
|
-** New package and Babel langage
+** New package and Babel language
*** =org-eshell.el= by Konrad Hinsen is now in Org
=== modified file 'etc/echo.msg'
--- a/etc/echo.msg 2007-02-27 03:37:51 +0000
+++ b/etc/echo.msg 2014-01-10 07:10:37 +0000
@@ -69,7 +69,7 @@
-i emulate IBM OS/VU (recursive universes not supported)
- -I emulate IBM VTOS 3.7.6 (chronosynclastic infundibulae
+ -I emulate IBM VTOS 3.7.6 (chronosynclastic infundibula
supported with restrictions documented in IBM VTOS
@@ -207,4 +207,3 @@
Printed 10/28/85 18 January 1983 3
-
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-10 05:39:29 +0000
+++ b/lisp/ChangeLog 2014-01-10 07:10:37 +0000
@@ -1,3 +1,10 @@
+2014-01-10 Paul Eggert <address@hidden>
+
+ Spelling fixes.
+ * mail/unrmail.el (unrmail-mbox-format): Choice is mboxo, not mboxro.
+ * woman.el (woman-mark-horizontal-position):
+ Rename from woman-mark-horizonal-position. Use changed.
+
2014-01-10 Glenn Morris <address@hidden>
* info.el (info-initialize): If running uninstalled, ensure our
=== modified file 'lisp/cedet/semantic/bovine/c.el'
--- a/lisp/cedet/semantic/bovine/c.el 2014-01-01 07:43:34 +0000
+++ b/lisp/cedet/semantic/bovine/c.el 2014-01-10 07:10:37 +0000
@@ -504,7 +504,7 @@
(let ((eval-form (eval parsedtokelist)))
(if (or (not eval-form)
(and (numberp eval-form)
- (equal eval-form 0)));; ifdefline resulted in false
+ (equal eval-form 0)));; ifdef line resulted in false
;; The if indicates to skip this preprocessor section
(let ((pt nil))
@@ -1242,7 +1242,7 @@
(setq scope (semantic-calculate-scope))
(setq allhits (semantic--analyze-refs-full-lookup tag scope t))
-
+
(when (or (zerop (semanticdb-find-result-length allhits))
(and (= (semanticdb-find-result-length allhits) 1)
(eq (car (semanticdb-find-result-nth allhits 0)) tag)))
=== modified file 'lisp/cedet/srecode/map.el'
--- a/lisp/cedet/srecode/map.el 2014-01-01 07:43:34 +0000
+++ b/lisp/cedet/srecode/map.el 2014-01-10 07:10:37 +0000
@@ -80,7 +80,7 @@
ans))
(defmethod srecode-map-entry-for-app ((map srecode-map) app)
- "Return the entry in MAP for APP'lication."
+ "Return the entry in MAP for APP."
(assoc app (oref map apps))
)
@@ -137,7 +137,7 @@
dirty))
(defmethod srecode-map-delete-file-entry-from-app ((map srecode-map) file app)
- "Delete from MAP the FILE entry within the APP'lication."
+ "Delete from MAP the FILE entry within the APP."
(let* ((appe (srecode-map-entry-for-app map app))
(fentry (assoc file (cdr appe))))
(setcdr appe (delete fentry (cdr appe))))
=== modified file 'lisp/emacs-lisp/eieio-opt.el'
--- a/lisp/emacs-lisp/eieio-opt.el 2014-01-09 20:31:21 +0000
+++ b/lisp/emacs-lisp/eieio-opt.el 2014-01-10 07:10:37 +0000
@@ -124,7 +124,7 @@
;; Describe all the methods specific to this class.
(let ((methods (eieio-all-generic-functions class))
(type [":STATIC" ":BEFORE" ":PRIMARY" ":AFTER"])
- counter doc argshl dochl)
+ counter doc)
(when methods
(insert (propertize "Specialized Methods:\n\n" 'face 'bold))
(while methods
=== modified file 'lisp/mail/uce.el'
--- a/lisp/mail/uce.el 2014-01-01 07:43:34 +0000
+++ b/lisp/mail/uce.el 2014-01-10 07:10:37 +0000
@@ -279,7 +279,7 @@
(goto-char (point-min)))
;; Now find the mail hub that first accepted this message.
;; This should try to find the last Received: header.
- ;; Sometimes there may be other headers inbetween Received: headers.
+ ;; Sometimes there may be other headers in between Received: headers.
(cond ((eq uce-mail-reader 'gnus)
;; Does Gnus always have Lines: in the end?
(re-search-forward "^Lines:")
=== modified file 'lisp/mail/unrmail.el'
--- a/lisp/mail/unrmail.el 2014-01-01 07:43:34 +0000
+++ b/lisp/mail/unrmail.el 2014-01-10 07:10:37 +0000
@@ -52,12 +52,12 @@
must be quoted. The `mboxo' format just prepends a \">\" to such lines.
This is not reversible, because given a line starting with \">From \" in
an mboxo file, it is not possible to know whether the original had a \">\"
-or not. The `mxbord' format avoids this by also quoting \">From \" as
+or not. The `mboxrd' format avoids this by also quoting \">From \" as
\">>From \", and so on. For this reason, mboxrd is recommended.
See also `rmail-mbox-format'."
:type '(choice (const mboxrd)
- (const mboxro))
+ (const mboxo))
:version "24.4"
:group 'rmail-files)
=== modified file 'lisp/progmodes/verilog-mode.el'
--- a/lisp/progmodes/verilog-mode.el 2014-01-01 07:43:34 +0000
+++ b/lisp/progmodes/verilog-mode.el 2014-01-10 07:10:37 +0000
@@ -10509,8 +10509,8 @@
(defun verilog-diff-auto ()
"Expand AUTOs in a temporary buffer and indicate any change.
-Whitespace differences are ignored to determine identicalness, but
-once a difference is detected, whitespace differences may be shown.
+Whitespace is ignored when detecting differences, but once a
+difference is detected, whitespace differences may be shown.
To call this from the command line, see \\[verilog-batch-diff-auto].
=== modified file 'lisp/term/README'
--- a/lisp/term/README 2014-01-01 07:43:34 +0000
+++ b/lisp/term/README 2014-01-10 07:10:37 +0000
@@ -55,7 +55,7 @@
terminal mode as on an X console. If there are differences, you can bet
they'll frustrate you after you've forgotten about them.
- For another, the X keysms provide a standard set of names that Emacs knows
+ For another, the X keysyms provide a standard set of names that Emacs knows
about. It tries to bind many of them to useful things at startup, before your
.emacs is read (so you can override them). In some ways, the X keysym standard
is a admittedly poor one; it's incomplete, and not well matched to the set of
=== modified file 'lisp/textmodes/tex-mode.el'
--- a/lisp/textmodes/tex-mode.el 2014-01-01 07:43:34 +0000
+++ b/lisp/textmodes/tex-mode.el 2014-01-10 07:10:37 +0000
@@ -2803,7 +2803,7 @@
(t
(let ((col (current-column)))
(if (or (not (eq (char-syntax (or (char-after pos) ?\s)) ?\())
- ;; Can't be an arg if there's an empty line inbetween.
+ ;; Can't be an arg if there's an empty line in between.
(save-excursion (re-search-forward "^[ \t]*$" pos t)))
;; If the first char was not an open-paren, there's
;; a risk that this is really not an argument to the
=== modified file 'lisp/woman.el'
--- a/lisp/woman.el 2014-01-01 07:43:34 +0000
+++ b/lisp/woman.el 2014-01-10 07:10:37 +0000
@@ -2300,7 +2300,7 @@
;; Process \k escapes BEFORE changing tab width (?):
(goto-char from)
- (woman-mark-horizonal-position)
+ (woman-mark-horizontal-position)
;; Set buffer-local variables:
(setq fill-column woman-fill-column
@@ -3452,7 +3452,7 @@
Each element has the form (KEY VALUE . INC) -- inc may be nil.
Also bound locally in `woman2-roff-buffer'.")
-(defun woman-mark-horizonal-position ()
+(defun woman-mark-horizontal-position ()
"\\kx -- Store current horizontal position in INPUT LINE in register x."
(while (re-search-forward "\\\\k\\(.\\)" nil t)
(goto-char (match-beginning 0))
=== modified file 'msdos/inttypes.h'
--- a/msdos/inttypes.h 2014-01-01 07:43:34 +0000
+++ b/msdos/inttypes.h 2014-01-10 07:10:37 +0000
@@ -1,4 +1,4 @@
-/* Replacement inntypes.h file for building GNU Emacs on MS-DOS with DJGPP.
+/* Replacement inttypes.h file for building GNU Emacs on MS-DOS with DJGPP.
Copyright (C) 2011-2014 Free Software Foundation, Inc.
=== modified file 'nt/inc/inttypes.h'
--- a/nt/inc/inttypes.h 2014-01-01 07:43:34 +0000
+++ b/nt/inc/inttypes.h 2014-01-10 07:10:37 +0000
@@ -1,4 +1,4 @@
-/* Replacement inntypes.h file for building GNU Emacs on Windows with MSVC.
+/* Replacement inttypes.h file for building GNU Emacs on Windows with MSVC.
Copyright (C) 2011-2014 Free Software Foundation, Inc.
=== modified file 'src/font.c'
--- a/src/font.c 2014-01-01 07:43:34 +0000
+++ b/src/font.c 2014-01-10 07:10:37 +0000
@@ -4429,7 +4429,7 @@
LANGSYS is a symbol specifying a langsys tag of OpenType,
GSUB and GPOS, if non-nil, are lists of symbols specifying feature tags.
-If LANGYS is nil, the default langsys is selected.
+If LANGSYS is nil, the default langsys is selected.
The features are applied in the order they appear in the list. The
symbol `*' means to apply all available features not present in this
=== modified file 'test/indent/pascal.pas'
--- a/test/indent/pascal.pas 2014-01-01 07:43:34 +0000
+++ b/test/indent/pascal.pas 2014-01-10 07:10:37 +0000
@@ -688,7 +688,7 @@
NoSound;
RestoreTerminalClearCRT;
WriteLn (StdErr, 'You''re trying to kill me. Since I have break checking
turned off,');
- WriteLn (StdErr, 'I''m not dying, but I''ll do you a favour and
terminate now.');
+ WriteLn (StdErr, 'I''m not dying, but I''ll do you a favor and terminate
now.');
Halt (3)
end;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115955: Spelling fixes.,
Paul Eggert <=