diff options
| author | Mario Lang | 2010-01-15 18:51:50 -0800 |
|---|---|---|
| committer | Glenn Morris | 2010-01-15 18:51:50 -0800 |
| commit | 045b9da7879353dfcba2264cfcd0ba0353669846 (patch) | |
| tree | e858f773aed495a224e2720f9317d7fd02d0ae38 | |
| parent | f0d138880a572e2b064d5af2668cd3a54a1d0a1e (diff) | |
| download | emacs-045b9da7879353dfcba2264cfcd0ba0353669846.tar.gz emacs-045b9da7879353dfcba2264cfcd0ba0353669846.zip | |
Mario Lang <mlang@delysid.org>: Remove some duplicated words.
* cedet/ede/cpp-root.el (ede-cpp-root-project):
* cedet/ede/files.el (ede-expand-filename):
* cedet/ede/simple.el (ede-simple-project):
* cedet/semantic/complete.el (semantic-complete-read-tag-engine)
(semantic-complete-inline-tag-engine):
* cedet/semantic/db-el.el (semanticdb-equivalent-mode):
* cedet/semantic/db-global.el (semanticdb-equivalent-mode):
* cedet/semantic/db-javascript.el (semanticdb-equivalent-mode):
* cedet/semantic/db.el (semanticdb-equivalent-mode):
* cedet/semantic/decorate/include.el (semantic-decoration-unknown-include-describe):
* cedet/semantic/idle.el (semantic-idle-work-for-one-buffer):
* emacs-lisp/chart.el (chart-translate-namezone):
* textmodes/artist.el (artist-compute-popup-menu-table):
Remove duplicated words in doc-strings.
* srecode/doc-cpp.srt, srecode/doc-default.srt:
* srecode/doc-java.srt: Remove duplicated words.
* ede.texi (ede-target):
* org.texi (Refiling notes): Remove duplicated words.
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/ede.texi | 2 | ||||
| -rw-r--r-- | doc/misc/org.texi | 2 | ||||
| -rw-r--r-- | etc/ChangeLog | 5 | ||||
| -rw-r--r-- | etc/srecode/doc-cpp.srt | 4 | ||||
| -rw-r--r-- | etc/srecode/doc-default.srt | 4 | ||||
| -rw-r--r-- | etc/srecode/doc-java.srt | 4 | ||||
| -rw-r--r-- | lib-src/etags.c | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog | 19 | ||||
| -rw-r--r-- | lisp/cedet/ede/cpp-root.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/ede/files.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/ede/simple.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/complete.el | 6 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db-el.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db-global.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db-javascript.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db.el | 4 | ||||
| -rw-r--r-- | lisp/cedet/semantic/decorate/include.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/idle.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/chart.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/edt.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/artist.el | 2 |
22 files changed, 53 insertions, 26 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index c4ef9ebf3ae..471d57ed11b 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-01-16 Mario Lang <mlang@delysid.org> | ||
| 2 | |||
| 3 | * ede.texi (ede-target): | ||
| 4 | * org.texi (Refiling notes): Remove duplicated words. | ||
| 5 | |||
| 1 | 2010-01-04 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2010-01-04 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * gnus.texi (Posting Styles): Use with-current-buffer. | 8 | * gnus.texi (Posting Styles): Use with-current-buffer. |
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 189c52f446f..bfeef343f09 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi | |||
| @@ -1968,7 +1968,7 @@ Retrieves the slot @code{sourcetype} from an object of class @code{ede-target} | |||
| 1968 | 1968 | ||
| 1969 | @deffn Method ede-expand-filename :AFTER this filename &optional force | 1969 | @deffn Method ede-expand-filename :AFTER this filename &optional force |
| 1970 | Return a fully qualified file name based on target @var{THIS}. | 1970 | Return a fully qualified file name based on target @var{THIS}. |
| 1971 | @var{FILENAME} should a a filename which occurs in a directory in which @var{THIS} works. | 1971 | @var{FILENAME} should be a filename which occurs in a directory in which @var{THIS} works. |
| 1972 | Optional argument @var{FORCE} forces the default filename to be provided even if it | 1972 | Optional argument @var{FORCE} forces the default filename to be provided even if it |
| 1973 | doesn't exist. | 1973 | doesn't exist. |
| 1974 | @end deffn | 1974 | @end deffn |
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 789e64abc35..507dfad5c31 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi | |||
| @@ -6181,7 +6181,7 @@ See the variable @code{org-refile-targets} for details. If you would like to | |||
| 6181 | select a location via a file-path-like completion along the outline path, see | 6181 | select a location via a file-path-like completion along the outline path, see |
| 6182 | the variables @code{org-refile-use-outline-path} and | 6182 | the variables @code{org-refile-use-outline-path} and |
| 6183 | @code{org-outline-path-complete-in-steps}. If you would like to be able to | 6183 | @code{org-outline-path-complete-in-steps}. If you would like to be able to |
| 6184 | create new nodes as new parents for for refiling on the fly, check the | 6184 | create new nodes as new parents for refiling on the fly, check the |
| 6185 | variable @code{org-refile-allow-creating-parent-nodes}. | 6185 | variable @code{org-refile-allow-creating-parent-nodes}. |
| 6186 | @kindex C-u C-c C-w | 6186 | @kindex C-u C-c C-w |
| 6187 | @item C-u C-c C-w | 6187 | @item C-u C-c C-w |
diff --git a/etc/ChangeLog b/etc/ChangeLog index 15530e5d59f..a5ab8ee4452 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-01-16 Mario Lang <mlang@delysid.org> | ||
| 2 | |||
| 3 | * srecode/doc-cpp.srt, srecode/doc-default.srt: | ||
| 4 | * srecode/doc-java.srt: Remove duplicated words. | ||
| 5 | |||
| 1 | 2010-01-14 Nick Roberts <nickrob@snap.net.nz> | 6 | 2010-01-14 Nick Roberts <nickrob@snap.net.nz> |
| 2 | 7 | ||
| 3 | * etc/images/gud/recstart.xpm, etc/images/gud/recstop.xpm: | 8 | * etc/images/gud/recstart.xpm, etc/images/gud/recstop.xpm: |
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt index fce0d283d7d..2abe572e396 100644 --- a/etc/srecode/doc-cpp.srt +++ b/etc/srecode/doc-cpp.srt | |||
| @@ -58,7 +58,7 @@ Recycle doxygen comment code from the more general template set." | |||
| 58 | ---- | 58 | ---- |
| 59 | 59 | ||
| 60 | template group-comment-end :blank :indent | 60 | template group-comment-end :blank :indent |
| 61 | "A comment occurring at the end of a a group of declarations. | 61 | "A comment occurring at the end of a group of declarations. |
| 62 | Recycle doxygen comment code from the more general template set." | 62 | Recycle doxygen comment code from the more general template set." |
| 63 | ---- | 63 | ---- |
| 64 | {{>:classdecl:doxygen-function-group-end}} | 64 | {{>:classdecl:doxygen-function-group-end}} |
| @@ -75,7 +75,7 @@ Recycle doxygen comment code from the more general template set." | |||
| 75 | ---- | 75 | ---- |
| 76 | 76 | ||
| 77 | template group-comment-end :blank :indent | 77 | template group-comment-end :blank :indent |
| 78 | "A comment occurring at the end of a a group of declarations. | 78 | "A comment occurring at the end of a group of declarations. |
| 79 | Recycle doxygen comment code from the more general template set." | 79 | Recycle doxygen comment code from the more general template set." |
| 80 | ---- | 80 | ---- |
| 81 | {{>:classdecl:doxygen-function-group-end}} | 81 | {{>:classdecl:doxygen-function-group-end}} |
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt index f07849b9207..2d3094df60d 100644 --- a/etc/srecode/doc-default.srt +++ b/etc/srecode/doc-default.srt | |||
| @@ -57,7 +57,7 @@ template group-comment-start :blank :indent | |||
| 57 | ---- | 57 | ---- |
| 58 | 58 | ||
| 59 | template group-comment-end :indent | 59 | template group-comment-end :indent |
| 60 | "A comment occurring at the end of a a group of declarations." | 60 | "A comment occurring at the end of a group of declarations." |
| 61 | ---- | 61 | ---- |
| 62 | {{comment_start}} End {{?GROUPNAME}} {{comment_end}} | 62 | {{comment_start}} End {{?GROUPNAME}} {{comment_end}} |
| 63 | ---- | 63 | ---- |
| @@ -72,7 +72,7 @@ template group-comment-start :blank :indent | |||
| 72 | ---- | 72 | ---- |
| 73 | 73 | ||
| 74 | template group-comment-end :indent | 74 | template group-comment-end :indent |
| 75 | "A comment occurring at the end of a a group of declarations." | 75 | "A comment occurring at the end of a group of declarations." |
| 76 | ---- | 76 | ---- |
| 77 | {{>:declaration:group-comment-end}} | 77 | {{>:declaration:group-comment-end}} |
| 78 | ---- | 78 | ---- |
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt index cb289913f36..f6ef6c9aea3 100644 --- a/etc/srecode/doc-java.srt +++ b/etc/srecode/doc-java.srt | |||
| @@ -59,7 +59,7 @@ Recycle javadoc comment code from the more general template set." | |||
| 59 | ---- | 59 | ---- |
| 60 | 60 | ||
| 61 | template group-comment-end :blank :indent | 61 | template group-comment-end :blank :indent |
| 62 | "A comment occurring at the end of a a group of declarations. | 62 | "A comment occurring at the end of a group of declarations. |
| 63 | Recycle javadoc comment code from the more general template set." | 63 | Recycle javadoc comment code from the more general template set." |
| 64 | ---- | 64 | ---- |
| 65 | {{>:classdecl:javadoc-function-group-end}} | 65 | {{>:classdecl:javadoc-function-group-end}} |
| @@ -76,7 +76,7 @@ Recycle javadoc comment code from the more general template set." | |||
| 76 | ---- | 76 | ---- |
| 77 | 77 | ||
| 78 | template group-comment-end :blank :indent | 78 | template group-comment-end :blank :indent |
| 79 | "A comment occurring at the end of a a group of declarations. | 79 | "A comment occurring at the end of a group of declarations. |
| 80 | Recycle javadoc comment code from the more general template set." | 80 | Recycle javadoc comment code from the more general template set." |
| 81 | ---- | 81 | ---- |
| 82 | {{>:classdecl:javadoc-function-group-end}} | 82 | {{>:classdecl:javadoc-function-group-end}} |
diff --git a/lib-src/etags.c b/lib-src/etags.c index 8cdd47957f6..d49dcf930af 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -6297,7 +6297,7 @@ readline (lbp, stream) | |||
| 6297 | readline (lbp, stream); | 6297 | readline (lbp, stream); |
| 6298 | return; | 6298 | return; |
| 6299 | } /* if a real #line directive */ | 6299 | } /* if a real #line directive */ |
| 6300 | } /* if #line is followed by a a number */ | 6300 | } /* if #line is followed by a number */ |
| 6301 | } /* if line begins with "#line " */ | 6301 | } /* if line begins with "#line " */ |
| 6302 | 6302 | ||
| 6303 | /* If we are here, no #line directive was found. */ | 6303 | /* If we are here, no #line directive was found. */ |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9e08889ba61..ea7435c559d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,20 @@ | |||
| 1 | 2010-01-16 Mario Lang <mlang@delysid.org> | ||
| 2 | |||
| 3 | * cedet/ede/cpp-root.el (ede-cpp-root-project): | ||
| 4 | * cedet/ede/files.el (ede-expand-filename): | ||
| 5 | * cedet/ede/simple.el (ede-simple-project): | ||
| 6 | * cedet/semantic/complete.el (semantic-complete-read-tag-engine) | ||
| 7 | (semantic-complete-inline-tag-engine): | ||
| 8 | * cedet/semantic/db-el.el (semanticdb-equivalent-mode): | ||
| 9 | * cedet/semantic/db-global.el (semanticdb-equivalent-mode): | ||
| 10 | * cedet/semantic/db-javascript.el (semanticdb-equivalent-mode): | ||
| 11 | * cedet/semantic/db.el (semanticdb-equivalent-mode): | ||
| 12 | * cedet/semantic/decorate/include.el (semantic-decoration-unknown-include-describe): | ||
| 13 | * cedet/semantic/idle.el (semantic-idle-work-for-one-buffer): | ||
| 14 | * emacs-lisp/chart.el (chart-translate-namezone): | ||
| 15 | * textmodes/artist.el (artist-compute-popup-menu-table): | ||
| 16 | Remove duplicated words in doc-strings. | ||
| 17 | |||
| 1 | 2010-01-15 David Abrahams <dave@boostpro.com> (tiny change) | 18 | 2010-01-15 David Abrahams <dave@boostpro.com> (tiny change) |
| 2 | 19 | ||
| 3 | * net/mairix.el (mairix-widget-send-query): Send -1 instead of nil | 20 | * net/mairix.el (mairix-widget-send-query): Send -1 instead of nil |
| @@ -1473,7 +1490,7 @@ | |||
| 1473 | 2009-12-01 Dan Nicolaescu <dann@ics.uci.edu> | 1490 | 2009-12-01 Dan Nicolaescu <dann@ics.uci.edu> |
| 1474 | 1491 | ||
| 1475 | Make vc-print-log buttons work. | 1492 | Make vc-print-log buttons work. |
| 1476 | * log-view.el (log-view-mode-map): Inherit from from widget-keymap. | 1493 | * log-view.el (log-view-mode-map): Inherit from widget-keymap. |
| 1477 | 1494 | ||
| 1478 | 2009-11-30 Ryan C. Thompson <rct@thompsonclan.org> (tiny change) | 1495 | 2009-11-30 Ryan C. Thompson <rct@thompsonclan.org> (tiny change) |
| 1479 | 1496 | ||
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el index ec04dd57c7a..1592c3c2f5d 100644 --- a/lisp/cedet/ede/cpp-root.el +++ b/lisp/cedet/ede/cpp-root.el | |||
| @@ -324,7 +324,7 @@ exist, it should return nil." | |||
| 324 | ) | 324 | ) |
| 325 | ) | 325 | ) |
| 326 | "EDE cpp-root project class. | 326 | "EDE cpp-root project class. |
| 327 | Each directory needs a a project file to control it.") | 327 | Each directory needs a project file to control it.") |
| 328 | 328 | ||
| 329 | ;;; INIT | 329 | ;;; INIT |
| 330 | ;; | 330 | ;; |
diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el index bdb9268a030..2f86b766158 100644 --- a/lisp/cedet/ede/files.el +++ b/lisp/cedet/ede/files.el | |||
| @@ -487,7 +487,7 @@ doesn't exist." | |||
| 487 | 487 | ||
| 488 | (defmethod ede-expand-filename ((this ede-target) filename &optional force) | 488 | (defmethod ede-expand-filename ((this ede-target) filename &optional force) |
| 489 | "Return a fully qualified file name based on target THIS. | 489 | "Return a fully qualified file name based on target THIS. |
| 490 | FILENAME should a a filename which occurs in a directory in which THIS works. | 490 | FILENAME should be a filename which occurs in a directory in which THIS works. |
| 491 | Optional argument FORCE forces the default filename to be provided even if it | 491 | Optional argument FORCE forces the default filename to be provided even if it |
| 492 | doesn't exist." | 492 | doesn't exist." |
| 493 | (ede-expand-filename (ede-target-parent this) filename force)) | 493 | (ede-expand-filename (ede-target-parent this) filename force)) |
diff --git a/lisp/cedet/ede/simple.el b/lisp/cedet/ede/simple.el index 64bf047736e..e0a526e9ead 100644 --- a/lisp/cedet/ede/simple.el +++ b/lisp/cedet/ede/simple.el | |||
| @@ -87,7 +87,7 @@ All directories need at least one target.") | |||
| 87 | (file-header-line :initform ";; EDE Simple Project") | 87 | (file-header-line :initform ";; EDE Simple Project") |
| 88 | ) | 88 | ) |
| 89 | "EDE Simple project class. | 89 | "EDE Simple project class. |
| 90 | Each directory needs a a project file to control it.") | 90 | Each directory needs a project file to control it.") |
| 91 | 91 | ||
| 92 | (defmethod ede-commit-project ((proj ede-simple-project)) | 92 | (defmethod ede-commit-project ((proj ede-simple-project)) |
| 93 | "Commit any change to PROJ to its file." | 93 | "Commit any change to PROJ to its file." |
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index eed31e4c2ad..fa9ebed9263 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el | |||
| @@ -192,7 +192,7 @@ Keeps STRINGS only in the history.") | |||
| 192 | default-tag initial-input | 192 | default-tag initial-input |
| 193 | history) | 193 | history) |
| 194 | "Read a semantic tag, and return a tag for the selection. | 194 | "Read a semantic tag, and return a tag for the selection. |
| 195 | Argument COLLECTOR is an object which can be used to to calculate | 195 | Argument COLLECTOR is an object which can be used to calculate |
| 196 | a list of possible hits. See `semantic-completion-collector-engine' | 196 | a list of possible hits. See `semantic-completion-collector-engine' |
| 197 | for details on COLLECTOR. | 197 | for details on COLLECTOR. |
| 198 | Argument DISPLAYOR is an object used to display a list of possible | 198 | Argument DISPLAYOR is an object used to display a list of possible |
| @@ -394,7 +394,7 @@ Return value can be: | |||
| 394 | 394 | ||
| 395 | ;;; Keybindings | 395 | ;;; Keybindings |
| 396 | ;; | 396 | ;; |
| 397 | ;; Keys are bound to to perform completion using our mechanisms. | 397 | ;; Keys are bound to perform completion using our mechanisms. |
| 398 | ;; Do that work here. | 398 | ;; Do that work here. |
| 399 | (defun semantic-complete-done () | 399 | (defun semantic-complete-done () |
| 400 | "Accept the current input." | 400 | "Accept the current input." |
| @@ -738,7 +738,7 @@ DO NOT CALL THIS IF THE INLINE COMPLETION ENGINE IS NOT ACTIVE." | |||
| 738 | (defun semantic-complete-inline-tag-engine | 738 | (defun semantic-complete-inline-tag-engine |
| 739 | (collector displayor buffer start end) | 739 | (collector displayor buffer start end) |
| 740 | "Perform completion based on semantic tags in a buffer. | 740 | "Perform completion based on semantic tags in a buffer. |
| 741 | Argument COLLECTOR is an object which can be used to to calculate | 741 | Argument COLLECTOR is an object which can be used to calculate |
| 742 | a list of possible hits. See `semantic-completion-collector-engine' | 742 | a list of possible hits. See `semantic-completion-collector-engine' |
| 743 | for details on COLLECTOR. | 743 | for details on COLLECTOR. |
| 744 | Argument DISPLAYOR is an object used to display a list of possible | 744 | Argument DISPLAYOR is an object used to display a list of possible |
diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el index 865d775c7cb..d46f727fca6 100644 --- a/lisp/cedet/semantic/db-el.el +++ b/lisp/cedet/semantic/db-el.el | |||
| @@ -107,7 +107,7 @@ For Emacs Lisp, creates a specialized table." | |||
| 107 | 107 | ||
| 108 | (defmethod semanticdb-equivalent-mode ((table semanticdb-table-emacs-lisp) &optional buffer) | 108 | (defmethod semanticdb-equivalent-mode ((table semanticdb-table-emacs-lisp) &optional buffer) |
| 109 | "Return non-nil if TABLE's mode is equivalent to BUFFER. | 109 | "Return non-nil if TABLE's mode is equivalent to BUFFER. |
| 110 | Equivalent modes are specified by by `semantic-equivalent-major-modes' | 110 | Equivalent modes are specified by the `semantic-equivalent-major-modes' |
| 111 | local variable." | 111 | local variable." |
| 112 | (with-current-buffer buffer | 112 | (with-current-buffer buffer |
| 113 | (eq (or mode-local-active-mode major-mode) 'emacs-lisp-mode))) | 113 | (eq (or mode-local-active-mode major-mode) 'emacs-lisp-mode))) |
diff --git a/lisp/cedet/semantic/db-global.el b/lisp/cedet/semantic/db-global.el index aba045d64d8..bfd97fc5a54 100644 --- a/lisp/cedet/semantic/db-global.el +++ b/lisp/cedet/semantic/db-global.el | |||
| @@ -105,7 +105,7 @@ is not available for this directory." | |||
| 105 | 105 | ||
| 106 | (defmethod semanticdb-equivalent-mode ((table semanticdb-table-global) &optional buffer) | 106 | (defmethod semanticdb-equivalent-mode ((table semanticdb-table-global) &optional buffer) |
| 107 | "Return t, pretend that this table's mode is equivalent to BUFFER. | 107 | "Return t, pretend that this table's mode is equivalent to BUFFER. |
| 108 | Equivalent modes are specified by by `semantic-equivalent-major-modes' | 108 | Equivalent modes are specified by the `semantic-equivalent-major-modes' |
| 109 | local variable." | 109 | local variable." |
| 110 | ;; @todo - hack alert! | 110 | ;; @todo - hack alert! |
| 111 | t) | 111 | t) |
diff --git a/lisp/cedet/semantic/db-javascript.el b/lisp/cedet/semantic/db-javascript.el index d99b60cc66c..2e357e677e2 100644 --- a/lisp/cedet/semantic/db-javascript.el +++ b/lisp/cedet/semantic/db-javascript.el | |||
| @@ -145,7 +145,7 @@ Create one of our special tables that can act as an intermediary." | |||
| 145 | 145 | ||
| 146 | (defmethod semanticdb-equivalent-mode ((table semanticdb-table-javascript) &optional buffer) | 146 | (defmethod semanticdb-equivalent-mode ((table semanticdb-table-javascript) &optional buffer) |
| 147 | "Return non-nil if TABLE's mode is equivalent to BUFFER. | 147 | "Return non-nil if TABLE's mode is equivalent to BUFFER. |
| 148 | Equivalent modes are specified by by `semantic-equivalent-major-modes' | 148 | Equivalent modes are specified by the `semantic-equivalent-major-modes' |
| 149 | local variable." | 149 | local variable." |
| 150 | (with-current-buffer buffer | 150 | (with-current-buffer buffer |
| 151 | (eq (or mode-local-active-mode major-mode) 'javascript-mode))) | 151 | (eq (or mode-local-active-mode major-mode) 'javascript-mode))) |
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el index 811bc985f35..3f638a212f0 100644 --- a/lisp/cedet/semantic/db.el +++ b/lisp/cedet/semantic/db.el | |||
| @@ -735,13 +735,13 @@ all files of any type." | |||
| 735 | 735 | ||
| 736 | (defmethod semanticdb-equivalent-mode ((table semanticdb-abstract-table) &optional buffer) | 736 | (defmethod semanticdb-equivalent-mode ((table semanticdb-abstract-table) &optional buffer) |
| 737 | "Return non-nil if TABLE's mode is equivalent to BUFFER. | 737 | "Return non-nil if TABLE's mode is equivalent to BUFFER. |
| 738 | Equivalent modes are specified by by `semantic-equivalent-major-modes' | 738 | Equivalent modes are specified by the `semantic-equivalent-major-modes' |
| 739 | local variable." | 739 | local variable." |
| 740 | nil) | 740 | nil) |
| 741 | 741 | ||
| 742 | (defmethod semanticdb-equivalent-mode ((table semanticdb-table) &optional buffer) | 742 | (defmethod semanticdb-equivalent-mode ((table semanticdb-table) &optional buffer) |
| 743 | "Return non-nil if TABLE's mode is equivalent to BUFFER. | 743 | "Return non-nil if TABLE's mode is equivalent to BUFFER. |
| 744 | Equivalent modes are specified by by `semantic-equivalent-major-modes' | 744 | Equivalent modes are specified by the `semantic-equivalent-major-modes' |
| 745 | local variable." | 745 | local variable." |
| 746 | (save-excursion | 746 | (save-excursion |
| 747 | (if buffer (set-buffer buffer)) | 747 | (if buffer (set-buffer buffer)) |
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index dec01336ae1..94273dcfaf7 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el | |||
| @@ -461,7 +461,7 @@ wrap existing project code for Semantic's benifit. | |||
| 461 | 461 | ||
| 462 | (when (or (eq mm 'c++-mode) (eq mm 'c-mode)) | 462 | (when (or (eq mm 'c++-mode) (eq mm 'c-mode)) |
| 463 | (princ " | 463 | (princ " |
| 464 | For C/C++ includes located within a a project, you can use a special | 464 | For C/C++ includes located within a project, you can use a special |
| 465 | EDE project that will wrap an existing build system. You can do that | 465 | EDE project that will wrap an existing build system. You can do that |
| 466 | like this in your .emacs file: | 466 | like this in your .emacs file: |
| 467 | 467 | ||
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index dddfaca0f83..cf107232645 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el | |||
| @@ -336,7 +336,7 @@ Disable to prevent lots of excessive parsing in idle time." | |||
| 336 | 336 | ||
| 337 | 337 | ||
| 338 | (defun semantic-idle-work-for-one-buffer (buffer) | 338 | (defun semantic-idle-work-for-one-buffer (buffer) |
| 339 | "Do long-processing work for for BUFFER. | 339 | "Do long-processing work for BUFFER. |
| 340 | Uses `semantic-safe' and returns the output. | 340 | Uses `semantic-safe' and returns the output. |
| 341 | Returns t of all processing succeeded." | 341 | Returns t of all processing succeeded." |
| 342 | (with-current-buffer buffer | 342 | (with-current-buffer buffer |
diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el index f4c3bfa90a0..4f01e540601 100644 --- a/lisp/emacs-lisp/chart.el +++ b/lisp/emacs-lisp/chart.el | |||
| @@ -323,7 +323,7 @@ MARGIN, ZONE, START, and END specify restrictions in chart space." | |||
| 323 | (defmethod chart-translate-namezone ((c chart) n) | 323 | (defmethod chart-translate-namezone ((c chart) n) |
| 324 | "Return a dot-pair representing a positional range for a name. | 324 | "Return a dot-pair representing a positional range for a name. |
| 325 | The name in chart C of the Nth name resides. | 325 | The name in chart C of the Nth name resides. |
| 326 | Automatically compensates for for direction." | 326 | Automatically compensates for direction." |
| 327 | (let* ((dir (oref c direction)) | 327 | (let* ((dir (oref c direction)) |
| 328 | (w (if (eq dir 'vertical) (oref c x-width) (oref c y-width))) | 328 | (w (if (eq dir 'vertical) (oref c x-width) (oref c y-width))) |
| 329 | (m (if (eq dir 'vertical) (oref c y-margin) (oref c x-margin))) | 329 | (m (if (eq dir 'vertical) (oref c y-margin) (oref c x-margin))) |
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index 40c7d887c29..2abde59af90 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el | |||
| @@ -2107,7 +2107,7 @@ created." | |||
| 2107 | (setq edt-term "pc") | 2107 | (setq edt-term "pc") |
| 2108 | (if (or (not edt-window-system) (eq edt-window-system 'tty)) | 2108 | (if (or (not edt-window-system) (eq edt-window-system 'tty)) |
| 2109 | (setq edt-term (getenv "TERM")))) | 2109 | (setq edt-term (getenv "TERM")))) |
| 2110 | ;; Look for for terminal configuration file for this terminal type. | 2110 | ;; Look for a terminal configuration file for this terminal type. |
| 2111 | ;; Otherwise, load the user's custom configuration file. | 2111 | ;; Otherwise, load the user's custom configuration file. |
| 2112 | (if (or (not edt-window-system) (memq edt-window-system '(pc tty))) | 2112 | (if (or (not edt-window-system) (memq edt-window-system '(pc tty))) |
| 2113 | (progn | 2113 | (progn |
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 00896be3c6e..137f358970c 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el | |||
| @@ -1477,7 +1477,7 @@ Keymap summary | |||
| 1477 | ; | 1477 | ; |
| 1478 | 1478 | ||
| 1479 | (defun artist-compute-popup-menu-table (menu-table) | 1479 | (defun artist-compute-popup-menu-table (menu-table) |
| 1480 | "Create a menu from from MENU-TABLE data. | 1480 | "Create a menu from MENU-TABLE data. |
| 1481 | The returned value is suitable for the `x-popup-menu' function." | 1481 | The returned value is suitable for the `x-popup-menu' function." |
| 1482 | (cons "Artist menu" | 1482 | (cons "Artist menu" |
| 1483 | (artist-compute-popup-menu-table-sub menu-table))) | 1483 | (artist-compute-popup-menu-table-sub menu-table))) |