emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-26 50f711e: Fix some duplicate words typos


From: Glenn Morris
Subject: [Emacs-diffs] emacs-26 50f711e: Fix some duplicate words typos
Date: Fri, 27 Oct 2017 20:45:57 -0400 (EDT)

branch: emacs-26
commit 50f711e7fab149d11da8c5caa61ee0b5e6c89bf1
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Fix some duplicate words typos
    
    * lisp/erc/erc.el (erc-hide-current-message-p):
    * lisp/progmodes/flymake-proc.el (flymake-proc-diagnostic-type-pred):
    * doc/lispref/display.texi (Bidirectional Display, Delayed Warnings):
    * doc/lispref/functions.texi (Defining Functions):
    * doc/lispref/os.texi (Terminal-Specific):
    * doc/misc/sem-user.texi (Analyzer Debug):
    * doc/misc/srecode.texi (Special Variables): Fix typos.
---
 admin/make-tarball.txt         | 2 +-
 doc/lispref/display.texi       | 4 ++--
 doc/lispref/functions.texi     | 2 +-
 doc/lispref/os.texi            | 2 +-
 doc/misc/sem-user.texi         | 2 +-
 doc/misc/srecode.texi          | 2 +-
 etc/NEWS.18                    | 2 +-
 lisp/cedet/semantic/imenu.el   | 2 +-
 lisp/erc/erc.el                | 6 +++---
 lisp/follow.el                 | 2 +-
 lisp/progmodes/cc-engine.el    | 4 ++--
 lisp/progmodes/flymake-proc.el | 8 ++++----
 lisp/progmodes/gdb-mi.el       | 2 +-
 lisp/progmodes/hideif.el       | 4 ++--
 lisp/simple.el                 | 2 +-
 lisp/window.el                 | 2 +-
 16 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 5822f66..466ee09 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -207,7 +207,7 @@ longer present.
 Tar up the generated html_node/emacs/ and elisp/ directories and update
 the files manual/elisp.html_node.tar.gz and emacs.html_node.tar.gz.
 
-Use M-x make-manuals-dist from from admin/admin.el to update the
+Use M-x make-manuals-dist from admin/admin.el to update the
 manual/texi/ tarfiles.
 
 Add compressed copies of the main info pages from the tarfile to manual/info/.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 3253549..a505639 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -807,7 +807,7 @@ mechanism can change the variable 
@code{delayed-warnings-hook}:
 
 @defvar delayed-warnings-hook
 This is a normal hook which is run by the Emacs command loop, after
address@hidden, in order to to process and display delayed
address@hidden, in order to process and display delayed
 warnings.
 
 Its default value is a list of two functions:
@@ -7505,7 +7505,7 @@ and are continued or truncated at the left margin.
 @cindex paragraph-separate, and bidirectional display
   Where exactly paragraphs start and end, for the purpose of the Emacs
 @acronym{UBA} implementation, is determined by the following two
