diff options
| author | Juanma Barranquero | 2009-10-04 01:44:39 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2009-10-04 01:44:39 +0000 |
| commit | a30e71aee84b52e1de298a29a96888150711e4a5 (patch) | |
| tree | f1622d0464b75943033c7ba9f02eefe56b493d89 /lisp | |
| parent | 04e65fdbb74c6b08cc340281beb38ddd7d1a7d85 (diff) | |
| download | emacs-a30e71aee84b52e1de298a29a96888150711e4a5.tar.gz emacs-a30e71aee84b52e1de298a29a96888150711e4a5.zip | |
* 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.
Diffstat (limited to 'lisp')
| -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 @@ | |||
| 1 | 2009-10-04 Juanma Barranquero <lekktu@gmail.com> | 1 | 2009-10-04 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * files-x.el (modify-dir-local-variable) | ||
| 4 | (copy-dir-locals-to-file-locals-prop-line): | ||
| 5 | * cedet/ede/makefile-edit.el (makefile-beginning-of-command) | ||
| 6 | (makefile-end-of-command): | ||
| 7 | * cedet/semantic/lex.el (semantic-lex-token): | ||
| 8 | * cedet/semantic/analyze/fcn.el | ||
| 9 | (semantic-analyze-dereference-metatype-1): | ||
| 10 | * cedet/semantic/bovine/c.el (semantic-lex-cpp-define) | ||
| 11 | (semantic-lex-cpp-undef): | ||
| 12 | * cedet/semantic/wisent/wisent.el (wisent-skip-block): | ||
| 13 | * cedet/srecode/srt-mode.el (semantic-beginning-of-context) | ||
| 14 | (semantic-end-of-context): Fix typos in docstrings. | ||
| 15 | |||
| 3 | * recentf.el (recentf-unload-function): New function. | 16 | * recentf.el (recentf-unload-function): New function. |
| 4 | 17 | ||
| 5 | 2009-10-04 Chong Yidong <cyd@stupidchicken.com> | 18 | 2009-10-04 Chong Yidong <cyd@stupidchicken.com> |
| 6 | 19 | ||
| 20 | * cedet/ede.el (ede-project-placeholder-cache-file): | ||
| 7 | * cedet/semantic/db-file.el (semanticdb-default-save-directory): | 21 | * cedet/semantic/db-file.el (semanticdb-default-save-directory): |
| 8 | * cedet/srecode/map.el (srecode-map-save-file): | 22 | * cedet/srecode/map.el (srecode-map-save-file): |
| 9 | * cedet/ede.el (ede-project-placeholder-cache-file): Use | 23 | Use locate-user-emacs-file. Suggested by Juanma Barranquero. |
| 10 | locate-user-emacs-file. Suggested by Juanma Barranquero. | ||
| 11 | 24 | ||
| 12 | 2009-10-04 Glenn Morris <rgm@gnu.org> | 25 | 2009-10-04 Glenn Morris <rgm@gnu.org> |
| 13 | 26 | ||
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 @@ | |||
| 42 | ;;; Code: | 42 | ;;; Code: |
| 43 | 43 | ||
| 44 | (defun makefile-beginning-of-command () | 44 | (defun makefile-beginning-of-command () |
| 45 | "Move the the beginning of the current command." | 45 | "Move the beginning of the current command." |
| 46 | (interactive) | 46 | (interactive) |
| 47 | (if (save-excursion | 47 | (if (save-excursion |
| 48 | (forward-line -1) | 48 | (forward-line -1) |
| @@ -57,7 +57,7 @@ | |||
| 57 | (forward-line 1))) | 57 | (forward-line 1))) |
| 58 | 58 | ||
| 59 | (defun makefile-end-of-command () | 59 | (defun makefile-end-of-command () |
| 60 | "Move the the beginning of the current command." | 60 | "Move the beginning of the current command." |
| 61 | (interactive) | 61 | (interactive) |
| 62 | (end-of-line) | 62 | (end-of-line) |
| 63 | (while (and (makefile-line-continued-p) | 63 | (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." | |||
| 288 | 288 | ||
| 289 | (defun semantic-analyze-dereference-metatype-1 (ans scope) | 289 | (defun semantic-analyze-dereference-metatype-1 (ans scope) |
| 290 | "Do extra work after dereferencing a metatype. | 290 | "Do extra work after dereferencing a metatype. |
| 291 | ANS is the answer from the the language specific query. | 291 | ANS is the answer from the language specific query. |
| 292 | SCOPE is the current scope." | 292 | SCOPE is the current scope." |
| 293 | (require 'semantic/scope) | 293 | (require 'semantic/scope) |
| 294 | ;; If ANS is a string, or if ANS is a short tag, we | 294 | ;; 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 : | |||
| 228 | (define-lex-spp-macro-declaration-analyzer semantic-lex-cpp-define | 228 | (define-lex-spp-macro-declaration-analyzer semantic-lex-cpp-define |
| 229 | "A #define of a symbol with some value. | 229 | "A #define of a symbol with some value. |
| 230 | Record the symbol in the semantic preprocessor. | 230 | Record the symbol in the semantic preprocessor. |
| 231 | Return the the defined symbol as a special spp lex token." | 231 | Return the defined symbol as a special spp lex token." |
| 232 | "^\\s-*#\\s-*define\\s-+\\(\\(\\sw\\|\\s_\\)+\\)" 1 | 232 | "^\\s-*#\\s-*define\\s-+\\(\\(\\sw\\|\\s_\\)+\\)" 1 |
| 233 | (goto-char (match-end 0)) | 233 | (goto-char (match-end 0)) |
| 234 | (skip-chars-forward " \t") | 234 | (skip-chars-forward " \t") |
| @@ -264,7 +264,7 @@ Return the the defined symbol as a special spp lex token." | |||
| 264 | (define-lex-spp-macro-undeclaration-analyzer semantic-lex-cpp-undef | 264 | (define-lex-spp-macro-undeclaration-analyzer semantic-lex-cpp-undef |
| 265 | "A #undef of a symbol. | 265 | "A #undef of a symbol. |
| 266 | Remove the symbol from the semantic preprocessor. | 266 | Remove the symbol from the semantic preprocessor. |
| 267 | Return the the defined symbol as a special spp lex token." | 267 | Return the defined symbol as a special spp lex token." |
| 268 | "^\\s-*#\\s-*undef\\s-+\\(\\(\\sw\\|\\s_\\)+\\)" 1) | 268 | "^\\s-*#\\s-*undef\\s-+\\(\\(\\sw\\|\\s_\\)+\\)" 1) |
| 269 | 269 | ||
| 270 | 270 | ||
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'." | |||
| 897 | "Create a lexical token. | 897 | "Create a lexical token. |
| 898 | SYMBOL is a symbol representing the class of syntax found. | 898 | SYMBOL is a symbol representing the class of syntax found. |
| 899 | START and END define the bounds of the token in the current buffer. | 899 | START and END define the bounds of the token in the current buffer. |
| 900 | Optional STR is the string for the token only if the the bounds | 900 | Optional STR is the string for the token only if the bounds in |
| 901 | in the buffer do not cover the string they represent. (As from | 901 | the buffer do not cover the string they represent. (As from |
| 902 | macro expansion.)" | 902 | macro expansion.)" |
| 903 | ;; This if statement checks the existance of a STR argument at | 903 | ;; This if statement checks the existance of a STR argument at |
| 904 | ;; compile time, where STR is some symbol or constant. If the | 904 | ;; 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. | |||
| 268 | Must be used in error recovery semantic actions. | 268 | Must be used in error recovery semantic actions. |
| 269 | Optional argument BOUNDS is a pair (START . END) which indicates where | 269 | Optional argument BOUNDS is a pair (START . END) which indicates where |
| 270 | the parenthesized block starts. Typically the value of a `$regionN' | 270 | the parenthesized block starts. Typically the value of a `$regionN' |
| 271 | variable, where `N' is the the Nth element of the current rule | 271 | variable, where `N' is the Nth element of the current rule components |
| 272 | components that match the block beginning. It defaults to the value | 272 | that match the block beginning. It defaults to the value of the |
| 273 | of the `$region' variable." | 273 | `$region' variable." |
| 274 | (let ((start (car (or bounds $region))) | 274 | (let ((start (car (or bounds $region))) |
| 275 | end input) | 275 | end input) |
| 276 | (if (not (number-or-marker-p start)) | 276 | (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." | |||
| 320 | (beginning-of-line) | 320 | (beginning-of-line) |
| 321 | (while (re-search-forward es start t 2)) | 321 | (while (re-search-forward es start t 2)) |
| 322 | (if (re-search-forward es start t) | 322 | (if (re-search-forward es start t) |
| 323 | ;; If there is a single, the the answer is yes. | 323 | ;; If there is a single, the answer is yes. |
| 324 | t | 324 | t |
| 325 | ;; If there wasn't another, then the answer is no. | 325 | ;; If there wasn't another, then the answer is no. |
| 326 | nil) | 326 | nil) |
| @@ -375,7 +375,7 @@ Moves out one named section." | |||
| 375 | (define-mode-local-override semantic-beginning-of-context | 375 | (define-mode-local-override semantic-beginning-of-context |
| 376 | srecode-template-mode (&optional point) | 376 | srecode-template-mode (&optional point) |
| 377 | "Move to the beginning of the current context. | 377 | "Move to the beginning of the current context. |
| 378 | Moves the the beginning of one named section." | 378 | Moves the beginning of one named section." |
| 379 | (if (semantic-up-context point) | 379 | (if (semantic-up-context point) |
| 380 | t | 380 | t |
| 381 | (let ((es (regexp-quote (srecode-template-get-escape-start))) | 381 | (let ((es (regexp-quote (srecode-template-get-escape-start))) |
| @@ -387,7 +387,7 @@ Moves the the beginning of one named section." | |||
| 387 | (define-mode-local-override semantic-end-of-context | 387 | (define-mode-local-override semantic-end-of-context |
| 388 | srecode-template-mode (&optional point) | 388 | srecode-template-mode (&optional point) |
| 389 | "Move to the beginning of the current context. | 389 | "Move to the beginning of the current context. |
| 390 | Moves the the beginning of one named section." | 390 | Moves the beginning of one named section." |
| 391 | (let ((name (srecode-up-context-get-name point)) | 391 | (let ((name (srecode-up-context-get-name point)) |
| 392 | (tag (semantic-current-tag)) | 392 | (tag (semantic-current-tag)) |
| 393 | (es (regexp-quote (srecode-template-get-escape-start)))) | 393 | (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 | |||
| 354 | this file in the current directory. | 354 | this file in the current directory. |
| 355 | 355 | ||
| 356 | If OP is `delete' then delete all existing settings of VARIABLE | 356 | If OP is `delete' then delete all existing settings of VARIABLE |
| 357 | from the the MODE alist ignoring the input argument VALUE." | 357 | from the MODE alist ignoring the input argument VALUE." |
| 358 | (catch 'exit | 358 | (catch 'exit |
| 359 | (unless enable-local-variables | 359 | (unless enable-local-variables |
| 360 | (throw 'exit (message "Directory-local variables are disabled"))) | 360 | (throw 'exit (message "Directory-local variables are disabled"))) |
| @@ -450,7 +450,7 @@ from the the MODE alist ignoring the input argument VALUE." | |||
| 450 | 450 | ||
| 451 | ;;;###autoload | 451 | ;;;###autoload |
| 452 | (defun copy-dir-locals-to-file-locals-prop-line () | 452 | (defun copy-dir-locals-to-file-locals-prop-line () |
| 453 | "Copy directory-local variables to the the -*- line." | 453 | "Copy directory-local variables to the -*- line." |
| 454 | (interactive) | 454 | (interactive) |
| 455 | (dolist (elt dir-local-variables-alist) | 455 | (dolist (elt dir-local-variables-alist) |
| 456 | (add-file-local-variable-prop-line (car elt) (cdr elt)))) | 456 | (add-file-local-variable-prop-line (car elt) (cdr elt)))) |