From 33848c48a5e8823f44994624443fabdf615292dc Mon Sep 17 00:00:00 2001 From: Mario Lang Date: Mon, 23 Jun 2014 01:12:17 +0200 Subject: [PATCH] "the the", "from from" and "and and". --- doc/misc/ChangeLog | 6 ++++++ doc/misc/org.texi | 2 +- doc/misc/srecode.texi | 2 +- lisp/ChangeLog | 6 ++++++ lisp/net/tramp-adb.el | 2 +- lisp/org/ChangeLog | 6 ++++++ lisp/org/org-bibtex.el | 2 +- lisp/org/org-list.el | 2 +- lisp/textmodes/rst.el | 2 +- src/ChangeLog | 4 ++++ src/w32fns.c | 2 +- 11 files changed, 29 insertions(+), 7 deletions(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index a1a99e5fd06..63cfef5de9f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2014-06-22 Mario Lang + + * srecode.texi (Base Arguments): The the -> to the. + + * org.texi (Images in ODT export): The the -> the. + 2014-06-21 Eli Zaretskii * autotype.texi (Skeleton Language): Document the feature of \n diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 9016459f93a..6466a001f0d 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -12228,7 +12228,7 @@ height:width ratio, do the following @cindex #+ATTR_ODT You can control the manner in which an image is anchored by setting the @code{:anchor} property of it's @code{#+ATTR_ODT} line. You can specify one -of the the following three values for the @code{:anchor} property: +of the following three values for the @code{:anchor} property: @samp{"as-char"}, @samp{"paragraph"} and @samp{"page"}. To create an image that is anchored to a page, do the following: diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi index 3f5609bb252..749bdf09fba 100644 --- a/doc/misc/srecode.texi +++ b/doc/misc/srecode.texi @@ -1191,7 +1191,7 @@ If there is an active region via @code{transient-mark-mode}, or @code{mouse-drag-region}, then the @code{REGION} section will be enabled. -In addition, @code{REGIONTEXT} will be set the the text in the region, +In addition, @code{REGIONTEXT} will be set to the text in the region, and that region of text will be ``killed'' from the current buffer. If standard-output is NOT the current buffer, then the region will not diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e494b7e8e7c..676635b0db8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-06-22 Mario Lang + + * textmodes/rst.el (rst-comment-region): From from -> from. + + * net/tramp-adb.el (tramp-adb-send-command-and-check): And and -> and. + 2013-06-22 Dmitry Antipov * electric.el (electric-layout-post-self-insert-function): diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index f38cecb1c62..b8128407c01 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -1032,7 +1032,7 @@ This happens for Android >= 4.0." (defun tramp-adb-send-command-and-check (vec command) - "Run COMMAND and and check its exit status. + "Run COMMAND and check its exit status. Sends `echo $?' along with the COMMAND for checking the exit status. If COMMAND is nil, just sends `echo $?'. Returns the exit status found." (tramp-adb-send-command diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 569f82dd3d4..0a11eafb959 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,9 @@ +2014-06-22 Mario Lang + + * org-list.el (org-list-insert-item): The the -> the. + + * org-bibtex.el (org-bibtex-fields): The the -> the. + 2013-06-22 Dmitry Antipov * ob-core.el (org-babel-insert-result): Prefer point-min-marker diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el index b6557108845..75ac69ba704 100644 --- a/lisp/org/org-bibtex.el +++ b/lisp/org/org-bibtex.el @@ -203,7 +203,7 @@ (:pages . "One or more page numbers or range of numbers, such as 42-111 or 7,41,73-97 or 43+ (the ‘+’ in this last example indicates pages following that don’t form simple range). BibTEX requires double dashes for page ranges (--).") (:publisher . "The publisher’s name.") (:school . "The name of the school where a thesis was written.") - (:series . "The name of a series or set of books. When citing an entire book, the the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") + (:series . "The name of a series or set of books. When citing an entire book, the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") (:title . "The work’s title, typed as explained in the LaTeX book.") (:type . "The type of a technical report for example, 'Research Note'.") (:volume . "The volume of a journal or multi-volume book.") diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index d24dad28363..92a92491e30 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -1254,7 +1254,7 @@ some heuristics to guess the result." If POS is before first character after bullet of the item, the new item will be created before the current one. -STRUCT is the list structure. PREVS is the the alist of previous +STRUCT is the list structure. PREVS is the alist of previous items, as returned by `org-list-prevs-alist'. Insert a checkbox if CHECKBOX is non-nil, and string AFTER-BULLET diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index b05a5e5a7e3..5ea0b419d22 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -3121,7 +3121,7 @@ newlines as mandated by `comment-line-break-function'." (defun rst-comment-region (beg end &optional arg) "Comment or uncomment the current region. -Region is from from BEG to END. Uncomment if ARG." +Region is from BEG to END. Uncomment if ARG." (save-excursion (if (consp arg) (rst-uncomment-region beg end arg) diff --git a/src/ChangeLog b/src/ChangeLog index ca45462cab3..fe3a570ee3b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-06-22 Mario Lang + + * w32fns.c (Fw32_shell_execute): The the -> the. + 2014-06-22 Dmitry Antipov * xmenu.c (mouse_position_for_popup): diff --git a/src/w32fns.c b/src/w32fns.c index c9a83c98234..057bc95ee94 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6894,7 +6894,7 @@ operations: \"runas\" - run DOCUMENT, which must be an excutable file, with elevated privileges (a.k.a. \"as Administrator\"). \"properties\" - - open the the property sheet dialog for DOCUMENT. + - open the property sheet dialog for DOCUMENT. nil - invoke the default OPERATION, or \"open\" if default is not defined or unavailable. -- 2.11.4.GIT