-buffer-local variables (note that that @code{paragraph-start} and
+buffer-local variables (note that @code{paragraph-start} and
 @code{paragraph-separate} have no influence on this).  By default both
 of these variables are @code{nil}, and paragraphs are bounded by empty
 lines, i.e., lines that consist entirely of zero or more whitespace
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 116c299..4e4fb39 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -712,7 +712,7 @@ the backquote (@pxref{Backquote}), but quotes code and 
accepts only
 @end defmac
 
 @defmac inline-letevals (address@hidden) address@hidden
-This is is similar to @code{let} (@pxref{Local Variables}): it sets up
+This is similar to @code{let} (@pxref{Local Variables}): it sets up
 local variables as specified by @var{bindings}, and then evaluates
 @var{body} with those bindings in effect.  Each element of
 @var{bindings} should be either a symbol or a list of the form
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 0cb9de9..501960b 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -514,7 +514,7 @@ On MS-DOS, Emacs sets the @env{TERM} environment variable 
to @samp{internal}.
 @end defopt
 
 @defopt term-file-aliases
-This variable is an an association list mapping terminal types to
+This variable is an association list mapping terminal types to
 their aliases.  For example, an element of the form @code{("vt102"
 . "vt100")} means to treat a terminal of type @samp{vt102} like one of
 type @samp{vt100}.
diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi
index 4e395f7..374c724 100644
--- a/doc/misc/sem-user.texi
+++ b/doc/misc/sem-user.texi
@@ -953,7 +953,7 @@ list, you can use @kbd{M-x 
semanticdb-find-test-translate-path}.
 @xref{Semanticdb search debugging commands}.
 
 If items should be loaded but aren't, or if you see some tables that
-have no tags in them, then you you may have an incorrectly-set search
+have no tags in them, then you may have an incorrectly-set search
 throttle (@pxref{Search Throttle}).  For example,
 
 @example
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi
index 74904f3..80bf85c 100644
--- a/doc/misc/srecode.texi
+++ b/doc/misc/srecode.texi
@@ -511,7 +511,7 @@ to insert it anywhere in the template search list.
 If there are multiple templates with the same context and name, the
 template with the highest priority number will be used.
 
-If multiple files have the same priority, then then sort order is
+If multiple files have the same priority, then the sort order is
 unpredictable.  If no template names match, then it doesn't matter.
 
 Example:
diff --git a/etc/NEWS.18 b/etc/NEWS.18
index b26e132..87dac54 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -1120,7 +1120,7 @@ used as mode elements, and what they do in the display:
                the symbol's value is processed as a mode element.
 
   list (whose first element is a string or list or cons cell)
-               the elements of the list are treated as as mode elements,
+               the elements of the list are treated as mode elements,
                so that the output they generate is concatenated,
 
   list (whose car is a symbol)
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el
index 28d6249..5018e03 100644
--- a/lisp/cedet/semantic/imenu.el
+++ b/lisp/cedet/semantic/imenu.el
@@ -488,7 +488,7 @@ Clears all imenu menus that may be depending on the 
database."
 ;;; Which function support
 ;;
 ;; The which-function library will display the current function in the
-;; mode line.  It tries do do this through imenu.  With a semantic parsed
+;; mode line.  It tries to do this through imenu.  With a semantic parsed
 ;; buffer, there is a much more efficient way of doing this.
 ;; Advise `which-function' so that we optionally use semantic tags
 ;; instead, and get better stuff.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 0e56b73..5fe4f9a 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2650,9 +2650,9 @@ otherwise `erc-server-announced-name'.  SERVER is matched 
against
   "Predicate indicating whether the parsed ERC response PARSED should be 
hidden.
 
 Messages are always hidden if the message type of PARSED appears in
-`erc-hide-list'. Message types that appear in `erc-network-hide-list'
-or `erc-channel-hide-list' are are only hidden if the target matches
-the network or channel in the list. In addition, messages whose type
+`erc-hide-list'.  Message types that appear in `erc-network-hide-list'
+or `erc-channel-hide-list' are only hidden if the target matches
+the network or channel in the list.  In addition, messages whose type
 is a member of `erc-lurker-hide-list' are hidden if `erc-lurker-p'
 returns non-nil."
   (let* ((command (erc-response.command parsed))
diff --git a/lisp/follow.el b/lisp/follow.el
index 761513b..4893cad 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -1117,7 +1117,7 @@ Otherwise, return nil."
 ;;; Redisplay
 
 ;; Redraw all the windows on the screen, starting with the top window.
-;; The window used as as marker is WIN, or the selected window if WIN
+;; The window used as marker is WIN, or the selected window if WIN
 ;; is nil.  Start every window directly after the end of the previous
 ;; window, to make sure long lines are displayed correctly.
 
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 457f95f..db201a6 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1720,7 +1720,7 @@ comment at the start of cc-engine.el for more info."
         `((c-debug-remove-face beg end 'c-debug-is-sws-face)
           (c-debug-remove-face beg end 'c-debug-in-sws-face)))))
 
-;; The type of literal position `end' is in in a `before-change-functions'
+;; The type of literal position `end' is in a `before-change-functions'
 ;; function - one of `c', `c++', `pound', or nil (but NOT `string').
 (defvar c-sws-lit-type nil)
 ;; A cons (START . STOP) of the bounds of the comment or CPP construct
@@ -2784,7 +2784,7 @@ comment at the start of cc-engine.el for more info."
 
            (setq pos npos)
            (setq c-state-nonlit-pos-cache (cons pos c-state-nonlit-pos-cache)))
-         ;; Add one extra element above HERE so as to to avoid the previous
+         ;; Add one extra element above HERE so as to avoid the previous
          ;; expensive calculation when the next call is close to the current
          ;; one.  This is especially useful when inside a large macro.
          (when npos
diff --git a/lisp/progmodes/flymake-proc.el b/lisp/progmodes/flymake-proc.el
index a9caef4..5c4d451 100644
--- a/lisp/progmodes/flymake-proc.el
+++ b/lisp/progmodes/flymake-proc.el
@@ -169,13 +169,13 @@ from compile.el")
   "Predicate matching against diagnostic text to detect its type.
 Takes a single argument, the diagnostic's text and should return
 a value suitable for indexing
-`flymake-diagnostic-types-alist' (which see). If the returned
-value is nil, a type of `:error' is assumed. For some backward
-compatibility, if a non-nil value is returned that that doesn't
+`flymake-diagnostic-types-alist' (which see).  If the returned
+value is nil, a type of `:error' is assumed.  For some backward
+compatibility, if a non-nil value is returned that doesn't
 index that alist, a type of `:warning' is assumed.
 
 Instead of a function, it can also be a string, a regular
-expression. A match indicates `:warning' type, otherwise
+expression.  A match indicates `:warning' type, otherwise
 `:error'")
 
 (defun flymake-proc-default-guess (text)
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 7723f70..28d1974 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2374,7 +2374,7 @@ file names include non-ASCII characters."
 ;; sequences are not split between chunks of output of the GDB process
 ;; due to buffering, and arrive together.  Finally, if some string
 ;; included literal \nnn strings (as opposed to non-ASCII characters
-;; converted by by GDB/MI to octal escapes), this decoding will mangle
+;; converted by GDB/MI to octal escapes), this decoding will mangle
 ;; those strings.  When/if GDB acquires the ability to not
 ;; escape-protect non-ASCII characters in its MI output, this kludge
 ;; should be removed.
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 3974483..b1a2a35 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -1657,8 +1657,8 @@ first arg will be `hif-etc'."
 
 ;; The original version of hideif evaluates the macro early and store the
 ;; final values for the defined macro into the symbol database (aka
-;; `hide-ifdef-env'). The evaluation process is "strings -> tokens -> parsed
-;; tree -> [value]". (The square bracket refers to what's stored in in our
+;; `hide-ifdef-env').  The evaluation process is "strings -> tokens -> parsed
+;; tree -> [value]".  (The square bracket refers to what's stored in our
 ;; `hide-ifdef-env'.)
 ;;
 ;; This forbids the evaluation of an argumented macro since the parameters
diff --git a/lisp/simple.el b/lisp/simple.el
index 12d65e5..d363f1d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6125,7 +6125,7 @@ The value is a floating-point number."
               (or (null rbot) (= rbot 0)))
          nil)
         ;; If cursor is not in the bottom scroll margin, and the
-        ;; current line is is not too tall, move forward.
+        ;; current line is not too tall, move forward.
         ((and (or (null this-height) (<= this-height winh))
               vpos
               (> vpos 0)
diff --git a/lisp/window.el b/lisp/window.el
index a761d6c..5d9409b 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -8021,7 +8021,7 @@ parameters of FRAME."
                              (- (nth 3 outer-edges) (nth 1 outer-edges))
                            ;; Another poor guess.
                            (frame-pixel-height frame)))
-           ;; The text size of of FRAME.  Needed to specify FRAME's
+           ;; The text size of FRAME.  Needed to specify FRAME's
            ;; text size after the root window's body's new sizes have
            ;; been calculated.
            (text-width (frame-text-width frame))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]