summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMario Lang <mlang@delysid.org>2010-01-15 18:51:50 -0800
committerGlenn Morris <rgm@gnu.org>2010-01-15 18:51:50 -0800
commit045b9da7879353dfcba2264cfcd0ba0353669846 (patch)
treee858f773aed495a224e2720f9317d7fd02d0ae38
parentf0d138880a572e2b064d5af2668cd3a54a1d0a1e (diff)
downloademacs-045b9da7879353dfcba2264cfcd0ba0353669846.tar.gz
Mario Lang <mlang@delysid.org>: Remove some duplicated words.
* cedet/ede/cpp-root.el (ede-cpp-root-project): * cedet/ede/files.el (ede-expand-filename): * cedet/ede/simple.el (ede-simple-project): * cedet/semantic/complete.el (semantic-complete-read-tag-engine) (semantic-complete-inline-tag-engine): * cedet/semantic/db-el.el (semanticdb-equivalent-mode): * cedet/semantic/db-global.el (semanticdb-equivalent-mode): * cedet/semantic/db-javascript.el (semanticdb-equivalent-mode): * cedet/semantic/db.el (semanticdb-equivalent-mode): * cedet/semantic/decorate/include.el (semantic-decoration-unknown-include-describe): * cedet/semantic/idle.el (semantic-idle-work-for-one-buffer): * emacs-lisp/chart.el (chart-translate-namezone): * textmodes/artist.el (artist-compute-popup-menu-table): Remove duplicated words in doc-strings. * srecode/doc-cpp.srt, srecode/doc-default.srt: * srecode/doc-java.srt: Remove duplicated words. * ede.texi (ede-target): * org.texi (Refiling notes): Remove duplicated words.
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/ede.texi2
-rw-r--r--doc/misc/org.texi2
-rw-r--r--etc/ChangeLog5
-rw-r--r--etc/srecode/doc-cpp.srt4
-rw-r--r--etc/srecode/doc-default.srt4
-rw-r--r--etc/srecode/doc-java.srt4
-rw-r--r--lib-src/etags.c2
-rw-r--r--lisp/ChangeLog19
-rw-r--r--lisp/cedet/ede/cpp-root.el2
-rw-r--r--lisp/cedet/ede/files.el2
-rw-r--r--lisp/cedet/ede/simple.el2
-rw-r--r--lisp/cedet/semantic/complete.el6
-rw-r--r--lisp/cedet/semantic/db-el.el2
-rw-r--r--lisp/cedet/semantic/db-global.el2
-rw-r--r--lisp/cedet/semantic/db-javascript.el2
-rw-r--r--lisp/cedet/semantic/db.el4
-rw-r--r--lisp/cedet/semantic/decorate/include.el2
-rw-r--r--lisp/cedet/semantic/idle.el2
-rw-r--r--lisp/emacs-lisp/chart.el2
-rw-r--r--lisp/emulation/edt.el2
-rw-r--r--lisp/textmodes/artist.el2
22 files changed, 53 insertions, 26 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c4ef9ebf3ae..471d57ed11b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-16 Mario Lang <mlang@delysid.org>
+
+ * ede.texi (ede-target):
+ * org.texi (Refiling notes): Remove duplicated words.
+
2010-01-04 Stefan Monnier <monnier@iro.umontreal.ca>
* gnus.texi (Posting Styles): Use with-current-buffer.
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 189c52f446f..bfeef343f09 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -1968,7 +1968,7 @@ Retrieves the slot @code{sourcetype} from an object of class @code{ede-target}
@deffn Method ede-expand-filename :AFTER this filename &optional force
Return a fully qualified file name based on target @var{THIS}.
-@var{FILENAME} should a a filename which occurs in a directory in which @var{THIS} works.
+@var{FILENAME} should be a filename which occurs in a directory in which @var{THIS} works.
Optional argument @var{FORCE} forces the default filename to be provided even if it
doesn't exist.
@end deffn
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 789e64abc35..507dfad5c31 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -6181,7 +6181,7 @@ See the variable @code{org-refile-targets} for details. If you would like to
select a location via a file-path-like completion along the outline path, see
the variables @code{org-refile-use-outline-path} and
@code{org-outline-path-complete-in-steps}. If you would like to be able to
-create new nodes as new parents for for refiling on the fly, check the
+create new nodes as new parents for refiling on the fly, check the
variable @code{org-refile-allow-creating-parent-nodes}.
@kindex C-u C-c C-w
@item C-u C-c C-w
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 15530e5d59f..a5ab8ee4452 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-16 Mario Lang <mlang@delysid.org>
+
+ * srecode/doc-cpp.srt, srecode/doc-default.srt:
+ * srecode/doc-java.srt: Remove duplicated words.
+
2010-01-14 Nick Roberts <nickrob@snap.net.nz>
* etc/images/gud/recstart.xpm, etc/images/gud/recstop.xpm:
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index fce0d283d7d..2abe572e396 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -58,7 +58,7 @@ Recycle doxygen comment code from the more general template set."
----
template group-comment-end :blank :indent
-"A comment occurring at the end of a a group of declarations.
+"A comment occurring at the end of a group of declarations.
Recycle doxygen comment code from the more general template set."
----
{{>:classdecl:doxygen-function-group-end}}
@@ -75,7 +75,7 @@ Recycle doxygen comment code from the more general template set."
----
template group-comment-end :blank :indent
-"A comment occurring at the end of a a group of declarations.
+"A comment occurring at the end of a group of declarations.
Recycle doxygen comment code from the more general template set."
----
{{>:classdecl:doxygen-function-group-end}}
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index f07849b9207..2d3094df60d 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -57,7 +57,7 @@ template group-comment-start :blank :indent
----
template group-comment-end :indent
-"A comment occurring at the end of a a group of declarations."
+"A comment occurring at the end of a group of declarations."
----
{{comment_start}} End {{?GROUPNAME}} {{comment_end}}
----
@@ -72,7 +72,7 @@ template group-comment-start :blank :indent
----
template group-comment-end :indent
-"A comment occurring at the end of a a group of declarations."
+"A comment occurring at the end of a group of declarations."
----
{{>:declaration:group-comment-end}}
----
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index cb289913f36..f6ef6c9aea3 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -59,7 +59,7 @@ Recycle javadoc comment code from the more general template set."
----
template group-comment-end :blank :indent
-"A comment occurring at the end of a a group of declarations.
+"A comment occurring at the end of a group of declarations.
Recycle javadoc comment code from the more general template set."
----
{{>:classdecl:javadoc-function-group-end}}
@@ -76,7 +76,7 @@ Recycle javadoc comment code from the more general template set."
----
template group-comment-end :blank :indent
-"A comment occurring at the end of a a group of declarations.
+"A comment occurring at the end of a group of declarations.
Recycle javadoc comment code from the more general template set."
----
{{>:classdecl:javadoc-function-group-end}}
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 8cdd47957f6..d49dcf930af 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -6297,7 +6297,7 @@ readline (lbp, stream)
readline (lbp, stream);
return;
} /* if a real #line directive */
- } /* if #line is followed by a a number */
+ } /* if #line is followed by a number */
} /* if line begins with "#line " */
/* If we are here, no #line directive was found. */
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e08889ba61..ea7435c559d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-16 Mario Lang <mlang@delysid.org>
+
+ * cedet/ede/cpp-root.el (ede-cpp-root-project):
+ * cedet/ede/files.el (ede-expand-filename):
+ * cedet/ede/simple.el (ede-simple-project):
+ * cedet/semantic/complete.el (semantic-complete-read-tag-engine)
+ (semantic-complete-inline-tag-engine):
+ * cedet/semantic/db-el.el (semanticdb-equivalent-mode):
+ * cedet/semantic/db-global.el (semanticdb-equivalent-mode):
+ * cedet/semantic/db-javascript.el (semanticdb-equivalent-mode):
+ * cedet/semantic/db.el (semanticdb-equivalent-mode):
+ * cedet/semantic/decorate/include.el (semantic-decoration-unknown-include-describe):
+ * cedet/semantic/idle.el (semantic-idle-work-for-one-buffer):
+ * emacs-lisp/chart.el (chart-translate-namezone):
+ * textmodes/artist.el (artist-compute-popup-menu-table):
+ Remove duplicated words in doc-strings.
+
2010-01-15 David Abrahams <dave@boostpro.com> (tiny change)
* net/mairix.el (mairix-widget-send-query): Send -1 instead of nil
@@ -1473,7 +1490,7 @@
2009-12-01 Dan Nicolaescu <dann@ics.uci.edu>
Make vc-print-log buttons work.
- * log-view.el (log-view-mode-map): Inherit from from widget-keymap.
+ * log-view.el (log-view-mode-map): Inherit from widget-keymap.
2009-11-30 Ryan C. Thompson <rct@thompsonclan.org> (tiny change)
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index ec04dd57c7a..1592c3c2f5d 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -324,7 +324,7 @@ exist, it should return nil."
)
)
"EDE cpp-root project class.
-Each directory needs a a project file to control it.")
+Each directory needs a project file to control it.")
;;; INIT
;;
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el
index bdb9268a030..2f86b766158 100644
--- a/lisp/cedet/ede/files.el
+++ b/lisp/cedet/ede/files.el
@@ -487,7 +487,7 @@ doesn't exist."
(defmethod ede-expand-filename ((this ede-target) filename &optional force)
"Return a fully qualified file name based on target THIS.
-FILENAME should a a filename which occurs in a directory in which THIS works.
+FILENAME should be a filename which occurs in a directory in which THIS works.
Optional argument FORCE forces the default filename to be provided even if it
doesn't exist."
(ede-expand-filename (ede-target-parent this) filename force))
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el
index 64bf047736e..e0a526e9ead 100644
--- a/lisp/cedet/ede/simple.el
+++ b/lisp/cedet/ede/simple.el
@@ -87,7 +87,7 @@ All directories need at least one target.")
(file-header-line :initform ";; EDE Simple Project")
)
"EDE Simple project class.
-Each directory needs a a project file to control it.")
+Each directory needs a project file to control it.")
(defmethod ede-commit-project ((proj ede-simple-project))
"Commit any change to PROJ to its file."
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index eed31e4c2ad..fa9ebed9263 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -192,7 +192,7 @@ Keeps STRINGS only in the history.")
default-tag initial-input
history)
"Read a semantic tag, and return a tag for the selection.
-Argument COLLECTOR is an object which can be used to to calculate
+Argument COLLECTOR is an object which can be used to calculate
a list of possible hits. See `semantic-completion-collector-engine'
for details on COLLECTOR.
Argument DISPLAYOR is an object used to display a list of possible
@@ -394,7 +394,7 @@ Return value can be:
;;; Keybindings
;;
-;; Keys are bound to to perform completion using our mechanisms.
+;; Keys are bound to perform completion using our mechanisms.
;; Do that work here.
(defun semantic-complete-done ()
"Accept the current input."
@@ -738,7 +738,7 @@ DO NOT CALL THIS IF THE INLINE COMPLETION ENGINE IS NOT ACTIVE."
(defun semantic-complete-inline-tag-engine
(collector displayor buffer start end)
"Perform completion based on semantic tags in a buffer.
-Argument COLLECTOR is an object which can be used to to calculate
+Argument COLLECTOR is an object which can be used to calculate
a list of possible hits. See `semantic-completion-collector-engine'
for details on COLLECTOR.
Argument DISPLAYOR is an object used to display a list of possible
diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index 865d775c7cb..d46f727fca6 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -107,7 +107,7 @@ For Emacs Lisp, creates a specialized table."
(defmethod semanticdb-equivalent-mode ((table semanticdb-table-emacs-lisp) &optional buffer)
"Return non-nil if TABLE's mode is equivalent to BUFFER.
-Equivalent modes are specified by by `semantic-equivalent-major-modes'
+Equivalent modes are specified by the `semantic-equivalent-major-modes'
local variable."
(with-current-buffer buffer
(eq (or mode-local-active-mode major-mode) 'emacs-lisp-mode)))
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el
index aba045d64d8..bfd97fc5a54 100644
--- a/lisp/cedet/semantic/db-global.el
+++ b/lisp/cedet/semantic/db-global.el
@@ -105,7 +105,7 @@ is not available for this directory."
(defmethod semanticdb-equivalent-mode ((table semanticdb-table-global) &optional buffer)
"Return t, pretend that this table's mode is equivalent to BUFFER.
-Equivalent modes are specified by by `semantic-equivalent-major-modes'
+Equivalent modes are specified by the `semantic-equivalent-major-modes'
local variable."
;; @todo - hack alert!
t)
diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el
index d99b60cc66c..2e357e677e2 100644
--- a/lisp/cedet/semantic/db-javascript.el
+++ b/lisp/cedet/semantic/db-javascript.el
@@ -145,7 +145,7 @@ Create one of our special tables that can act as an intermediary."
(defmethod semanticdb-equivalent-mode ((table semanticdb-table-javascript) &optional buffer)
"Return non-nil if TABLE's mode is equivalent to BUFFER.
-Equivalent modes are specified by by `semantic-equivalent-major-modes'
+Equivalent modes are specified by the `semantic-equivalent-major-modes'
local variable."
(with-current-buffer buffer
(eq (or mode-local-active-mode major-mode) 'javascript-mode)))
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index 811bc985f35..3f638a212f0 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -735,13 +735,13 @@ all files of any type."
(defmethod semanticdb-equivalent-mode ((table semanticdb-abstract-table) &optional buffer)
"Return non-nil if TABLE's mode is equivalent to BUFFER.
-Equivalent modes are specified by by `semantic-equivalent-major-modes'
+Equivalent modes are specified by the `semantic-equivalent-major-modes'
local variable."
nil)
(defmethod semanticdb-equivalent-mode ((table semanticdb-table) &optional buffer)
"Return non-nil if TABLE's mode is equivalent to BUFFER.
-Equivalent modes are specified by by `semantic-equivalent-major-modes'
+Equivalent modes are specified by the `semantic-equivalent-major-modes'
local variable."
(save-excursion
(if buffer (set-buffer buffer))
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index dec01336ae1..94273dcfaf7 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -461,7 +461,7 @@ wrap existing project code for Semantic's benifit.
(when (or (eq mm 'c++-mode) (eq mm 'c-mode))
(princ "
-For C/C++ includes located within a a project, you can use a special
+For C/C++ includes located within a project, you can use a special
EDE project that will wrap an existing build system. You can do that
like this in your .emacs file:
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index dddfaca0f83..cf107232645 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -336,7 +336,7 @@ Disable to prevent lots of excessive parsing in idle time."
(defun semantic-idle-work-for-one-buffer (buffer)
- "Do long-processing work for for BUFFER.
+ "Do long-processing work for BUFFER.
Uses `semantic-safe' and returns the output.
Returns t of all processing succeeded."
(with-current-buffer buffer
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index f4c3bfa90a0..4f01e540601 100644
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -323,7 +323,7 @@ MARGIN, ZONE, START, and END specify restrictions in chart space."
(defmethod chart-translate-namezone ((c chart) n)
"Return a dot-pair representing a positional range for a name.
The name in chart C of the Nth name resides.
-Automatically compensates for for direction."
+Automatically compensates for direction."
(let* ((dir (oref c direction))
(w (if (eq dir 'vertical) (oref c x-width) (oref c y-width)))
(m (if (eq dir 'vertical) (oref c y-margin) (oref c x-margin)))
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 40c7d887c29..2abde59af90 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -2107,7 +2107,7 @@ created."
(setq edt-term "pc")
(if (or (not edt-window-system) (eq edt-window-system 'tty))
(setq edt-term (getenv "TERM"))))
- ;; Look for for terminal configuration file for this terminal type.
+ ;; Look for a terminal configuration file for this terminal type.
;; Otherwise, load the user's custom configuration file.
(if (or (not edt-window-system) (memq edt-window-system '(pc tty)))
(progn
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index 00896be3c6e..137f358970c 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -1477,7 +1477,7 @@ Keymap summary
;
(defun artist-compute-popup-menu-table (menu-table)
- "Create a menu from from MENU-TABLE data.
+ "Create a menu from MENU-TABLE data.
The returned value is suitable for the `x-popup-menu' function."
(cons "Artist menu"
(artist-compute-popup-menu-table-sub menu-table)))