[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp dired.el smerge-mode.el vc-dir.el ce...
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] emacs/lisp dired.el smerge-mode.el vc-dir.el ce... |
Date: |
Sun, 04 Oct 2009 02:12:00 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 09/10/04 02:11:59
Modified files:
lisp : dired.el smerge-mode.el vc-dir.el
lisp/cedet/semantic: util-modes.el
lisp/international: fontset.el mule-cmds.el
lisp/mh-e : mh-utils.el
lisp/progmodes : cc-engine.el idlw-complete-structtag.el
lisp/textmodes : table.el
Log message:
Fix typos in comments.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/dired.el?cvsroot=emacs&r1=1.433&r2=1.434
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/smerge-mode.el?cvsroot=emacs&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-dir.el?cvsroot=emacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/cedet/semantic/util-modes.el?cvsroot=emacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/fontset.el?cvsroot=emacs&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule-cmds.el?cvsroot=emacs&r1=1.371&r2=1.372
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-utils.el?cvsroot=emacs&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/cc-engine.el?cvsroot=emacs&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/idlw-complete-structtag.el?cvsroot=emacs&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/table.el?cvsroot=emacs&r1=1.43&r2=1.44
Patches:
Index: dired.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/dired.el,v
retrieving revision 1.433
retrieving revision 1.434
diff -u -b -r1.433 -r1.434
--- dired.el 2 Oct 2009 03:48:40 -0000 1.433
+++ dired.el 4 Oct 2009 02:11:57 -0000 1.434
@@ -937,7 +937,7 @@
;; spaces there (and within the filename as well, of course).
(save-excursion
(let (file file-col other other-col)
- ;; Check the there is indeed a file, and that there is anoter adjacent
+ ;; Check that there is indeed a file, and that there is anoter adjacent
;; file with which to align, and that additional spaces are needed to
;; align the filenames.
(when (and (setq file (progn (goto-char beg)
Index: smerge-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- smerge-mode.el 8 Sep 2009 19:47:10 -0000 1.78
+++ smerge-mode.el 4 Oct 2009 02:11:58 -0000 1.79
@@ -705,7 +705,7 @@
((save-excursion
(goto-char mine-start)
(re-search-forward smerge-begin-re end t))
- ;; There's a nested conflict and we're after the the beginning
+ ;; There's a nested conflict and we're after the beginning
;; of the outer one but before the beginning of the inner one.
;; Of course, maybe this is not a nested conflict but in that
;; case it can only be something nastier that we don't know how
Index: vc-dir.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-dir.el,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- vc-dir.el 29 Sep 2009 13:07:54 -0000 1.44
+++ vc-dir.el 4 Oct 2009 02:11:58 -0000 1.45
@@ -321,7 +321,7 @@
(defun vc-dir-node-directory (node)
;; Compute the directory for NODE.
- ;; If it's a directory node, get it from the the node.
+ ;; If it's a directory node, get it from the node.
(let ((data (ewoc-data node)))
(or (vc-dir-fileinfo->directory data)
;; Otherwise compute it from the file name.
Index: cedet/semantic/util-modes.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/cedet/semantic/util-modes.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cedet/semantic/util-modes.el 3 Oct 2009 19:28:09 -0000 1.5
+++ cedet/semantic/util-modes.el 4 Oct 2009 02:11:58 -0000 1.6
@@ -1022,7 +1022,7 @@
;;;;
;; Highlight the first like of the function we are in if it is different
-;; from the the tag going off the top of the screen.
+;; from the tag going off the top of the screen.
;;;###autoload
(defun global-semantic-highlight-func-mode (&optional arg)
Index: international/fontset.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/fontset.el,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- international/fontset.el 27 Aug 2009 06:24:48 -0000 1.105
+++ international/fontset.el 4 Oct 2009 02:11:58 -0000 1.106
@@ -292,7 +292,7 @@
;; or a string FONT-NAME,
;; or an object created by `font-spec'.
;;
-;; FAMILY may be nil, in which case, the the corresponding name of
+;; FAMILY may be nil, in which case, the corresponding name of
;; default face is used. If REGISTRY contains a character `-', the
;; string before that is embedded in `CHARSET_REGISTRY' field, and the
;; string after that is embedded in `CHARSET_ENCODING' field. If it
Index: international/mule-cmds.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -b -r1.371 -r1.372
--- international/mule-cmds.el 2 Oct 2009 03:48:44 -0000 1.371
+++ international/mule-cmds.el 4 Oct 2009 02:11:58 -0000 1.372
@@ -854,7 +854,7 @@
(let ((no-other-defaults nil)
auto-cs)
(unless (or (stringp from) find-file-literally)
- ;; Find an auto-coding that is specified for the the current
+ ;; Find an auto-coding that is specified for the current
;; buffer and file from the region FROM and TO.
(save-excursion
(save-restriction
Index: mh-e/mh-utils.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-utils.el,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- mh-e/mh-utils.el 25 Jan 2009 20:56:33 -0000 1.75
+++ mh-e/mh-utils.el 4 Oct 2009 02:11:59 -0000 1.76
@@ -282,7 +282,7 @@
"Display cheat sheet for the commands of the current prefix in minibuffer."
(interactive)
;; We got here because the user pressed a "?", but he pressed a prefix key
- ;; before that. Since the the key vector starts at index 0, the index of the
+ ;; before that. Since the key vector starts at index 0, the index of the
;; last keystroke is length-1 and thus the second to last keystroke is at
;; length-2. We use that information to obtain a suitable prefix character
;; from the recent keys.
Index: progmodes/cc-engine.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/cc-engine.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- progmodes/cc-engine.el 26 Sep 2009 09:18:41 -0000 1.77
+++ progmodes/cc-engine.el 4 Oct 2009 02:11:59 -0000 1.78
@@ -4382,7 +4382,7 @@
(defun c-forward-<>-arglist (all-types)
;; The point is assumed to be at a "<". Try to treat it as the open
- ;; paren of an angle bracket arglist and move forward to the the
+ ;; paren of an angle bracket arglist and move forward to the
;; corresponding ">". If successful, the point is left after the
;; ">" and t is returned, otherwise the point isn't moved and nil is
;; returned. If ALL-TYPES is t then all encountered arguments in
Index: progmodes/idlw-complete-structtag.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/idlw-complete-structtag.el,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- progmodes/idlw-complete-structtag.el 5 Jan 2009 03:23:40 -0000
3.16
+++ progmodes/idlw-complete-structtag.el 4 Oct 2009 02:11:59 -0000
3.17
@@ -79,7 +79,7 @@
;; Notes
;; -----
;; - The structure definition assignment "state = {...}" must use the
-;; same variable name as the the completion location "state.*".
+;; same variable name as the completion location "state.*".
;; - The structure definition must be in the same file.
;; - The structure definition is searched backwards and then forward
;; from the current position, until a definition with tags is found.
Index: textmodes/table.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/table.el,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- textmodes/table.el 2 Oct 2009 03:48:47 -0000 1.43
+++ textmodes/table.el 4 Oct 2009 02:11:59 -0000 1.44
@@ -4968,7 +4968,7 @@
(px (or internal-px (car (if (eq pivot 'left) lu-coordinate
rb-coordinate))))
(ty (- (cdr lu-coordinate) 2))
(by (+ (cdr rb-coordinate) 2)))
- ;; in case of finding the the first cell, get the last adding item on
the list
+ ;; in case of finding the first cell, get the last adding item on the
list
(if (and (null internal-dir) first-only) (setq top-to-bottom (null
top-to-bottom)))
;; travel up and process as recursion traces back (reverse order)
(and cell
@@ -5008,7 +5008,7 @@
(py (or internal-py (if (eq pivot 'top) (cdr lu-coordinate) (1+ (cdr
rb-coordinate)))))
(lx (1- (car lu-coordinate)))
(rx (1+ (car rb-coordinate))))
- ;; in case of finding the the first cell, get the last adding item on
the list
+ ;; in case of finding the first cell, get the last adding item on the
list
(if (and (null internal-dir) first-only) (setq left-to-right (null
left-to-right)))
;; travel left and process as recursion traces back (reverse order)
(and cell
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp dired.el smerge-mode.el vc-dir.el ce...,
Juanma Barranquero <=