[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106844: Duplicate-word and spelling
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106844: Duplicate-word and spelling fixes. |
Date: |
Tue, 10 Jan 2012 22:53:12 -0800 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106844
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2012-01-10 22:53:12 -0800
message:
Duplicate-word and spelling fixes.
modified:
admin/notes/multi-tty
admin/quick-install-emacs
doc/emacs/fixit.texi
doc/misc/org.texi
lisp/ChangeLog
lisp/cedet/semantic/decorate/include.el
lisp/cedet/semantic/grammar.el
lisp/cedet/srecode/ctxt.el
lisp/emacs-lisp/byte-opt.el
lisp/emacs-lisp/checkdoc.el
lisp/emulation/keypad.el
lisp/htmlfontify.el
lisp/mail/mail-extr.el
lisp/mh-e/ChangeLog.1
lisp/progmodes/etags.el
lisp/progmodes/hideshow.el
lisp/progmodes/idlw-shell.el
lisp/progmodes/mixal-mode.el
src/bidi.c
src/dispnew.c
src/keyboard.c
=== modified file 'admin/notes/multi-tty'
--- a/admin/notes/multi-tty 2012-01-05 09:46:05 +0000
+++ b/admin/notes/multi-tty 2012-01-11 06:53:12 +0000
@@ -789,7 +789,7 @@
frame's kboard from there.)
-- Fix rif issue with X-tty combo sessions. IMHO the best thing to do
- is to get rid of that global variable (and use the value value in
+ is to get rid of that global variable (and use the value in
display_method, which is guaranteed to be correct).
(Done, did exactly that. Core dumps during combo sessions became
=== modified file 'admin/quick-install-emacs'
--- a/admin/quick-install-emacs 2012-01-05 09:46:05 +0000
+++ b/admin/quick-install-emacs 2012-01-11 06:53:12 +0000
@@ -49,7 +49,7 @@
REMOVE='rm -r'
MKDIR='mkdir -p'
-# Used to execute commands once once we create them
+# Used to execute commands once we create them
EXEC='sh'
NAWK=/usr/bin/nawk
=== modified file 'doc/emacs/fixit.texi'
--- a/doc/emacs/fixit.texi 2012-01-05 09:46:05 +0000
+++ b/doc/emacs/fixit.texi 2012-01-11 06:53:12 +0000
@@ -356,7 +356,7 @@
In Text mode and related modes, @address@hidden
(@code{ispell-complete-word}) performs in-buffer completion based on
spelling correction. Insert the beginning of a word, and then type
address@hidden@key{TAB}}; this shows shows a list of completions. (If your
address@hidden@key{TAB}}; this shows a list of completions. (If your
window manager intercepts @address@hidden, type @address@hidden
@key{TAB}} or @kbd{C-M-i}.) Each completion is listed with a digit or
character; type that digit or character to choose it.
=== modified file 'doc/misc/org.texi'
--- a/doc/misc/org.texi 2012-01-10 06:20:22 +0000
+++ b/doc/misc/org.texi 2012-01-11 06:53:12 +0000
@@ -7342,7 +7342,7 @@
very likely prefer to store anniversaries in BBDB rather than in a
separate Org or diary file. Org supports this and will show BBDB
anniversaries as part of the agenda. All you need to do is to add the
-following to one your your agenda files:
+following to one of your agenda files:
@example
* Anniversaries
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-01-11 02:37:31 +0000
+++ b/lisp/ChangeLog 2012-01-11 06:53:12 +0000
@@ -7131,7 +7131,7 @@
2011-05-23 Kevin Ryde <address@hidden>
* emacs-lisp/advice.el (ad-read-advised-function):
- Use `function-called-at-point' as the default default, if it has
+ Use `function-called-at-point' as the default, if it has
advice and passes PREDICATE.
2011-05-23 Stefan Monnier <address@hidden>
@@ -7957,7 +7957,7 @@
* net/gnutls.el (gnutls-negotiate): Add hostname, verify-flags,
verify-error, and verify-hostname-error parameters. Check whether
default trustfile exists before going to use it. Add missing
- argument to gnutls-message-maybe call. Return return value.
+ argument to gnutls-message-maybe call. Return value.
Reported by Claudio Bley <address@hidden>.
(open-gnutls-stream): Add usage example.
=== modified file 'lisp/cedet/semantic/decorate/include.el'
--- a/lisp/cedet/semantic/decorate/include.el 2012-01-05 09:46:05 +0000
+++ b/lisp/cedet/semantic/decorate/include.el 2012-01-11 06:53:12 +0000
@@ -45,7 +45,7 @@
(defvar semantic-decoratiton-mouse-3 (if (featurep 'xemacs) [ button3 ] [
mouse-3 ])
"The keybinding lisp object to use for binding the right mouse button.")
-;;; Includes that that are in a happy state!
+;;; Includes that are in a happy state!
;;
(defface semantic-decoration-on-includes
nil
=== modified file 'lisp/cedet/semantic/grammar.el'
--- a/lisp/cedet/semantic/grammar.el 2012-01-05 09:46:05 +0000
+++ b/lisp/cedet/semantic/grammar.el 2012-01-11 06:53:12 +0000
@@ -451,7 +451,7 @@
',(semantic-grammar-keyword-properties keywords))))
(define-overloadable-function semantic-grammar-keywordtable-builder ()
- "Return the keyword table table value.")
+ "Return the keyword table value.")
;;; Token table builder
;;
=== modified file 'lisp/cedet/srecode/ctxt.el'
--- a/lisp/cedet/srecode/ctxt.el 2012-01-05 09:46:05 +0000
+++ b/lisp/cedet/srecode/ctxt.el 2012-01-11 06:53:12 +0000
@@ -41,7 +41,7 @@
(define-overload srecode-calculate-context ()
"Calculate the context at the current point.
The returned context is a list, with the top-most context first.
-Each returned context is a string that that would show up in a `context'
+Each returned context is a string that would show up in a `context'
statement in an `.srt' file.
Some useful context values used by the provided srecode templates are:
=== modified file 'lisp/emacs-lisp/byte-opt.el'
--- a/lisp/emacs-lisp/byte-opt.el 2012-01-05 09:46:05 +0000
+++ b/lisp/emacs-lisp/byte-opt.el 2012-01-11 06:53:12 +0000
@@ -1574,7 +1574,7 @@
;; stack-set-X+1 stack-ref-X --> dup stack-set-X+2
;; but this is a very minor gain, since dup is stack-ref-0,
;; i.e. it's only better if X>5, and even then it comes
- ;; at the cost cost of an extra stack slot. Let's not bother.
+ ;; at the cost of an extra stack slot. Let's not bother.
((and (eq 'byte-varref (car lap2))
(eq (cdr lap1) (cdr lap2))
(memq (car lap1) '(byte-varset byte-varbind)))
=== modified file 'lisp/emacs-lisp/checkdoc.el'
--- a/lisp/emacs-lisp/checkdoc.el 2012-01-05 09:46:05 +0000
+++ b/lisp/emacs-lisp/checkdoc.el 2012-01-11 06:53:12 +0000
@@ -1943,7 +1943,7 @@
A code fragment is identified by an open parenthesis followed by a
symbol which is a valid function or a word in all CAPS, or a parenthesis
that is quoted with the ' character. Only the region from START to LIMIT
-is is allowed while searching for the bounding parenthesis."
+is allowed while searching for the bounding parenthesis."
(save-match-data
(save-restriction
(narrow-to-region start limit)
=== modified file 'lisp/emulation/keypad.el'
--- a/lisp/emulation/keypad.el 2012-01-05 09:46:05 +0000
+++ b/lisp/emulation/keypad.el 2012-01-11 06:53:12 +0000
@@ -27,7 +27,7 @@
;;
;; With the following setup, the keypad can be used for numeric data
;; entry when NumLock is off, and to give numeric prefix arguments to
-;; emacs commands, when NumLock on on.
+;; emacs commands, when NumLock is on.
;;
;; keypad-setup => Plain Numeric Keypad
;; keypad-numlock-setup => Prefix numeric args
=== modified file 'lisp/htmlfontify.el'
--- a/lisp/htmlfontify.el 2012-01-05 11:49:08 +0000
+++ b/lisp/htmlfontify.el 2012-01-11 06:53:12 +0000
@@ -861,7 +861,7 @@
\(A specification with a class of t is considered to match any class you
specify - this matches Emacs' behavior when deciding on which face attributes
to use, to the best of my understanding).\n
-If CLASS is nil, then you just get get whatever `face-attr-construct' returns,
+If CLASS is nil, then you just get whatever `face-attr-construct' returns,
ie the current specification in effect for FACE.\n
*NOTE*: This function forces any face that is not 'default and which has
no :inherit property to inherit from 'default (this is because 'default
=== modified file 'lisp/mail/mail-extr.el'
--- a/lisp/mail/mail-extr.el 2012-01-05 09:46:05 +0000
+++ b/lisp/mail/mail-extr.el 2012-01-11 06:53:12 +0000
@@ -394,7 +394,7 @@
;; Matches ham radio call signs.
;; Help from: Mat Maessen N2NJZ <address@hidden>, Mark Feit
;; <address@hidden>, Michael Covington <address@hidden>.
-;; Examples: DX504 DX515 K5MRU K8DHK KA9WGN KA9WGN KD3FU KD6EUI KD6HBW
+;; Examples: DX504 DX515 K5MRU K8DHK KA9WGN KD3FU KD6EUI KD6HBW
;; KE9TV KF0NV N1API N3FU N3GZE N3IGS N4KCC N7IKQ N9HHU W4YHF W6ANK WA2SUH
;; WB7VZI N2NJZ NR3G KJ4KK AB4UM AL7NI KH6OH WN3KBT N4TMI W1A N0NZO
(defconst mail-extr-ham-call-sign-pattern
=== modified file 'lisp/mh-e/ChangeLog.1'
--- a/lisp/mh-e/ChangeLog.1 2012-01-05 09:46:05 +0000
+++ b/lisp/mh-e/ChangeLog.1 2012-01-11 06:53:12 +0000
@@ -2898,7 +2898,7 @@
2003-06-01 Peter S Galbraith <address@hidden>
- * mh-comp.el (mh-modify-header-field): Bug fix. Calling with with
+ * mh-comp.el (mh-modify-header-field): Bug fix. Calling with
a value that was already inserted causes it to get inserted a
second time. I have wrapped the value around \b word delimiters.
Hope there are no side effects for other code.
@@ -9952,7 +9952,7 @@
* mh-mime.el (compilation): Code rearrangement to remove compiler
warnings.
(mh-defun-compat): New macro to define to useful functions that
- aren't present present in old Gnus.
+ aren't present in old Gnus.
(mh-destroy-postponed-handles): New function to cleanup handles
that are associated with external viewers.
(mh-handle-set-external-undisplayer): New function to replace
=== modified file 'lisp/progmodes/etags.el'
--- a/lisp/progmodes/etags.el 2012-01-05 09:46:05 +0000
+++ b/lisp/progmodes/etags.el 2012-01-11 06:53:12 +0000
@@ -463,7 +463,7 @@
;; Subroutine of visit-tags-table-buffer. Search the current tags tables
;; for one that has tags for THIS-FILE (or that includes a table that
-;; does). Return the name of the first table table listing THIS-FILE; if
+;; does). Return the name of the first table listing THIS-FILE; if
;; the table is one included by another table, it is the master table that
;; we return. If CORE-ONLY is non-nil, check only tags tables that are
;; already in buffers--don't visit any new files.
=== modified file 'lisp/progmodes/hideshow.el'
--- a/lisp/progmodes/hideshow.el 2012-01-05 09:46:05 +0000
+++ b/lisp/progmodes/hideshow.el 2012-01-11 06:53:12 +0000
@@ -604,7 +604,7 @@
as cdr."
(save-excursion
;; the idea is to look backwards for a comment start regexp, do a
- ;; forward comment, and see if we are inside, then extend extend
+ ;; forward comment, and see if we are inside, then extend
;; forward and backward as long as we have comments
(let ((q (point)))
(when (or (looking-at hs-c-start-regexp)
=== modified file 'lisp/progmodes/idlw-shell.el'
--- a/lisp/progmodes/idlw-shell.el 2012-01-05 09:46:05 +0000
+++ b/lisp/progmodes/idlw-shell.el 2012-01-11 06:53:12 +0000
@@ -227,7 +227,7 @@
"Obsolete variable. See `idlwave-shell-debug-modifiers'.")
(defcustom idlwave-shell-use-truename nil
- "*Non-nil means, use use `file-truename' when looking for buffers.
+ "*Non-nil means, use `file-truename' when looking for buffers.
If this variable is non-nil, Emacs will use the function `file-truename' to
resolve symbolic links in the file paths printed by e.g., STOP commands.
This means, unvisited files will be loaded under their truename.
=== modified file 'lisp/progmodes/mixal-mode.el'
--- a/lisp/progmodes/mixal-mode.el 2012-01-05 09:46:05 +0000
+++ b/lisp/progmodes/mixal-mode.el 2012-01-11 06:53:12 +0000
@@ -145,43 +145,43 @@
(LD1 loading "load I1" 9 field
"Put in rI1 the contents of cell no. M.
Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
2)
(LD2 loading "load I2" 10 field
"Put in rI2 the contents of cell no. M.
Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
2)
(LD3 loading "load I3" 11 field
"Put in rI3 the contents of cell no. M.
Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
2)
(LD4 loading "load I4" 12 field
"Put in rI4 the contents of cell no. M.
Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
2)
(LD5 loading "load I5" 13 field
"Put in rI5 the contents of cell no. M.
Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
2)
(LD6 loading "load I6" 14 field
"Put in rI6 the contents of cell no. M.
Uses a + when there is no sign in subfield. Subfield is left padded with
-zeros to make a word. Index registers only have 2 bytes and a sign, Trying
-to set anything more that that will result in undefined behavior."
+zeros to make a word. Index registers only have 2 bytes and a sign; trying
+to set anything more than that will result in undefined behavior."
2)
(LDAN loading "load A negative" 16 field
@@ -200,7 +200,7 @@
"Put in rI1 the contents of cell no. M, with opposite sign.
Uses a + when there is no sign in subfield, otherwise use the opposite sign.
Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
in undefined behavior."
2)
@@ -208,7 +208,7 @@
"Put in rI2 the contents of cell no. M, with opposite sign.
Uses a + when there is no sign in subfield, otherwise use the opposite sign.
Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
in undefined behavior."
2)
@@ -216,7 +216,7 @@
"Put in rI3 the contents of cell no. M, with opposite sign.
Uses a + when there is no sign in subfield, otherwise use the opposite sign.
Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
in undefined behavior."
2)
@@ -224,7 +224,7 @@
"Put in rI4 the contents of cell no. M, with opposite sign.
Uses a + when there is no sign in subfield, otherwise use the opposite sign.
Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
in undefined behavior."
2)
@@ -232,7 +232,7 @@
"Put in rI5 the contents of cell no. M, with opposite sign.
Uses a + when there is no sign in subfield, otherwise use the opposite sign.
Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
in undefined behavior."
2)
@@ -240,7 +240,7 @@
"Put in rI6 the contents of cell no. M, with opposite sign.
Uses a + when there is no sign in subfield, otherwise use the opposite sign.
Subfield is left padded with zeros to make a word. Index registers only
-have 2 bytes and a sign, Trying to set anything more that that will result
+have 2 bytes and a sign; trying to set anything more than that will result
in undefined behavior."
2)
=== modified file 'src/bidi.c'
--- a/src/bidi.c 2012-01-05 09:46:05 +0000
+++ b/src/bidi.c 2012-01-11 06:53:12 +0000
@@ -572,7 +572,7 @@
bidi_copy_it (bidi_it, &bidi_cache[i]);
bidi_cache_last_idx = i;
- /* Don't let scan direction from from the cached state override
+ /* Don't let scan direction from the cached state override
the current scan direction. */
bidi_it->scan_dir = current_scan_dir;
return bidi_it->type;
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2012-01-05 09:46:05 +0000
+++ b/src/dispnew.c 2012-01-11 06:53:12 +0000
@@ -62,7 +62,7 @@
#include <errno.h>
/* Get number of chars of output now in the buffer of a stdio stream.
- This ought to be built in in stdio, but it isn't. Some s- files
+ This ought to be built in stdio, but it isn't. Some s- files
override this because their stdio internals differ. */
#ifdef __GNU_LIBRARY__
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2012-01-05 09:46:05 +0000
+++ b/src/keyboard.c 2012-01-11 06:53:12 +0000
@@ -2239,8 +2239,8 @@
polling_stopped_here = 0; } while (0)
/* read a character from the keyboard; call the redisplay if needed */
-/* commandflag 0 means do not do auto-saving, but do do redisplay.
- -1 means do not do redisplay, but do do autosaving.
+/* commandflag 0 means do not autosave, but do redisplay.
+ -1 means do not redisplay, but do autosave.
1 means do both. */
/* The arguments MAPS and NMAPS are for menu prompting.
@@ -5133,7 +5133,7 @@
if (WINDOWP (window))
{
- /* It's a click in window window at frame coordinates (x,y) */
+ /* It's a click in window WINDOW at frame coordinates (X,Y) */
struct window *w = XWINDOW (window);
Lisp_Object string_info = Qnil;
EMACS_INT textpos = -1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106844: Duplicate-word and spelling fixes.,
Paul Eggert <=