diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/cedet/semantic/imenu.el | 2 | ||||
-rw-r--r-- | lisp/erc/erc.el | 6 | ||||
-rw-r--r-- | lisp/follow.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/cc-engine.el | 4 | ||||
-rw-r--r-- | lisp/progmodes/flymake-proc.el | 8 | ||||
-rw-r--r-- | lisp/progmodes/gdb-mi.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/hideif.el | 4 | ||||
-rw-r--r-- | lisp/simple.el | 2 | ||||
-rw-r--r-- | lisp/window.el | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index 28d624908e2..5018e039d03 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 0e56b732d81..5fe4f9a80a4 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 761513bae36..4893cad3fdc 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 457f95f2ca3..db201a6322f 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 a9caef4fc8e..5c4d451d638 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 7723f700925..28d1974893d 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 39744833255..b1a2a35d55f 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 12d65e50c34..d363f1d91ed 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 a761d6c0292..5d9409bf62c 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)) |