diff options
-rw-r--r-- | lisp/ChangeLog | 17 | ||||
-rw-r--r-- | lisp/cedet/ede/makefile-edit.el | 4 | ||||
-rw-r--r-- | lisp/cedet/semantic/analyze/fcn.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/bovine/c.el | 4 | ||||
-rw-r--r-- | lisp/cedet/semantic/lex.el | 4 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/wisent.el | 6 | ||||
-rw-r--r-- | lisp/cedet/srecode/srt-mode.el | 6 | ||||
-rw-r--r-- | lisp/files-x.el | 4 |
8 files changed, 30 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c048020b641..e9a8abb1f9f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,13 +1,26 @@ 2009-10-04 Juanma Barranquero <lekktu@gmail.com> + * files-x.el (modify-dir-local-variable) + (copy-dir-locals-to-file-locals-prop-line): + * cedet/ede/makefile-edit.el (makefile-beginning-of-command) + (makefile-end-of-command): + * cedet/semantic/lex.el (semantic-lex-token): + * cedet/semantic/analyze/fcn.el + (semantic-analyze-dereference-metatype-1): + * cedet/semantic/bovine/c.el (semantic-lex-cpp-define) + (semantic-lex-cpp-undef): + * cedet/semantic/wisent/wisent.el (wisent-skip-block): + * cedet/srecode/srt-mode.el (semantic-beginning-of-context) + (semantic-end-of-context): Fix typos in docstrings. + * recentf.el (recentf-unload-function): New function. 2009-10-04 Chong Yidong <cyd@stupidchicken.com> + * cedet/ede.el (ede-project-placeholder-cache-file): * cedet/semantic/db-file.el (semanticdb-default-save-directory): * cedet/srecode/map.el (srecode-map-save-file): - * cedet/ede.el (ede-project-placeholder-cache-file): Use - locate-user-emacs-file. Suggested by Juanma Barranquero. + Use locate-user-emacs-file. Suggested by Juanma Barranquero. 2009-10-04 Glenn Morris <rgm@gnu.org> diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el index c255966d5c3..542ea703946 100644 --- a/lisp/cedet/ede/makefile-edit.el +++ b/lisp/cedet/ede/makefile-edit.el @@ -42,7 +42,7 @@ ;;; Code: (defun makefile-beginning-of-command () - "Move the the beginning of the current command." + "Move the beginning of the current command." (interactive) (if (save-excursion (forward-line -1) @@ -57,7 +57,7 @@ (forward-line 1))) (defun makefile-end-of-command () - "Move the the beginning of the current command." + "Move the beginning of the current command." (interactive) (end-of-line) (while (and (makefile-line-continued-p) diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el index d0d5fc78b43..83ffdb4b10f 100644 --- a/lisp/cedet/semantic/analyze/fcn.el +++ b/lisp/cedet/semantic/analyze/fcn.el @@ -288,7 +288,7 @@ Optional argument TYPE-DECLARATION is how TYPE was found referenced." (defun semantic-analyze-dereference-metatype-1 (ans scope) "Do extra work after dereferencing a metatype. -ANS is the answer from the the language specific query. +ANS is the answer from the language specific query. SCOPE is the current scope." (require 'semantic/scope) ;; If ANS is a string, or if ANS is a short tag, we diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 113f49a9c6a..8a773583aee 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -228,7 +228,7 @@ if `semantic-c-member-of-autocast' is nil : (define-lex-spp-macro-declaration-analyzer semantic-lex-cpp-define "A #define of a symbol with some value. Record the symbol in the semantic preprocessor. -Return the the defined symbol as a special spp lex token." +Return the defined symbol as a special spp lex token." "^\\s-*#\\s-*define\\s-+\\(\\(\\sw\\|\\s_\\)+\\)" 1 (goto-char (match-end 0)) (skip-chars-forward " \t") @@ -264,7 +264,7 @@ Return the the defined symbol as a special spp lex token." (define-lex-spp-macro-undeclaration-analyzer semantic-lex-cpp-undef "A #undef of a symbol. Remove the symbol from the semantic preprocessor. -Return the the defined symbol as a special spp lex token." +Return the defined symbol as a special spp lex token." "^\\s-*#\\s-*undef\\s-+\\(\\(\\sw\\|\\s_\\)+\\)" 1) diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index 43a8a6d6819..03545ff1327 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -897,8 +897,8 @@ The collapsed tokens are saved in `semantic-lex-block-streams'." "Create a lexical token. SYMBOL is a symbol representing the class of syntax found. START and END define the bounds of the token in the current buffer. -Optional STR is the string for the token only if the the bounds -in the buffer do not cover the string they represent. (As from +Optional STR is the string for the token only if the bounds in +the buffer do not cover the string they represent. (As from macro expansion.)" ;; This if statement checks the existance of a STR argument at ;; compile time, where STR is some symbol or constant. If the diff --git a/lisp/cedet/semantic/wisent/wisent.el b/lisp/cedet/semantic/wisent/wisent.el index febe1aa783c..0ca3e11ccaf 100644 --- a/lisp/cedet/semantic/wisent/wisent.el +++ b/lisp/cedet/semantic/wisent/wisent.el @@ -268,9 +268,9 @@ Return nil. Must be used in error recovery semantic actions. Optional argument BOUNDS is a pair (START . END) which indicates where the parenthesized block starts. Typically the value of a `$regionN' -variable, where `N' is the the Nth element of the current rule -components that match the block beginning. It defaults to the value -of the `$region' variable." +variable, where `N' is the Nth element of the current rule components +that match the block beginning. It defaults to the value of the +`$region' variable." (let ((start (car (or bounds $region))) end input) (if (not (number-or-marker-p start)) diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index e10c163b8db..49d77a35ddd 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el @@ -320,7 +320,7 @@ how many occur." (beginning-of-line) (while (re-search-forward es start t 2)) (if (re-search-forward es start t) - ;; If there is a single, the the answer is yes. + ;; If there is a single, the answer is yes. t ;; If there wasn't another, then the answer is no. nil) @@ -375,7 +375,7 @@ Moves out one named section." (define-mode-local-override semantic-beginning-of-context srecode-template-mode (&optional point) "Move to the beginning of the current context. -Moves the the beginning of one named section." +Moves the beginning of one named section." (if (semantic-up-context point) t (let ((es (regexp-quote (srecode-template-get-escape-start))) @@ -387,7 +387,7 @@ Moves the the beginning of one named section." (define-mode-local-override semantic-end-of-context srecode-template-mode (&optional point) "Move to the beginning of the current context. -Moves the the beginning of one named section." +Moves the beginning of one named section." (let ((name (srecode-up-context-get-name point)) (tag (semantic-current-tag)) (es (regexp-quote (srecode-template-get-escape-start)))) diff --git a/lisp/files-x.el b/lisp/files-x.el index 72e89211efc..f7be79eccfc 100644 --- a/lisp/files-x.el +++ b/lisp/files-x.el @@ -354,7 +354,7 @@ If .dir-locals.el was not found and OP is not `delete' then create this file in the current directory. If OP is `delete' then delete all existing settings of VARIABLE -from the the MODE alist ignoring the input argument VALUE." +from the MODE alist ignoring the input argument VALUE." (catch 'exit (unless enable-local-variables (throw 'exit (message "Directory-local variables are disabled"))) @@ -450,7 +450,7 @@ from the the MODE alist ignoring the input argument VALUE." ;;;###autoload (defun copy-dir-locals-to-file-locals-prop-line () - "Copy directory-local variables to the the -*- line." + "Copy directory-local variables to the -*- line." (interactive) (dolist (elt dir-local-variables-alist) (add-file-local-variable-prop-line (car elt) (cdr elt)))) |