summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog.162
-rw-r--r--lisp/ChangeLog.62
-rw-r--r--lisp/allout.el2
-rw-r--r--lisp/button.el2
-rw-r--r--lisp/cedet/ChangeLog.12
-rw-r--r--lisp/cedet/cedet-idutils.el2
-rw-r--r--lisp/cedet/ede/pmake.el2
-rw-r--r--lisp/dired-x.el2
-rw-r--r--lisp/elide-head.el2
-rw-r--r--lisp/emacs-lisp/advice.el2
-rw-r--r--lisp/gnus/ChangeLog.32
-rw-r--r--lisp/gnus/gnus-mlspl.el3
-rw-r--r--lisp/gnus/message.el2
-rw-r--r--lisp/gnus/spam.el2
-rw-r--r--lisp/ido.el2
-rw-r--r--lisp/net/newst-ticker.el2
-rw-r--r--lisp/obsolete/landmark.el2
-rw-r--r--lisp/obsolete/levents.el2
-rw-r--r--lisp/obsolete/otodo-mode.el2
-rw-r--r--lisp/org/org-faces.el2
-rw-r--r--lisp/play/gomoku.el2
-rw-r--r--lisp/progmodes/antlr-mode.el2
-rw-r--r--lisp/progmodes/cc-vars.el2
-rw-r--r--lisp/progmodes/cperl-mode.el2
-rw-r--r--lisp/term/tvi970.el6
-rw-r--r--lisp/textmodes/less-css-mode.el2
-rw-r--r--lisp/textmodes/picture.el2
-rw-r--r--lisp/vc/pcvs-defs.el2
28 files changed, 30 insertions, 31 deletions
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index f3d4874a1ce..33bd9a03323 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -2728,7 +2728,7 @@
* vc/ediff-util.el (ediff-buffer-type): New function.
(ediff-clone-buffer-for-current-diff-comparison): Compute the buf-type
- rather than taking it as as argument.
+ rather than taking it as an argument.
(ediff-inferior-compare-regions): Adjust calls accordingly (bug#11319).
2012-12-14 Ryan Crum <ryan.crum@eleostech.com>
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 8c985fbfb7d..64a9d4df8ed 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -1473,7 +1473,7 @@
1996-04-18 Richard Stallman <rms@mole.gnu.ai.mit.edu>
* term/win32-win.el (x-select-text): Remember selected text.
- (x-get-selection-value): Return nil if the clipboard data is
+ (x-get-selection-value): Return nil if the clipboard data
is the same as the remembered selected text.
1996-04-18 Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
diff --git a/lisp/allout.el b/lisp/allout.el
index d0be847aa79..15b7b3a8ac5 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -357,7 +357,7 @@ Examples:
grandchildren, but completely collapse the final top-level topic.
(-1 () : 1 0)
Close the first topic so only the immediate subtopics are shown,
- leave the subsequent topics exposed as they are until the second
+ leave the subsequent topics exposed as they are until the
second to last topic, which is exposed at least one level, and
completely close the last topic.
(-2 : -1 *)
diff --git a/lisp/button.el b/lisp/button.el
index 7e9a712dca7..a6090477c55 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -36,7 +36,7 @@
;; represented by the overlay itself, or text-properties, in which case
;; the button is represented by a marker or buffer-position pointing
;; somewhere in the button. In the latter case, no markers into the
-;; buffer are retained, which is important for speed if there are are
+;; buffer are retained, which is important for speed if there are
;; extremely large numbers of buttons. Note however that if there is
;; an existing face text-property at the site of the button, the
;; button face may not be visible. Using overlays avoids this.
diff --git a/lisp/cedet/ChangeLog.1 b/lisp/cedet/ChangeLog.1
index a17e53a1c5a..35cdf80e4b3 100644
--- a/lisp/cedet/ChangeLog.1
+++ b/lisp/cedet/ChangeLog.1
@@ -457,7 +457,7 @@
complete local variables.
* semantic/scope.el (semantic-analyze-scoped-types-default): If we
- cannot find a type in the typecache, also look into the the types
+ cannot find a type in the typecache, also look into the types
we already found. This is necessary since in C++, a 'using
namespace' can be dependend on a previous one.
(semantic-completable-tags-from-type): When creating the list of
diff --git a/lisp/cedet/cedet-idutils.el b/lisp/cedet/cedet-idutils.el
index 4b6c6b01aa2..48e1b2d09b1 100644
--- a/lisp/cedet/cedet-idutils.el
+++ b/lisp/cedet/cedet-idutils.el
@@ -98,7 +98,7 @@ Return the created buffer with program output."
(defun cedet-idutils-lid-call (flags)
"Call ID Utils lid with the list of FLAGS.
-Return the created buffer with with program output."
+Return the created buffer with program output."
(let ((b (get-buffer-create "*CEDET lid*"))
(cd default-directory)
)
diff --git a/lisp/cedet/ede/pmake.el b/lisp/cedet/ede/pmake.el
index c199cae82ba..b836eafa8ce 100644
--- a/lisp/cedet/ede/pmake.el
+++ b/lisp/cedet/ede/pmake.el
@@ -277,7 +277,7 @@ Execute BODY in a location where a value can be placed."
;;; SOURCE VARIABLE NAME CONSTRUCTION
(defsubst ede-pmake-varname (obj)
- "Convert OBJ into a variable name name.
+ "Convert OBJ into a variable name.
Change . to _ in the variable name."
(let ((name (oref obj name)))
(while (string-match "\\." name)
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 78fa5ed7788..5fa28d3e3e8 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -57,7 +57,7 @@
(defcustom dired-bind-vm nil
"Non-nil means \"V\" runs `dired-vm', otherwise \"V\" runs `dired-rmail'.
-RMAIL files in the old Babyl format (used before before Emacs 23.1)
+RMAIL files in the old Babyl format (used before Emacs 23.1)
contain \"-*- rmail -*-\" at the top, so `dired-find-file'
will run `rmail' on these files. New RMAIL files use the standard
mbox format, and so cannot be distinguished in this way."
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index 5bede73eaa1..c6d8c9009b9 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -57,7 +57,7 @@ If not, see <http://www\\.gnu\\.org/licenses/>\\)\\.")
"SUCH DAMAGE\\.") ; BSD
("Permission is hereby granted, free of charge" . ; X11
"authorization from the X Consortium\\."))
- "Alist of regexps defining start end end of text to elide.
+ "Alist of regexps defining start and end of text to elide.
The cars of elements of the list are searched for in order. Text is
elided with an invisible overlay from the end of the line where the
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 32b6a47b053..82867667756 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -502,7 +502,7 @@
;; important advantage is that it allows the implementation of forward advice.
;; Advice information for a certain function accumulates as the value of the
;; `advice-info' property of the function symbol. This accumulation is
-;; completely independent of the fact that that function might not yet be
+;; completely independent of the fact that the function might not yet be
;; defined. The macros `defun' and `defmacro' check whether the
;; function/macro they defined had advice information
;; associated with it. If so and forward advice is enabled, the original
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index c2e4846442a..43681f6eb7d 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -955,7 +955,7 @@
* gnus-sum.el (gnus-summary-read-group-1): Initialize the spam code if
that's needed.
- * spam.el (spam-initialize): Allow calling repeatedly, but only run the
+ * spam.el (spam-initialize): Allow calling repeatedly, but only run
the code once (bug#9069).
2014-01-18 Steinar Bang <sb@dod.no>
diff --git a/lisp/gnus/gnus-mlspl.el b/lisp/gnus/gnus-mlspl.el
index cd6bbd03576..d0810ca8221 100644
--- a/lisp/gnus/gnus-mlspl.el
+++ b/lisp/gnus/gnus-mlspl.el
@@ -72,8 +72,7 @@ match any of the group-specified splitting rules. See
;;;###autoload
(defun gnus-group-split-update (&optional catch-all)
"Computes nnmail-split-fancy from group params and CATCH-ALL.
-It does this by calling by calling (gnus-group-split-fancy nil
-nil CATCH-ALL).
+It does this by calling (gnus-group-split-fancy nil nil CATCH-ALL).
If CATCH-ALL is nil, `gnus-group-split-default-catch-all-group' is used
instead. This variable is set by `gnus-group-split-setup'."
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 8212eeafa91..38aea31840f 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -307,7 +307,7 @@ any confusion."
(defcustom message-subject-trailing-was-query t
"What to do with trailing \"(was: <old subject>)\" in subject lines.
If nil, leave the subject unchanged. If it is the symbol `ask', query
-the user what do do. In this case, the subject is matched against
+the user what to do. In this case, the subject is matched against
`message-subject-trailing-was-ask-regexp'. If
`message-subject-trailing-was-query' is t, always strip the trailing
old subject. In this case, `message-subject-trailing-was-regexp' is
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 6378e3e97e1..f14af741f75 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -628,7 +628,7 @@ order for SpamAssassin to recognize the new registered spam."
:group 'spam-spamassassin)
(defcustom spam-sa-learn-unregister-switch "--forget"
- "The switch that sa-learn uses to unregister messages messages."
+ "The switch that sa-learn uses to unregister messages."
:type 'string
:group 'spam-spamassassin)
diff --git a/lisp/ido.el b/lisp/ido.el
index 23c039d32e6..47cbcb63c69 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -443,7 +443,7 @@ Possible values:
`other-window' Show new file in another window (same frame)
`display' Display file in another window without selecting to it
`other-frame' Show new file in another frame
-`maybe-frame' If a file is visible in another frame, prompt to ask if you
+`maybe-frame' If a file is visible in another frame, prompt to ask if
you want to see the file in the same window of the current
frame or in the other frame
`raise-frame' If a file is visible in another frame, raise that
diff --git a/lisp/net/newst-ticker.el b/lisp/net/newst-ticker.el
index 913b89b43ff..eb6ff19d5c2 100644
--- a/lisp/net/newst-ticker.el
+++ b/lisp/net/newst-ticker.el
@@ -118,7 +118,7 @@ been added between the last two retrievals."
(defcustom newsticker-hide-obsolete-items-in-echo-area
t
- "Decides whether to show obsolete items items in the ticker.
+ "Decides whether to show obsolete items in the ticker.
If t the echo area will not show obsolete items. See also
`newsticker-hide-old-items-in-echo-area'."
:type 'boolean
diff --git a/lisp/obsolete/landmark.el b/lisp/obsolete/landmark.el
index 99fd55107ba..7795279bf42 100644
--- a/lisp/obsolete/landmark.el
+++ b/lisp/obsolete/landmark.el
@@ -260,7 +260,7 @@ is non-nil. One interesting value is `turn-on-font-lock'."
"Vector recording the actual score of the free squares.")
-;; The key point point about the algorithm is that, rather than considering
+;; The key point about the algorithm is that, rather than considering
;; the board as just a set of squares, we prefer to see it as a "space" of
;; internested 5-tuples of contiguous squares (called qtuples).
;;
diff --git a/lisp/obsolete/levents.el b/lisp/obsolete/levents.el
index 24de4891ae3..b9b153553d7 100644
--- a/lisp/obsolete/levents.el
+++ b/lisp/obsolete/levents.el
@@ -113,7 +113,7 @@ In actual Lucid Emacs, you MUST NOT use this event object after
calling this function with it. You will lose. It is not necessary to
call this function, as event objects are garbage- collected like all
other objects; however, it may be more efficient to explicitly
-deallocate events when you are sure that that is safe.
+deallocate events when you are sure that this is safe.
This emulation does not actually deallocate or reuse events
except via garbage collection and `cons'."
diff --git a/lisp/obsolete/otodo-mode.el b/lisp/obsolete/otodo-mode.el
index c7a05ad1459..dd25e336f0a 100644
--- a/lisp/obsolete/otodo-mode.el
+++ b/lisp/obsolete/otodo-mode.el
@@ -164,7 +164,7 @@
;; might be nicer and to that effect a function has been declared
;; further down in the code. You may wish to auto-load this.
;;
-;; Carsten also writes that that *changing* the prefix after the
+;; Carsten also writes that *changing* the prefix after the
;; todo list is already established is not as simple as changing
;; the variable - the todo files have to be changed by hand.
;;
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 53538e6a858..eab9f3e313f 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -291,7 +291,7 @@ determines if it is a foreground or a background color."
(defcustom org-priority-faces nil
"Faces for specific Priorities.
This is a list of cons cells, with priority character in the car
-and faces in the cdr. The face can be a symbol, a color as
+and faces in the cdr. The face can be a symbol, a color
as a string, or a property list of attributes, like
(:foreground \"blue\" :weight bold :underline t).
If it is a color string, the variable `org-faces-easy-properties'
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 7c3184543b0..2f5f36e1dbb 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -263,7 +263,7 @@ Other useful commands:\n
"Vector recording the actual score of the free squares.")
-;; The key point point about the algorithm is that, rather than considering
+;; The key point about the algorithm is that, rather than considering
;; the board as just a set of squares, we prefer to see it as a "space" of
;; internested 5-tuples of contiguous squares (called qtuples).
;;
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index f84d94a3e68..82ae1816270 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -619,7 +619,7 @@ COUNT starts with 1. GEN-SEP is used to separate long variable values."
'((java-mode ("%sTokenTypes.java") ("%s.java"))
(c++-mode ("%sTokenTypes.hpp") ("%s.cpp" "%s.hpp")))
"Language dependent formats which specify generated files.
-Each element in this list looks looks like
+Each element in this list looks like
(MAJOR-MODE (VOCAB-FILE-FORMAT...) (CLASS-FILE-FORMAT...)).
The element whose MAJOR-MODE is equal to `antlr-language' is used to
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 6818b5e0b76..df202e9cd2f 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -167,7 +167,7 @@ use c-constant-symbol instead."
(defmacro defcustom-c-stylevar (name val doc &rest args)
"Define a style variable NAME with VAL and DOC.
More precisely, convert the given `:type FOO', mined out of ARGS,
-to an aggregate `:type (radio STYLE (PREAMBLE FOO))', append some
+to an aggregate `:type (radio STYLE (PREAMBLE FOO))', append
some boilerplate documentation to DOC, arrange for the fallback
value of NAME to be VAL, and call `custom-declare-variable' to
do the rest of the work.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index abd77bd973d..853604d1d79 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -480,7 +480,7 @@ Font for POD headers."
(defcustom cperl-highlight-variables-indiscriminately nil
"Non-nil means perform additional highlighting on variables.
Currently only changes how scalar variables are highlighted.
-Note that that variable is only read at initialization time for
+Note that the variable is only read at initialization time for
the variable `cperl-font-lock-keywords-2', so changing it after you've
entered CPerl mode the first time will have no effect."
:type 'boolean
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index abcd149acd4..1ce82200b38 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -36,7 +36,7 @@
;; ("\eOR" [kp-f3])
;; ("\eOS" [kp-f4])
- ;; These might bre set by terminfo.
+ ;; These might be set by terminfo.
("\e[H" [home])
("\e[Z" [backtab])
("\e[i" [print])
@@ -45,13 +45,13 @@
("\e[M" [deleteline])
("\e[U" [next]) ;; actually the `page' key
- ;; These won't be set up by either
+ ;; These won't be set up by either.
("\eOm" [kp-subtract])
("\eOl" [kp-separator])
("\eOn" [kp-decimal])
("\eOM" [kp-enter])
- ;; These won't be set up by either either
+ ;; These won't be set up by either.
("\e[K" [key_eol]) ;; Not an X keysym
("\e[J" [key_eos]) ;; Not an X keysym
("\e[2J" [key_clear]) ;; Not an X keysym
diff --git a/lisp/textmodes/less-css-mode.el b/lisp/textmodes/less-css-mode.el
index b665f917d3a..d31414e3a4b 100644
--- a/lisp/textmodes/less-css-mode.el
+++ b/lisp/textmodes/less-css-mode.el
@@ -129,7 +129,7 @@ variable in most cases is likely to be via directory local
variables.
This can be also be set to a full path, or a relative path. If
-the path is relative, it will be relative to the the current
+the path is relative, it will be relative to the current
directory by default."
:type 'file)
;;;###autoload
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 0fb120ec80a..60e9bbb5f5c 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -66,7 +66,7 @@
(defvar picture-desired-column 0
"Desired current column for Picture mode.
When a cursor is on a wide-column character (e.g. Chinese,
-Japanese, Korean), this may may be different from `current-column'.")
+Japanese, Korean), this may be different from `current-column'.")
(defun picture-update-desired-column (adjust-to-current)
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index 9575b5f7cab..41dc9401c0a 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -269,7 +269,7 @@ This variable is buffer local and only used in the *cvs* buffer.")
"Regexp matching the possible names of locks in the CVS repository.")
(defconst cvs-cursor-column 22
- "Column to position cursor in in `cvs-mode'.")
+ "Column to position cursor in, in `cvs-mode'.")
;;;;
;;;; Global internal variables
View Lorry Controller Status