diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/tramp-adb.el | 2 | ||||
| -rw-r--r-- | lisp/org/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/org/org-bibtex.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-list.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/rst.el | 2 |
6 files changed, 16 insertions, 4 deletions
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 <mlang@delysid.org> + + * 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 <dmantipov@yandex.ru> * 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 <mlang@delysid.org> + + * org-list.el (org-list-insert-item): The the -> the. + + * org-bibtex.el (org-bibtex-fields): The the -> the. + 2013-06-22 Dmitry Antipov <dmantipov@yandex.ru> * 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) |