diff options
102 files changed, 178 insertions, 176 deletions
diff --git a/admin/notes/commits b/admin/notes/commits index f37c3e020be..2c6f80c56f0 100644 --- a/admin/notes/commits +++ b/admin/notes/commits | |||
| @@ -17,7 +17,7 @@ Date: Tue, 31 Mar 2009 12:21:20 +0900 | |||
| 17 | files), not one-by-one. This is pretty easy using vc-dir now. | 17 | files), not one-by-one. This is pretty easy using vc-dir now. |
| 18 | 18 | ||
| 19 | (2) Make the log message describe the entire changeset, perhaps | 19 | (2) Make the log message describe the entire changeset, perhaps |
| 20 | including relevant changelog entiries (I often don't bother with | 20 | including relevant changelog entries (I often don't bother with |
| 21 | the latter if it's a trivial sort of change). | 21 | the latter if it's a trivial sort of change). |
| 22 | 22 | ||
| 23 | Many modern source-control systems vaguely distinguish the first | 23 | Many modern source-control systems vaguely distinguish the first |
diff --git a/configure.in b/configure.in index bf41b26b621..73e1d07edb7 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -1348,7 +1348,7 @@ AH_TEMPLATE(POINTER_TYPE, | |||
| 1348 | [Define as `void' if your compiler accepts `void *'; otherwise | 1348 | [Define as `void' if your compiler accepts `void *'; otherwise |
| 1349 | define as `char'.])dnl | 1349 | define as `char'.])dnl |
| 1350 | 1350 | ||
| 1351 | dnl Check for endianess | 1351 | dnl Check for endianness. |
| 1352 | AC_C_BIGENDIAN | 1352 | AC_C_BIGENDIAN |
| 1353 | 1353 | ||
| 1354 | AC_CACHE_CHECK([for __attribute__ ((__aligned__ (expr)))], | 1354 | AC_CACHE_CHECK([for __attribute__ ((__aligned__ (expr)))], |
diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi index 1f4f1d5d05d..49f455b4e41 100644 --- a/doc/misc/ada-mode.texi +++ b/doc/misc/ada-mode.texi | |||
| @@ -184,7 +184,7 @@ convention, where file names are a simple modification of the Ada | |||
| 184 | names, and the extension for specs and bodies are | 184 | names, and the extension for specs and bodies are |
| 185 | @samp{.ads} and @samp{.adb}, respectively. | 185 | @samp{.ads} and @samp{.adb}, respectively. |
| 186 | 186 | ||
| 187 | Ada mode uses the file extentions to allow moving from a package body | 187 | Ada mode uses the file extensions to allow moving from a package body |
| 188 | to the corresponding spec and back. | 188 | to the corresponding spec and back. |
| 189 | 189 | ||
| 190 | Ada mode supports a list of alternative file extensions for specs and bodies. | 190 | Ada mode supports a list of alternative file extensions for specs and bodies. |
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 7c3328b9d77..a3a93c6ef61 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi | |||
| @@ -26756,7 +26756,7 @@ Sudish Joseph---innumerable bug fixes. | |||
| 26756 | Ilja Weis---@file{gnus-topic.el}. | 26756 | Ilja Weis---@file{gnus-topic.el}. |
| 26757 | 26757 | ||
| 26758 | @item | 26758 | @item |
| 26759 | Steven L. Baur---lots and lots and lots of bugs detections and fixes. | 26759 | Steven L. Baur---lots and lots and lots of bug detection and fixes. |
| 26760 | 26760 | ||
| 26761 | @item | 26761 | @item |
| 26762 | Vladimir Alexiev---the refcard and reference booklets. | 26762 | Vladimir Alexiev---the refcard and reference booklets. |
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 20abc28690a..cc925906c28 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi | |||
| @@ -6216,7 +6216,7 @@ not started at exactly the right moment. | |||
| 6216 | @kindex ; | 6216 | @kindex ; |
| 6217 | 6217 | ||
| 6218 | Calling @code{org-timer-set-timer} from an Org-mode buffer runs a countdown | 6218 | Calling @code{org-timer-set-timer} from an Org-mode buffer runs a countdown |
| 6219 | timer. Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everwhere else. | 6219 | timer. Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everywhere else. |
| 6220 | 6220 | ||
| 6221 | @code{org-timer-set-timer} prompts the user for a duration and displays a | 6221 | @code{org-timer-set-timer} prompts the user for a duration and displays a |
| 6222 | countdown timer in the modeline. @code{org-timer-default-timer} sets the | 6222 | countdown timer in the modeline. @code{org-timer-default-timer} sets the |
diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi index 9cb7a637a05..0de12577b2d 100644 --- a/doc/misc/pgg.texi +++ b/doc/misc/pgg.texi | |||
| @@ -57,18 +57,18 @@ and various tools for secure communication. PGG also provides a simple | |||
| 57 | user interface to encrypt, decrypt, sign, and verify MIME messages. | 57 | user interface to encrypt, decrypt, sign, and verify MIME messages. |
| 58 | 58 | ||
| 59 | @ifnottex | 59 | @ifnottex |
| 60 | @insertcopying | 60 | @insertcopying |
| 61 | @end ifnottex | 61 | @end ifnottex |
| 62 | 62 | ||
| 63 | @menu | 63 | @menu |
| 64 | * Overview:: What PGG is. | 64 | * Overview:: What PGG is. |
| 65 | * Prerequisites:: Complicated stuff you may have to do. | 65 | * Prerequisites:: Complicated stuff you may have to do. |
| 66 | * How to use:: Getting started quickly. | 66 | * How to use:: Getting started quickly. |
| 67 | * Architecture:: | 67 | * Architecture:: |
| 68 | * Parsing OpenPGP packets:: | 68 | * Parsing OpenPGP packets:: |
| 69 | * GNU Free Documentation License:: The license for this documentation. | 69 | * GNU Free Documentation License:: The license for this documentation. |
| 70 | * Function Index:: | 70 | * Function Index:: |
| 71 | * Variable Index:: | 71 | * Variable Index:: |
| 72 | @end menu | 72 | @end menu |
| 73 | 73 | ||
| 74 | @node Overview | 74 | @node Overview |
| @@ -137,10 +137,10 @@ list autoload setting for desired functions as follows. | |||
| 137 | @end lisp | 137 | @end lisp |
| 138 | 138 | ||
| 139 | @menu | 139 | @menu |
| 140 | * User Commands:: | 140 | * User Commands:: |
| 141 | * Selecting an implementation:: | 141 | * Selecting an implementation:: |
| 142 | * Caching passphrase:: | 142 | * Caching passphrase:: |
| 143 | * Default user identity:: | 143 | * Default user identity:: |
| 144 | @end menu | 144 | @end menu |
| 145 | 145 | ||
| 146 | @node User Commands | 146 | @node User Commands |
| @@ -358,13 +358,13 @@ singleton object wrapped with the luna object system. | |||
| 358 | 358 | ||
| 359 | Since PGG was designed for accessing and developing PGP functionality, | 359 | Since PGG was designed for accessing and developing PGP functionality, |
| 360 | the architecture had to be designed not just for interoperability but | 360 | the architecture had to be designed not just for interoperability but |
| 361 | also for extensiblity. In this chapter we explore the architecture | 361 | also for extensibility. In this chapter we explore the architecture |
| 362 | while finding out how to write the PGG back end. | 362 | while finding out how to write the PGG back end. |
| 363 | 363 | ||
| 364 | @menu | 364 | @menu |
| 365 | * Initializing:: | 365 | * Initializing:: |
| 366 | * Back end methods:: | 366 | * Back end methods:: |
| 367 | * Getting output:: | 367 | * Getting output:: |
| 368 | @end menu | 368 | @end menu |
| 369 | 369 | ||
| 370 | @node Initializing | 370 | @node Initializing |
diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index eb59f6d6b94..ad6159feb1a 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi | |||
| @@ -606,7 +606,7 @@ Emacs Lisp. It is an LALR parser suitable for complex languages. | |||
| 606 | @c LocalWords: concat concocting const constantness ctxt Decl defcustom | 606 | @c LocalWords: concat concocting const constantness ctxt Decl defcustom |
| 607 | @c LocalWords: deffn deffnx defun defvar destructor's dfn diff dir | 607 | @c LocalWords: deffn deffnx defun defvar destructor's dfn diff dir |
| 608 | @c LocalWords: doc docstring EDE EIEIO elisp emacsman emph enum | 608 | @c LocalWords: doc docstring EDE EIEIO elisp emacsman emph enum |
| 609 | @c LocalWords: eq Exp EXPANDFULL expresssion fn foo func funcall | 609 | @c LocalWords: eq Exp EXPANDFULL expression fn foo func funcall |
| 610 | @c LocalWords: ia ids iff ifinfo imenu imenus init int isearch itemx java kbd | 610 | @c LocalWords: ia ids iff ifinfo imenu imenus init int isearch itemx java kbd |
| 611 | @c LocalWords: keymap keywordtable lang languagemode lexer lexing Ludlam | 611 | @c LocalWords: keymap keywordtable lang languagemode lexer lexing Ludlam |
| 612 | @c LocalWords: menubar metaparent metaparents min minibuffer Misc mode's | 612 | @c LocalWords: menubar metaparent metaparents min minibuffer Misc mode's |
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 2ffd5e1e15b..5fbc872d3e9 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 | |||
| @@ -1612,7 +1612,7 @@ Changes in Emacs 13 | |||
| 1612 | The string "../lisp" now adds to the front of the load-path | 1612 | The string "../lisp" now adds to the front of the load-path |
| 1613 | used for searching for Lisp files during Emacs initialization. | 1613 | used for searching for Lisp files during Emacs initialization. |
| 1614 | It used to replace the path specified in paths.h entirely. | 1614 | It used to replace the path specified in paths.h entirely. |
| 1615 | Now the directory ../lisp is searched first and the directoris | 1615 | Now the directory ../lisp is searched first and the directories |
| 1616 | specified in paths.h are searched afterward. | 1616 | specified in paths.h are searched afterward. |
| 1617 | 1617 | ||
| 1618 | 1618 | ||
| @@ -1670,7 +1670,7 @@ Changes in Emacs 1.12 | |||
| 1670 | the string, it is used unchanged. | 1670 | the string, it is used unchanged. |
| 1671 | 1671 | ||
| 1672 | One way this feature can be used is to fix bad keyboard | 1672 | One way this feature can be used is to fix bad keyboard |
| 1673 | designes. For example, on some terminals, Delete is | 1673 | designs. For example, on some terminals, Delete is |
| 1674 | Shift-Underscore. Since Delete is a more useful character | 1674 | Shift-Underscore. Since Delete is a more useful character |
| 1675 | than Underscore, it is an improvement to make the unshifted | 1675 | than Underscore, it is an improvement to make the unshifted |
| 1676 | character Delete and the shifted one Underscore. This can | 1676 | character Delete and the shifted one Underscore. This can |
| @@ -2446,7 +2446,7 @@ Changes in Emacs 1.1 | |||
| 2446 | containing *'s, etc, all processed by the shell). Also, you | 2446 | containing *'s, etc, all processed by the shell). Also, you |
| 2447 | can dired more than one directory; dired names the buffer | 2447 | can dired more than one directory; dired names the buffer |
| 2448 | according to the filespec or directory name. Reinvoking | 2448 | according to the filespec or directory name. Reinvoking |
| 2449 | dired on a directory already direded just switches back to | 2449 | dired on a directory already diredded just switches back to |
| 2450 | the same directory used last time; do M-x revert if you want | 2450 | the same directory used last time; do M-x revert if you want |
| 2451 | to read in the current contents of the directory. | 2451 | to read in the current contents of the directory. |
| 2452 | 2452 | ||
diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el index 3b6e14c459b..c5c7061663e 100644 --- a/leim/quail/tibetan.el +++ b/leim/quail/tibetan.el | |||
| @@ -337,7 +337,7 @@ | |||
| 337 | ("(" . "$(7!l(B") | 337 | ("(" . "$(7!l(B") |
| 338 | ("0" . "$(7!P(B") | 338 | ("0" . "$(7!P(B") |
| 339 | (")" . "$(7!m(B") | 339 | (")" . "$(7!m(B") |
| 340 | ;;; ("-" ) ; enphatic, not yet supported | 340 | ;;; ("-" ) ; emphatic, not yet supported |
| 341 | ;;; ("_" ) ; id. | 341 | ;;; ("_" ) ; id. |
| 342 | ;;; ("=" ) ; special sign, not yet supported | 342 | ;;; ("=" ) ; special sign, not yet supported |
| 343 | ("+" . "$(7!A(B") | 343 | ("+" . "$(7!A(B") |
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index 9fba51a33de..e335617df4d 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c | |||
| @@ -346,7 +346,7 @@ read_scores (const char *filename, struct score_entry **scores, int *count) | |||
| 346 | return -1; | 346 | return -1; |
| 347 | while ((readval = read_score (f, &ret[scorecount])) == 0) | 347 | while ((readval = read_score (f, &ret[scorecount])) == 0) |
| 348 | { | 348 | { |
| 349 | /* We encoutered an error */ | 349 | /* We encountered an error. */ |
| 350 | if (readval < 0) | 350 | if (readval < 0) |
| 351 | return -1; | 351 | return -1; |
| 352 | scorecount++; | 352 | scorecount++; |
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 702248dd975..4baec98725c 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 | |||
| @@ -16735,7 +16735,7 @@ | |||
| 16735 | * progmodes/cc-cmds.el (c-beginning-of-statement (and | 16735 | * progmodes/cc-cmds.el (c-beginning-of-statement (and |
| 16736 | subfunctions)): Adapt c-\(back\|forward\)-over-illiterals such | 16736 | subfunctions)): Adapt c-\(back\|forward\)-over-illiterals such |
| 16737 | that movement over macros and code are rigorously separated from | 16737 | that movement over macros and code are rigorously separated from |
| 16738 | eachother. Correct a few incidental bugs. | 16738 | each other. Correct a few incidental bugs. |
| 16739 | 16739 | ||
| 16740 | * progmodes/cc-cmds.el: Restructure c-beginning-of-statement: | 16740 | * progmodes/cc-cmds.el: Restructure c-beginning-of-statement: |
| 16741 | Improve its doc-string. Improve the handling of certain specific cases. | 16741 | Improve its doc-string. Improve the handling of certain specific cases. |
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index c5d34fc3e3b..b2121de260d 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | ;; systematically couple overlays, graphics, and other features with | 49 | ;; systematically couple overlays, graphics, and other features with |
| 50 | ;; allout-governed text. | 50 | ;; allout-governed text. |
| 51 | 51 | ||
| 52 | ;;;_: Code (structured with comments that delinieate an allout outline) | 52 | ;;;_: Code (structured with comments that delineate an allout outline) |
| 53 | 53 | ||
| 54 | ;;;_ : General Environment | 54 | ;;;_ : General Environment |
| 55 | (require 'allout) | 55 | (require 'allout) |
diff --git a/lisp/allout.el b/lisp/allout.el index 4098ba9ba5b..d3d4cf835ad 100644 --- a/lisp/allout.el +++ b/lisp/allout.el | |||
| @@ -1544,7 +1544,7 @@ substitution is used against the regexp matches, a la `replace-match'.") | |||
| 1544 | "Variable for regexps matching plaintext to remove before encryption. | 1544 | "Variable for regexps matching plaintext to remove before encryption. |
| 1545 | 1545 | ||
| 1546 | This is used to detect strings in encryption results that would | 1546 | This is used to detect strings in encryption results that would |
| 1547 | register as allout mode structural elements, for exmple, as a | 1547 | register as allout mode structural elements, for example, as a |
| 1548 | topic prefix. | 1548 | topic prefix. |
| 1549 | 1549 | ||
| 1550 | Entries must be symbols that are bound to the desired regexp values. | 1550 | Entries must be symbols that are bound to the desired regexp values. |
| @@ -3543,7 +3543,7 @@ PRIOR-BULLET.) | |||
| 3543 | Fifth arg, NUMBER-CONTROL, matters only if `allout-numbered-bullet' | 3543 | Fifth arg, NUMBER-CONTROL, matters only if `allout-numbered-bullet' |
| 3544 | is non-nil *and* no specific INSTEAD was specified. Then | 3544 | is non-nil *and* no specific INSTEAD was specified. Then |
| 3545 | NUMBER-CONTROL non-nil forces prefix to either numbered or | 3545 | NUMBER-CONTROL non-nil forces prefix to either numbered or |
| 3546 | denumbered format, depending on the value of the sixth arg, INDEX. | 3546 | unnumbered format, depending on the value of the sixth arg, INDEX. |
| 3547 | 3547 | ||
| 3548 | \(Note that NUMBER-CONTROL does *not* apply to level 1 topics. Sorry...) | 3548 | \(Note that NUMBER-CONTROL does *not* apply to level 1 topics. Sorry...) |
| 3549 | 3549 | ||
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index ff7edf40dcb..4d6f02a40b7 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el | |||
| @@ -68,7 +68,7 @@ | |||
| 68 | ;; | 68 | ;; |
| 69 | ;; Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> for pointing me to ECMA-48. | 69 | ;; Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> for pointing me to ECMA-48. |
| 70 | ;; | 70 | ;; |
| 71 | ;; Stefan Monnier <foo@acm.com> explaing obscure font-lock stuff and | 71 | ;; Stefan Monnier <foo@acm.com> for explaining obscure font-lock stuff and for |
| 72 | ;; code suggestions. | 72 | ;; code suggestions. |
| 73 | 73 | ||
| 74 | 74 | ||
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index f011d187a42..f1f79252857 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el | |||
| @@ -125,7 +125,7 @@ | |||
| 125 | "The mode settings for Calc buffer when put in embedded mode.") | 125 | "The mode settings for Calc buffer when put in embedded mode.") |
| 126 | 126 | ||
| 127 | (defun calc-embedded-save-original-modes () | 127 | (defun calc-embedded-save-original-modes () |
| 128 | "Save the current Calc modes when entereding embedded mode." | 128 | "Save the current Calc modes when entering embedded mode." |
| 129 | (let ((calcbuf (save-excursion | 129 | (let ((calcbuf (save-excursion |
| 130 | (calc-create-buffer) | 130 | (calc-create-buffer) |
| 131 | (current-buffer))) | 131 | (current-buffer))) |
| @@ -144,7 +144,7 @@ | |||
| 144 | (let ((var (cdr (car v)))) | 144 | (let ((var (cdr (car v)))) |
| 145 | (unless (memq var '(the-language the-display-just)) | 145 | (unless (memq var '(the-language the-display-just)) |
| 146 | (setq modes | 146 | (setq modes |
| 147 | (cons (cons var (symbol-value var)) | 147 | (cons (cons var (symbol-value var)) |
| 148 | modes)))) | 148 | modes)))) |
| 149 | (setq v (cdr v)))) | 149 | (setq v (cdr v)))) |
| 150 | (setq calc-embedded-original-modes (cons lang modes))) | 150 | (setq calc-embedded-original-modes (cons lang modes))) |
| @@ -182,7 +182,7 @@ | |||
| 182 | (calc-set-mode-line)))) | 182 | (calc-set-mode-line)))) |
| 183 | (setq calc-embedded-original-modes nil))) | 183 | (setq calc-embedded-original-modes nil))) |
| 184 | 184 | ||
| 185 | ;; The variables calc-embed-outer-top, calc-embed-outer-bot, | 185 | ;; The variables calc-embed-outer-top, calc-embed-outer-bot, |
| 186 | ;; calc-embed-top and calc-embed-bot are | 186 | ;; calc-embed-top and calc-embed-bot are |
| 187 | ;; local to calc-do-embedded, calc-embedded-mark-formula, | 187 | ;; local to calc-do-embedded, calc-embedded-mark-formula, |
| 188 | ;; calc-embedded-duplicate, calc-embedded-new-formula and | 188 | ;; calc-embedded-duplicate, calc-embedded-new-formula and |
| @@ -195,7 +195,7 @@ | |||
| 195 | 195 | ||
| 196 | ;; The variable calc-embed-arg is local to calc-do-embedded, | 196 | ;; The variable calc-embed-arg is local to calc-do-embedded, |
| 197 | ;; calc-embedded-update-formula, calc-embedded-edit and | 197 | ;; calc-embedded-update-formula, calc-embedded-edit and |
| 198 | ;; calc-do-embedded-activate, but is used by | 198 | ;; calc-do-embedded-activate, but is used by |
| 199 | ;; calc-embedded-make-info, which is called by the above | 199 | ;; calc-embedded-make-info, which is called by the above |
| 200 | ;; functions. | 200 | ;; functions. |
| 201 | (defvar calc-embed-arg) | 201 | (defvar calc-embed-arg) |
| @@ -208,14 +208,14 @@ | |||
| 208 | 208 | ||
| 209 | ;; The following is to take care of any minor modes which override | 209 | ;; The following is to take care of any minor modes which override |
| 210 | ;; a Calc command. | 210 | ;; a Calc command. |
| 211 | (defvar calc-override-minor-modes-map | 211 | (defvar calc-override-minor-modes-map |
| 212 | (make-sparse-keymap) | 212 | (make-sparse-keymap) |
| 213 | "A list of keybindings that might be overwritten by minor modes.") | 213 | "A list of keybindings that might be overwritten by minor modes.") |
| 214 | 214 | ||
| 215 | ;; Add any keys that might be overwritten here. | 215 | ;; Add any keys that might be overwritten here. |
| 216 | (define-key calc-override-minor-modes-map "`" 'calc-edit) | 216 | (define-key calc-override-minor-modes-map "`" 'calc-edit) |
| 217 | 217 | ||
| 218 | (defvar calc-override-minor-modes | 218 | (defvar calc-override-minor-modes |
| 219 | (cons t calc-override-minor-modes-map)) | 219 | (cons t calc-override-minor-modes-map)) |
| 220 | 220 | ||
| 221 | (defun calc-do-embedded (calc-embed-arg end obeg oend) | 221 | (defun calc-do-embedded (calc-embed-arg end obeg oend) |
| @@ -279,7 +279,7 @@ | |||
| 279 | (calc-embedded-save-original-modes) | 279 | (calc-embedded-save-original-modes) |
| 280 | (or calc-embedded-globals | 280 | (or calc-embedded-globals |
| 281 | (calc-find-globals)) | 281 | (calc-find-globals)) |
| 282 | (setq info | 282 | (setq info |
| 283 | (calc-embedded-make-info (point) nil t calc-embed-arg end obeg oend)) | 283 | (calc-embedded-make-info (point) nil t calc-embed-arg end obeg oend)) |
| 284 | (if (eq (car-safe (aref info 8)) 'error) | 284 | (if (eq (car-safe (aref info 8)) 'error) |
| 285 | (progn | 285 | (progn |
| @@ -564,7 +564,7 @@ The command \\[yank] can retrieve it from there." | |||
| 564 | (goto-char calc-embed-outer-bot) | 564 | (goto-char calc-embed-outer-bot) |
| 565 | (insert "\n") | 565 | (insert "\n") |
| 566 | (setq new-top (point)) | 566 | (setq new-top (point)) |
| 567 | (insert-buffer-substring (current-buffer) | 567 | (insert-buffer-substring (current-buffer) |
| 568 | calc-embed-outer-top calc-embed-outer-bot) | 568 | calc-embed-outer-top calc-embed-outer-bot) |
| 569 | (goto-char (+ new-top (- calc-embed-top calc-embed-outer-top))) | 569 | (goto-char (+ new-top (- calc-embed-top calc-embed-outer-top))) |
| 570 | (let ((calc-embedded-quiet (if already t 'x))) | 570 | (let ((calc-embedded-quiet (if already t 'x))) |
| @@ -659,7 +659,7 @@ The command \\[yank] can retrieve it from there." | |||
| 659 | (equal (symbol-value (car (car v))) value)) | 659 | (equal (symbol-value (car (car v))) value)) |
| 660 | (progn | 660 | (progn |
| 661 | (setq changed t) | 661 | (setq changed t) |
| 662 | (if temp (setq calc-embed-prev-modes | 662 | (if temp (setq calc-embed-prev-modes |
| 663 | (cons (cons (car (car v)) | 663 | (cons (cons (car (car v)) |
| 664 | (symbol-value (car (car v)))) | 664 | (symbol-value (car (car v)))) |
| 665 | calc-embed-prev-modes))) | 665 | calc-embed-prev-modes))) |
| @@ -809,12 +809,12 @@ The command \\[yank] can retrieve it from there." | |||
| 809 | (list modes emodes pmodes))) | 809 | (list modes emodes pmodes))) |
| 810 | 810 | ||
| 811 | ;; The variable calc-embed-vars-used is local to calc-embedded-make-info, | 811 | ;; The variable calc-embed-vars-used is local to calc-embedded-make-info, |
| 812 | ;; calc-embedded-evaluate-expr and calc-embedded-update, but is | 812 | ;; calc-embedded-evaluate-expr and calc-embedded-update, but is |
| 813 | ;; used by calc-embedded-find-vars, which is called by the above functions. | 813 | ;; used by calc-embedded-find-vars, which is called by the above functions. |
| 814 | (defvar calc-embed-vars-used) | 814 | (defvar calc-embed-vars-used) |
| 815 | 815 | ||
| 816 | (defun calc-embedded-make-info (point cbuf fresh &optional | 816 | (defun calc-embedded-make-info (point cbuf fresh &optional |
| 817 | calc-embed-top calc-embed-bot | 817 | calc-embed-top calc-embed-bot |
| 818 | calc-embed-outer-top calc-embed-outer-bot) | 818 | calc-embed-outer-top calc-embed-outer-bot) |
| 819 | (let* ((bufentry (assq (current-buffer) calc-embedded-active)) | 819 | (let* ((bufentry (assq (current-buffer) calc-embedded-active)) |
| 820 | (found bufentry) | 820 | (found bufentry) |
| @@ -831,7 +831,7 @@ The command \\[yank] can retrieve it from there." | |||
| 831 | (newform (assoc major-mode calc-embedded-open-close-formula-alist)) | 831 | (newform (assoc major-mode calc-embedded-open-close-formula-alist)) |
| 832 | (newword (assoc major-mode calc-embedded-word-regexp-alist)) | 832 | (newword (assoc major-mode calc-embedded-word-regexp-alist)) |
| 833 | (newplain (assoc major-mode calc-embedded-open-close-plain-alist)) | 833 | (newplain (assoc major-mode calc-embedded-open-close-plain-alist)) |
| 834 | (newnewform | 834 | (newnewform |
| 835 | (assoc major-mode calc-embedded-open-close-new-formula-alist)) | 835 | (assoc major-mode calc-embedded-open-close-new-formula-alist)) |
| 836 | (newmode (assoc major-mode calc-embedded-open-close-mode-alist))) | 836 | (newmode (assoc major-mode calc-embedded-open-close-mode-alist))) |
| 837 | (when newann | 837 | (when newann |
| @@ -874,9 +874,9 @@ The command \\[yank] can retrieve it from there." | |||
| 874 | (aset info 1 (or cbuf (save-excursion | 874 | (aset info 1 (or cbuf (save-excursion |
| 875 | (calc-create-buffer) | 875 | (calc-create-buffer) |
| 876 | (current-buffer))))) | 876 | (current-buffer))))) |
| 877 | (if (and | 877 | (if (and |
| 878 | (or (integerp calc-embed-top) (equal calc-embed-top '(4))) | 878 | (or (integerp calc-embed-top) (equal calc-embed-top '(4))) |
| 879 | (not calc-embed-bot)) | 879 | (not calc-embed-bot)) |
| 880 | ; started with a user-supplied argument | 880 | ; started with a user-supplied argument |
| 881 | (progn | 881 | (progn |
| 882 | (if (equal calc-embed-top '(4)) | 882 | (if (equal calc-embed-top '(4)) |
| @@ -1157,7 +1157,7 @@ The command \\[yank] can retrieve it from there." | |||
| 1157 | (if need-display | 1157 | (if need-display |
| 1158 | (calc-embedded-set-justify (cdr (car calc-embed-prev-modes))))) | 1158 | (calc-embedded-set-justify (cdr (car calc-embed-prev-modes))))) |
| 1159 | (t | 1159 | (t |
| 1160 | (set (car (car calc-embed-prev-modes)) | 1160 | (set (car (car calc-embed-prev-modes)) |
| 1161 | (cdr (car calc-embed-prev-modes))))) | 1161 | (cdr (car calc-embed-prev-modes))))) |
| 1162 | (setq calc-embed-prev-modes (cdr calc-embed-prev-modes)))))) | 1162 | (setq calc-embed-prev-modes (cdr calc-embed-prev-modes)))))) |
| 1163 | 1163 | ||
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 8b816665d97..5429509af86 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el | |||
| @@ -432,7 +432,7 @@ | |||
| 432 | (define-key calc-mode-map "ls" 'calc-spn) | 432 | (define-key calc-mode-map "ls" 'calc-spn) |
| 433 | (define-key calc-mode-map "lm" 'calc-midi) | 433 | (define-key calc-mode-map "lm" 'calc-midi) |
| 434 | (define-key calc-mode-map "lf" 'calc-freq) | 434 | (define-key calc-mode-map "lf" 'calc-freq) |
| 435 | 435 | ||
| 436 | (define-key calc-mode-map "l?" 'calc-l-prefix-help) | 436 | (define-key calc-mode-map "l?" 'calc-l-prefix-help) |
| 437 | 437 | ||
| 438 | (define-key calc-mode-map "m" nil) | 438 | (define-key calc-mode-map "m" nil) |
| @@ -2867,7 +2867,7 @@ If X is not an error form, return 1." | |||
| 2867 | (memq (nth 2 expr) '(var-inf var-uinf var-nan))))) | 2867 | (memq (nth 2 expr) '(var-inf var-uinf var-nan))))) |
| 2868 | 2868 | ||
| 2869 | ;; The variable math-integral-cache is originally declared in calcalg2.el, | 2869 | ;; The variable math-integral-cache is originally declared in calcalg2.el, |
| 2870 | ;; but is set by math-defintegral and math-definitegral2. | 2870 | ;; but is set by math-defintegral and math-defintegral-2. |
| 2871 | (defvar math-integral-cache) | 2871 | (defvar math-integral-cache) |
| 2872 | 2872 | ||
| 2873 | (defmacro math-defintegral (funcs &rest code) | 2873 | (defmacro math-defintegral (funcs &rest code) |
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el index 1a4e0d9f6ba..2151e9ef53b 100644 --- a/lisp/cedet/semantic/bovine/el.el +++ b/lisp/cedet/semantic/bovine/el.el | |||
| @@ -823,7 +823,7 @@ In Emacs Lisp this is easily defined by parenthesis bounding." | |||
| 823 | (&optional point) | 823 | (&optional point) |
| 824 | "Return a list of tag classes allowed at POINT. | 824 | "Return a list of tag classes allowed at POINT. |
| 825 | Emacs Lisp knows much more about the class of the tag needed to perform | 825 | Emacs Lisp knows much more about the class of the tag needed to perform |
| 826 | completion than some languages. We distincly know if we are to be a | 826 | completion than some languages. We distinctly know if we are to be a |
| 827 | function name, variable name, or any type of symbol. We could identify | 827 | function name, variable name, or any type of symbol. We could identify |
| 828 | fields and such to, but that is for some other day." | 828 | fields and such to, but that is for some other day." |
| 829 | (save-excursion | 829 | (save-excursion |
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index f1aee1ef381..6709236c541 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el | |||
| @@ -891,7 +891,7 @@ making the action of homing in on a token faster.") | |||
| 891 | This completion is calculated and saved for future use.") | 891 | This completion is calculated and saved for future use.") |
| 892 | (last-whitespace-completion :type (or null string) | 892 | (last-whitespace-completion :type (or null string) |
| 893 | :documentation "The last whitespace completion. | 893 | :documentation "The last whitespace completion. |
| 894 | For partial completion, SPC will disabiguate over whitespace type | 894 | For partial completion, SPC will disambiguate over whitespace type |
| 895 | characters. This is the last calculated version.") | 895 | characters. This is the last calculated version.") |
| 896 | (current-exact-match :type list | 896 | (current-exact-match :type list |
| 897 | :protection :protected | 897 | :protection :protected |
| @@ -1353,7 +1353,7 @@ to click on the items to aid in completion.") | |||
| 1353 | (defmethod semantic-displayor-show-request ((obj semantic-displayor-traditional)) | 1353 | (defmethod semantic-displayor-show-request ((obj semantic-displayor-traditional)) |
| 1354 | "A request to show the current tags table." | 1354 | "A request to show the current tags table." |
| 1355 | 1355 | ||
| 1356 | ;; NOTE TO SELF. Find the character to type next, and emphesize it. | 1356 | ;; NOTE TO SELF. Find the character to type next, and emphasize it. |
| 1357 | 1357 | ||
| 1358 | (with-output-to-temp-buffer "*Completions*" | 1358 | (with-output-to-temp-buffer "*Completions*" |
| 1359 | (display-completion-list | 1359 | (display-completion-list |
| @@ -1377,7 +1377,7 @@ given tag, by highlighting its location.") | |||
| 1377 | ) | 1377 | ) |
| 1378 | "Abstract displayor supporting `focus'. | 1378 | "Abstract displayor supporting `focus'. |
| 1379 | A displayor which has the ability to focus in on one tag. | 1379 | A displayor which has the ability to focus in on one tag. |
| 1380 | Focusing is a way of differentiationg between multiple tags | 1380 | Focusing is a way of differentiating among multiple tags |
| 1381 | which have the same name." | 1381 | which have the same name." |
| 1382 | :abstract t) | 1382 | :abstract t) |
| 1383 | 1383 | ||
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el index 661bc8d6841..943ccf23031 100644 --- a/lisp/cedet/semantic/db-file.el +++ b/lisp/cedet/semantic/db-file.el | |||
| @@ -289,7 +289,7 @@ Argument OBJ is the object to write." | |||
| 289 | (when (and (boundp semantic-show-unmatched-syntax-mode) | 289 | (when (and (boundp semantic-show-unmatched-syntax-mode) |
| 290 | semantic-show-unmatched-syntax-mode) | 290 | semantic-show-unmatched-syntax-mode) |
| 291 | ;; Only do this if the user runs unmatched syntax | 291 | ;; Only do this if the user runs unmatched syntax |
| 292 | ;; mode display enties. | 292 | ;; mode display entries. |
| 293 | (oset obj unmatched-syntax | 293 | (oset obj unmatched-syntax |
| 294 | (semantic-show-unmatched-lex-tokens-fetch)) | 294 | (semantic-show-unmatched-lex-tokens-fetch)) |
| 295 | ) | 295 | ) |
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index ce76dddf359..a4c4bd99f26 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el | |||
| @@ -368,7 +368,7 @@ a master list." | |||
| 368 | (semanticdb-typecache-merge-streams | 368 | (semanticdb-typecache-merge-streams |
| 369 | incstream | 369 | incstream |
| 370 | ;; Getting the cache from this table will also cause this | 370 | ;; Getting the cache from this table will also cause this |
| 371 | ;; file to update it's cache from it's decendants. | 371 | ;; file to update its cache from its decendents. |
| 372 | ;; | 372 | ;; |
| 373 | ;; In theory, caches are only built for most includes | 373 | ;; In theory, caches are only built for most includes |
| 374 | ;; only once (in the loop before this one), so this ends | 374 | ;; only once (in the loop before this one), so this ends |
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el index f83d30ac12a..c9013ed8c90 100644 --- a/lisp/cedet/semantic/db.el +++ b/lisp/cedet/semantic/db.el | |||
| @@ -606,7 +606,7 @@ The file associated with OBJ does not need to be in a buffer." | |||
| 606 | ;; The lexical table should be good too. | 606 | ;; The lexical table should be good too. |
| 607 | (when (featurep 'semantic/lex-spp) | 607 | (when (featurep 'semantic/lex-spp) |
| 608 | (oset table lexical-table (semantic-lex-spp-save-table))) | 608 | (oset table lexical-table (semantic-lex-spp-save-table))) |
| 609 | ;; this implies dirtyness | 609 | ;; this implies dirtiness |
| 610 | (semanticdb-set-dirty table) | 610 | (semanticdb-set-dirty table) |
| 611 | 611 | ||
| 612 | ;; Synchronize the index | 612 | ;; Synchronize the index |
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index 8115f3c9a16..4ac2733a34f 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el | |||
| @@ -537,7 +537,7 @@ This function is for internal use by `semantic-edits-incremental-parser'." | |||
| 537 | ;; We want to take some set of changes, and group them | 537 | ;; We want to take some set of changes, and group them |
| 538 | ;; together into a small change group. One change forces | 538 | ;; together into a small change group. One change forces |
| 539 | ;; a reparse of a larger region (the size of some set of | 539 | ;; a reparse of a larger region (the size of some set of |
| 540 | ;; tags it encompases.) It may contain several tags. | 540 | ;; tags it encompasses.) It may contain several tags. |
| 541 | ;; That region may have other changes in it (several small | 541 | ;; That region may have other changes in it (several small |
| 542 | ;; changes in one function, for example.) | 542 | ;; changes in one function, for example.) |
| 543 | ;; Optimize for the simple cases here, but try to handle | 543 | ;; Optimize for the simple cases here, but try to handle |
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el index 8a099a9bfb0..876ec9bbd4a 100644 --- a/lisp/cedet/semantic/format.el +++ b/lisp/cedet/semantic/format.el | |||
| @@ -603,7 +603,7 @@ This associates a symbol, such as 'public with the st ring \"+\".") | |||
| 603 | "Convert PROTECTION-SYMBOL to a string for UML. | 603 | "Convert PROTECTION-SYMBOL to a string for UML. |
| 604 | By default, uses `semantic-format-tag-protection-symbol-to-string-assoc-list' | 604 | By default, uses `semantic-format-tag-protection-symbol-to-string-assoc-list' |
| 605 | to convert. | 605 | to convert. |
| 606 | By defaul character returns are: | 606 | By default character returns are: |
| 607 | public -- + | 607 | public -- + |
| 608 | private -- - | 608 | private -- - |
| 609 | protected -- #. | 609 | protected -- #. |
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index 5489765dcc8..8009a257a7b 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el | |||
| @@ -639,7 +639,7 @@ and what valid VAL values are." | |||
| 639 | 639 | ||
| 640 | ;;; Macro Merging | 640 | ;;; Macro Merging |
| 641 | ;; | 641 | ;; |
| 642 | ;; Used when token streams from different macros include eachother. | 642 | ;; Used when token streams from different macros include each other. |
| 643 | ;; Merged macro streams perform in place replacements. | 643 | ;; Merged macro streams perform in place replacements. |
| 644 | 644 | ||
| 645 | (defun semantic-lex-spp-merge-streams (raw-stream) | 645 | (defun semantic-lex-spp-merge-streams (raw-stream) |
diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el index 3fe3f05f1fb..d9a3ede360d 100644 --- a/lisp/cedet/semantic/sb.el +++ b/lisp/cedet/semantic/sb.el | |||
| @@ -399,7 +399,7 @@ Returns the tag list, or t for an error." | |||
| 399 | (if (listp out) | 399 | (if (listp out) |
| 400 | (condition-case nil | 400 | (condition-case nil |
| 401 | (progn | 401 | (progn |
| 402 | ;; This brings externally defind methods into | 402 | ;; This brings externally defined methods into |
| 403 | ;; their classes, and creates meta classes for | 403 | ;; their classes, and creates meta classes for |
| 404 | ;; orphans. | 404 | ;; orphans. |
| 405 | (setq out (semantic-adopt-external-members out)) | 405 | (setq out (semantic-adopt-external-members out)) |
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el index e79953400a7..c2f080ce75b 100644 --- a/lisp/cedet/semantic/texi.el +++ b/lisp/cedet/semantic/texi.el | |||
| @@ -597,7 +597,7 @@ Note: TYPE not yet implemented." | |||
| 597 | ;; ;; If we have a string, do the replacement. | 597 | ;; ;; If we have a string, do the replacement. |
| 598 | ;; (delete-region (semantic-tag-start tag) | 598 | ;; (delete-region (semantic-tag-start tag) |
| 599 | ;; (semantic-tag-end tag)) | 599 | ;; (semantic-tag-end tag)) |
| 600 | ;; ;; Use useful functions from the docaument library. | 600 | ;; ;; Use useful functions from the document library. |
| 601 | ;; (srecode-texi-insert-tag-as-doc doctag) | 601 | ;; (srecode-texi-insert-tag-as-doc doctag) |
| 602 | ;; ;(semantic-insert-foreign-tag doctag) | 602 | ;; ;(semantic-insert-foreign-tag doctag) |
| 603 | ;; )) | 603 | ;; )) |
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index d65cd2b8d88..d3623d6022f 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el | |||
| @@ -62,7 +62,7 @@ | |||
| 62 | (dictionary :initarg :dictionary | 62 | (dictionary :initarg :dictionary |
| 63 | :type (or null srecode-dictionary) | 63 | :type (or null srecode-dictionary) |
| 64 | :documentation | 64 | :documentation |
| 65 | "List of section dictinaries. | 65 | "List of section dictionaries. |
| 66 | The compiled template can contain lists of section dictionaries, | 66 | The compiled template can contain lists of section dictionaries, |
| 67 | or values that are expected to be passed down into different | 67 | or values that are expected to be passed down into different |
| 68 | section macros. The template section dictionaries are merged in with | 68 | section macros. The template section dictionaries are merged in with |
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el index 5f6806a06b3..62ceff82448 100644 --- a/lisp/cedet/srecode/dictionary.el +++ b/lisp/cedet/srecode/dictionary.el | |||
| @@ -202,7 +202,7 @@ associated with a buffer or parent." | |||
| 202 | :size 20) | 202 | :size 20) |
| 203 | :origin origin))) | 203 | :origin origin))) |
| 204 | ;; Only set up the default variables if we are being built | 204 | ;; Only set up the default variables if we are being built |
| 205 | ;; directroy for a particular buffer. | 205 | ;; directly for a particular buffer. |
| 206 | (when initfrombuff | 206 | (when initfrombuff |
| 207 | ;; Variables from the table we are inserting from. | 207 | ;; Variables from the table we are inserting from. |
| 208 | ;; @todo - get a better tree of tables. | 208 | ;; @todo - get a better tree of tables. |
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index e297f5dffda..caf1ddebdb2 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el | |||
| @@ -720,7 +720,7 @@ allocating something based on its type." | |||
| 720 | "Convert tag or string PARAM into a name,comment pair. | 720 | "Convert tag or string PARAM into a name,comment pair. |
| 721 | Optional COMMENTLIST is list of previously existing comments to | 721 | Optional COMMENTLIST is list of previously existing comments to |
| 722 | use instead in alist form. If the name doesn't appear in the list of | 722 | use instead in alist form. If the name doesn't appear in the list of |
| 723 | standard names, then englishify it instead." | 723 | standard names, then english it instead." |
| 724 | (let ((cmt "") | 724 | (let ((cmt "") |
| 725 | (aso srecode-document-autocomment-param-alist) | 725 | (aso srecode-document-autocomment-param-alist) |
| 726 | (fnd nil) | 726 | (fnd nil) |
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index cccfe099e74..9fbfc5dc042 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el | |||
| @@ -936,7 +936,7 @@ with the dictionaries found in the dictionary." | |||
| 936 | (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name)) | 936 | (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name)) |
| 937 | ;; If we have a value, then call the next method | 937 | ;; If we have a value, then call the next method |
| 938 | (srecode-insert-method-helper sti dictionary 'includedtemplate) | 938 | (srecode-insert-method-helper sti dictionary 'includedtemplate) |
| 939 | ;; If we don't have a special dictitonary, then just insert with the | 939 | ;; If we don't have a special dictionary, then just insert with the |
| 940 | ;; current dictionary. | 940 | ;; current dictionary. |
| 941 | (srecode-insert-subtemplate sti dictionary 'includedtemplate)) | 941 | (srecode-insert-subtemplate sti dictionary 'includedtemplate)) |
| 942 | ) | 942 | ) |
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index b09096978fd..b63940cec2d 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el | |||
| @@ -347,7 +347,7 @@ This calls touch." | |||
| 347 | ;; Do the operation and record failures. | 347 | ;; Do the operation and record failures. |
| 348 | failures (nconc (apply function (append args pending)) | 348 | failures (nconc (apply function (append args pending)) |
| 349 | failures) | 349 | failures) |
| 350 | ;; Transfer the elemens of PENDING onto PAST | 350 | ;; Transfer the elements of PENDING onto PAST |
| 351 | ;; and clear it out. Now PAST contains the first N files | 351 | ;; and clear it out. Now PAST contains the first N files |
| 352 | ;; specified (for some N), and FILES contains the rest. | 352 | ;; specified (for some N), and FILES contains the rest. |
| 353 | past (nconc past pending) | 353 | past (nconc past pending) |
| @@ -1490,7 +1490,7 @@ ARG as in `dired-get-marked-files'. | |||
| 1490 | Optional arg MARKER-CHAR as in `dired-create-files'. | 1490 | Optional arg MARKER-CHAR as in `dired-create-files'. |
| 1491 | Optional arg OP1 is an alternate form for OPERATION if there is | 1491 | Optional arg OP1 is an alternate form for OPERATION if there is |
| 1492 | only one file. | 1492 | only one file. |
| 1493 | Optional arg HOW-TO determiness how to treat the target. | 1493 | Optional arg HOW-TO determines how to treat the target. |
| 1494 | If HOW-TO is nil, use `file-directory-p' to determine if the | 1494 | If HOW-TO is nil, use `file-directory-p' to determine if the |
| 1495 | target is a directory. If so, the marked file(s) are created | 1495 | target is a directory. If so, the marked file(s) are created |
| 1496 | inside that directory. Otherwise, the target is a plain file; | 1496 | inside that directory. Otherwise, the target is a plain file; |
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index a245a91c5c1..8527bc9e640 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el | |||
| @@ -664,8 +664,8 @@ | |||
| 664 | 664 | ||
| 665 | ;; @@@ Enabling automatic advice activation: | 665 | ;; @@@ Enabling automatic advice activation: |
| 666 | ;; ========================================= | 666 | ;; ========================================= |
| 667 | ;; Automatic advice activation is enabled by default. It can be disabled by | 667 | ;; Automatic advice activation is enabled by default. It can be disabled with |
| 668 | ;; doint `M-x ad-stop-advice' and enabled again with `M-x ad-start-advice'. | 668 | ;; `M-x ad-stop-advice' and enabled again with `M-x ad-start-advice'. |
| 669 | 669 | ||
| 670 | ;; @@ Caching of advised definitions: | 670 | ;; @@ Caching of advised definitions: |
| 671 | ;; ================================== | 671 | ;; ================================== |
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 84aaf8718ed..096e91ea4fb 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el | |||
| @@ -743,7 +743,7 @@ BYTES and PC are updated after evaluating all the arguments." | |||
| 743 | 743 | ||
| 744 | (defmacro byte-compile-push-bytecode-const2 (opcode const2 bytes pc) | 744 | (defmacro byte-compile-push-bytecode-const2 (opcode const2 bytes pc) |
| 745 | "Push OPCODE and the two-byte constant CONST2 onto BYTES, and add 3 to PC. | 745 | "Push OPCODE and the two-byte constant CONST2 onto BYTES, and add 3 to PC. |
| 746 | CONST2 may be evaulated multiple times." | 746 | CONST2 may be evaluated multiple times." |
| 747 | `(byte-compile-push-bytecodes ,opcode (logand ,const2 255) (lsh ,const2 -8) | 747 | `(byte-compile-push-bytecodes ,opcode (logand ,const2 255) (lsh ,const2 -8) |
| 748 | ,bytes ,pc)) | 748 | ,bytes ,pc)) |
| 749 | 749 | ||
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 8257c6aebea..265328631e9 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el | |||
| @@ -1579,8 +1579,9 @@ KEYWORDS are additional arguments, which can use the following keywords: | |||
| 1579 | (while (setq closer (pop closers)) | 1579 | (while (setq closer (pop closers)) |
| 1580 | (unless (and closers | 1580 | (unless (and closers |
| 1581 | ;; FIXME: this eliminates prefixes of other | 1581 | ;; FIXME: this eliminates prefixes of other |
| 1582 | ;; closers, but we should probably elimnate | 1582 | ;; closers, but we should probably |
| 1583 | ;; prefixes of other keywords as well. | 1583 | ;; eliminate prefixes of other keywords |
| 1584 | ;; as well. | ||
| 1584 | (string-prefix-p closer (car closers))) | 1585 | (string-prefix-p closer (car closers))) |
| 1585 | (push (aref closer (1- (length closer))) triggers))) | 1586 | (push (aref closer (1- (length closer))) triggers))) |
| 1586 | (delete-dups triggers))))))) | 1587 | (delete-dups triggers))))))) |
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 9abb0c8ecc0..43d56a5b89f 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el | |||
| @@ -607,7 +607,7 @@ will return the parsed command." | |||
| 607 | (setq command (eshell-parse-command (cons beg end) | 607 | (setq command (eshell-parse-command (cons beg end) |
| 608 | args t))))) | 608 | args t))))) |
| 609 | (ignore | 609 | (ignore |
| 610 | (message "Expecting completion of delimeter %c ..." | 610 | (message "Expecting completion of delimiter %c ..." |
| 611 | (if (listp delim) | 611 | (if (listp delim) |
| 612 | (car delim) | 612 | (car delim) |
| 613 | delim))) | 613 | delim))) |
diff --git a/lisp/ezimage.el b/lisp/ezimage.el index e8680b65d96..a3562944039 100644 --- a/lisp/ezimage.el +++ b/lisp/ezimage.el | |||
| @@ -59,7 +59,7 @@ IMAGESPEC is the image data, and DOCSTRING is documentation for the image." | |||
| 59 | (defimage ,variable ,imagespec ,docstring) | 59 | (defimage ,variable ,imagespec ,docstring) |
| 60 | (put (quote ,variable) 'ezimage t))) | 60 | (put (quote ,variable) 'ezimage t))) |
| 61 | 61 | ||
| 62 | ;; This hack is for the ezimage install which has an icons direcory for | 62 | ;; This hack is for the ezimage install which has an icons directory for |
| 63 | ;; the default icons to be used. | 63 | ;; the default icons to be used. |
| 64 | ;; (add-to-list 'load-path | 64 | ;; (add-to-list 'load-path |
| 65 | ;; (concat (file-name-directory | 65 | ;; (concat (file-name-directory |
diff --git a/lisp/ffap.el b/lisp/ffap.el index 97105ed422b..74df9883324 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el | |||
| @@ -523,7 +523,7 @@ The optional NOMODIFY argument suppresses the extra search." | |||
| 523 | ;; (ffap-file-remote-p "/ffap.el:80") | 523 | ;; (ffap-file-remote-p "/ffap.el:80") |
| 524 | (or (and ffap-ftp-regexp | 524 | (or (and ffap-ftp-regexp |
| 525 | (string-match ffap-ftp-regexp filename) | 525 | (string-match ffap-ftp-regexp filename) |
| 526 | ;; Convert "/host.com://dir" to "/host:/dir", to handle a dieing | 526 | ;; Convert "/host.com://dir" to "/host:/dir", to handle a dying |
| 527 | ;; practice of advertising ftp files as "host.dom://filename". | 527 | ;; practice of advertising ftp files as "host.dom://filename". |
| 528 | (if (string-match "//" filename) | 528 | (if (string-match "//" filename) |
| 529 | ;; (replace-match "/" nil nil filename) | 529 | ;; (replace-match "/" nil nil filename) |
diff --git a/lisp/follow.el b/lisp/follow.el index a0e363aea2a..aa40c27a7a9 100644 --- a/lisp/follow.el +++ b/lisp/follow.el | |||
| @@ -560,7 +560,7 @@ Keys specific to Follow mode: | |||
| 560 | 560 | ||
| 561 | ;; `scroll-up' and `-down', but for windows in Follow mode. | 561 | ;; `scroll-up' and `-down', but for windows in Follow mode. |
| 562 | ;; | 562 | ;; |
| 563 | ;; Almost like the real thing, excpet when the cursor ends up outside | 563 | ;; Almost like the real thing, except when the cursor ends up outside |
| 564 | ;; the top or bottom... In our case however, we end up outside the | 564 | ;; the top or bottom... In our case however, we end up outside the |
| 565 | ;; window and hence we are recenterd. Should we let `recenter' handle | 565 | ;; window and hence we are recenterd. Should we let `recenter' handle |
| 566 | ;; the point position we would never leave the selected window. To do | 566 | ;; the point position we would never leave the selected window. To do |
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el index ec98b2ff749..2d8587ace3f 100644 --- a/lisp/gnus/gnus-srvr.el +++ b/lisp/gnus/gnus-srvr.el | |||
| @@ -553,7 +553,7 @@ The following commands are available: | |||
| 553 | (gnus-server-list-servers)) | 553 | (gnus-server-list-servers)) |
| 554 | 554 | ||
| 555 | (defun gnus-server-copy-server (from to) | 555 | (defun gnus-server-copy-server (from to) |
| 556 | "Copy a server definiton to a new name." | 556 | "Copy a server definition to a new name." |
| 557 | (interactive | 557 | (interactive |
| 558 | (list | 558 | (list |
| 559 | (or (gnus-server-server-name) | 559 | (or (gnus-server-server-name) |
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 924d974eb3c..5f385ec1054 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el | |||
| @@ -3582,7 +3582,7 @@ that that variable is buffer-local to the summary buffers." | |||
| 3582 | (equal (nth 1 m1) (nth 1 m2))))))) | 3582 | (equal (nth 1 m1) (nth 1 m2))))))) |
| 3583 | 3583 | ||
| 3584 | (defsubst gnus-sloppily-equal-method-parameters (m1 m2) | 3584 | (defsubst gnus-sloppily-equal-method-parameters (m1 m2) |
| 3585 | ;; Check parameters for sloppy equalness. | 3585 | ;; Check parameters for sloppy equality. |
| 3586 | (let ((p1 (copy-sequence (cddr m1))) | 3586 | (let ((p1 (copy-sequence (cddr m1))) |
| 3587 | (p2 (copy-sequence (cddr m2))) | 3587 | (p2 (copy-sequence (cddr m2))) |
| 3588 | e1 e2) | 3588 | e1 e2) |
diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el index 345e7c19a6a..dade86ab174 100644 --- a/lisp/gnus/html2text.el +++ b/lisp/gnus/html2text.el | |||
| @@ -123,7 +123,7 @@ If this list contains the element \"font\".") | |||
| 123 | This is an alist where each dotted pair consists of a tag, and then | 123 | This is an alist where each dotted pair consists of a tag, and then |
| 124 | the name of a function to be called when this tag is found. The | 124 | the name of a function to be called when this tag is found. The |
| 125 | function is called with the arguments p1, p2, p3 and p4. These are | 125 | function is called with the arguments p1, p2, p3 and p4. These are |
| 126 | demontrated below: | 126 | demonstrated below: |
| 127 | 127 | ||
| 128 | \"<b> This is bold text </b>\" | 128 | \"<b> This is bold text </b>\" |
| 129 | ^ ^ ^ ^ | 129 | ^ ^ ^ ^ |
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 1d0830afd28..176857633e1 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el | |||
| @@ -2503,7 +2503,7 @@ Return the number of headers removed." | |||
| 2503 | (point-max))) | 2503 | (point-max))) |
| 2504 | (goto-char (point-min))) | 2504 | (goto-char (point-min))) |
| 2505 | 2505 | ||
| 2506 | ;; FIXME: clarify diffference: message-narrow-to-head, | 2506 | ;; FIXME: clarify difference: message-narrow-to-head, |
| 2507 | ;; message-narrow-to-headers-or-head, message-narrow-to-headers | 2507 | ;; message-narrow-to-headers-or-head, message-narrow-to-headers |
| 2508 | (defun message-narrow-to-head () | 2508 | (defun message-narrow-to-head () |
| 2509 | "Narrow the buffer to the head of the message. | 2509 | "Narrow the buffer to the head of the message. |
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index db7ac1b44f8..a798e22902f 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el | |||
| @@ -72,7 +72,7 @@ | |||
| 72 | ;; * nndiary-get-new-mail, nndiary-mail-source and nndiary-split-methods: | 72 | ;; * nndiary-get-new-mail, nndiary-mail-source and nndiary-split-methods: |
| 73 | ;; NNDiary has some experimental parts, in the sense Gnus normally uses only | 73 | ;; NNDiary has some experimental parts, in the sense Gnus normally uses only |
| 74 | ;; one mail back ends for mail retreival and splitting. This back end is | 74 | ;; one mail back ends for mail retreival and splitting. This back end is |
| 75 | ;; also an attempt to make it behave differently. For Gnus developpers: as | 75 | ;; also an attempt to make it behave differently. For Gnus developers: as |
| 76 | ;; you can see if you snarf into the code, that was not a very difficult | 76 | ;; you can see if you snarf into the code, that was not a very difficult |
| 77 | ;; thing to do. Something should be done about the respooling breakage | 77 | ;; thing to do. Something should be done about the respooling breakage |
| 78 | ;; though. | 78 | ;; though. |
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index 66ed90be823..9d6011e6573 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el | |||
| @@ -1634,7 +1634,7 @@ search in raw mode." | |||
| 1634 | (nnheader-message 3 "Couldn't find original article")))) | 1634 | (nnheader-message 3 "Couldn't find original article")))) |
| 1635 | 1635 | ||
| 1636 | (defun nnmairix-determine-original-group-from-registry (mid) | 1636 | (defun nnmairix-determine-original-group-from-registry (mid) |
| 1637 | "Try to determinale original group for message-id MID from the registry." | 1637 | "Try to determine original group for message-id MID from the registry." |
| 1638 | (when (gnus-bound-and-true-p 'gnus-registry-enabled) | 1638 | (when (gnus-bound-and-true-p 'gnus-registry-enabled) |
| 1639 | (unless (string-match "^<" mid) | 1639 | (unless (string-match "^<" mid) |
| 1640 | (set mid (concat "<" mid))) | 1640 | (set mid (concat "<" mid))) |
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 46db4280688..0dee4157d78 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el | |||
| @@ -480,7 +480,7 @@ This is the opposite of `hilit-chg-hide-changes'." | |||
| 480 | (defun hilit-chg-make-ov (prop start end) | 480 | (defun hilit-chg-make-ov (prop start end) |
| 481 | (or prop | 481 | (or prop |
| 482 | (error "hilit-chg-make-ov: prop is nil")) | 482 | (error "hilit-chg-make-ov: prop is nil")) |
| 483 | ;; For the region create overlays with a distincive face | 483 | ;; For the region create overlays with a distinctive face |
| 484 | ;; and the text property 'hilit-chg. | 484 | ;; and the text property 'hilit-chg. |
| 485 | (let ((ov (make-overlay start end)) | 485 | (let ((ov (make-overlay start end)) |
| 486 | (face (if (eq prop 'hilit-chg-delete) | 486 | (face (if (eq prop 'hilit-chg-delete) |
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index deb241ce7f5..56859269e02 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el | |||
| @@ -586,7 +586,7 @@ If a window system is unavailable, calls `hfy-fallback-colour-values'." | |||
| 586 | (defvar hfy-cperl-mode-kludged-p nil) | 586 | (defvar hfy-cperl-mode-kludged-p nil) |
| 587 | 587 | ||
| 588 | (defun hfy-kludge-cperl-mode () | 588 | (defun hfy-kludge-cperl-mode () |
| 589 | "CPerl mode does its damndest not to do some of its fontification when not | 589 | "CPerl mode does its damnedest not to do some of its fontification when not |
| 590 | in a windowing system - try to trick it..." | 590 | in a windowing system - try to trick it..." |
| 591 | (if (not hfy-cperl-mode-kludged-p) | 591 | (if (not hfy-cperl-mode-kludged-p) |
| 592 | (progn (if (not window-system) | 592 | (progn (if (not window-system) |
| @@ -1773,7 +1773,7 @@ Strips any leading \"./\" from each filename." | |||
| 1773 | (mapcar (lambda (F) (if (string-match "^./\\(.*\\)" F) (match-string 1 F) F)) | 1773 | (mapcar (lambda (F) (if (string-match "^./\\(.*\\)" F) (match-string 1 F) F)) |
| 1774 | (split-string (shell-command-to-string hfy-find-cmd))) ) | 1774 | (split-string (shell-command-to-string hfy-find-cmd))) ) |
| 1775 | 1775 | ||
| 1776 | ;; strip the filename off, return a directiry name | 1776 | ;; strip the filename off, return a directory name |
| 1777 | ;; not a particularly thorough implementaion, but it will be | 1777 | ;; not a particularly thorough implementaion, but it will be |
| 1778 | ;; fed pretty carefully, so it should be Ok: | 1778 | ;; fed pretty carefully, so it should be Ok: |
| 1779 | (defun hfy-dirname (file) | 1779 | (defun hfy-dirname (file) |
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 777779e5ec5..9f6520c7238 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el | |||
| @@ -700,7 +700,7 @@ Internal use only. Should be called at startup time." | |||
| 700 | ;; HPHEBREW8 8-bit character set | 700 | ;; HPHEBREW8 8-bit character set |
| 701 | ;; "HP-Japanese15" [36] | 701 | ;; "HP-Japanese15" [36] |
| 702 | ;; HPJAPAN15 15-bit character set, | 702 | ;; HPJAPAN15 15-bit character set, |
| 703 | ;; modified from industry defacto | 703 | ;; modified from industry de facto |
| 704 | ;; standard Shift-JIS | 704 | ;; standard Shift-JIS |
| 705 | ;; "HP-Kana8" [36] | 705 | ;; "HP-Kana8" [36] |
| 706 | ;; HPKANA8 8-bit character set | 706 | ;; HPKANA8 8-bit character set |
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index ad055ac9064..757322aa0ce 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el | |||
| @@ -305,7 +305,7 @@ SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy | |||
| 305 | (cond ((looking-at "PROMPT:[ \t]*") | 305 | (cond ((looking-at "PROMPT:[ \t]*") |
| 306 | (goto-char (match-end 0)) | 306 | (goto-char (match-end 0)) |
| 307 | (setq tit-prompt (tit-read-key-value)) | 307 | (setq tit-prompt (tit-read-key-value)) |
| 308 | ;; Some TIT dictionaies that are encoded by | 308 | ;; Some TIT dictionaries that are encoded by |
| 309 | ;; euc-china contains invalid character at the tail. | 309 | ;; euc-china contains invalid character at the tail. |
| 310 | (let* ((last (aref tit-prompt (1- (length tit-prompt)))) | 310 | (let* ((last (aref tit-prompt (1- (length tit-prompt)))) |
| 311 | (split (split-char last))) | 311 | (split (split-char last))) |
diff --git a/lisp/kmacro.el b/lisp/kmacro.el index e47f571db71..eea3009faf4 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el | |||
| @@ -1020,7 +1020,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', | |||
| 1020 | (setq executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events)) | 1020 | (setq executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events)) |
| 1021 | next-index executing-kbd-macro-index))))) | 1021 | next-index executing-kbd-macro-index))))) |
| 1022 | 1022 | ||
| 1023 | ;; Query the user; stop macro exection temporarily | 1023 | ;; Query the user; stop macro execution temporarily. |
| 1024 | (let ((macro executing-kbd-macro) | 1024 | (let ((macro executing-kbd-macro) |
| 1025 | (executing-kbd-macro nil) | 1025 | (executing-kbd-macro nil) |
| 1026 | (defining-kbd-macro nil)) | 1026 | (defining-kbd-macro nil)) |
diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el index 22ccd56dab3..13a645a9975 100644 --- a/lisp/language/ethiopic.el +++ b/lisp/language/ethiopic.el | |||
| @@ -61,7 +61,7 @@ | |||
| 61 | (features ethio-util) | 61 | (features ethio-util) |
| 62 | (sample-text . "ፊደል") | 62 | (sample-text . "ፊደል") |
| 63 | (documentation . | 63 | (documentation . |
| 64 | "This language envrironment provides these function key bindings: | 64 | "This language environment provides these function key bindings: |
| 65 | [f3] ethio-fidel-to-sera-buffer | 65 | [f3] ethio-fidel-to-sera-buffer |
| 66 | [S-f3] ethio-fidel-to-sera-region | 66 | [S-f3] ethio-fidel-to-sera-region |
| 67 | [C-f3] ethio-fidel-to-sera-marker | 67 | [C-f3] ethio-fidel-to-sera-marker |
diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 0b569199935..da20e4cb7ca 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el | |||
| @@ -144,7 +144,7 @@ These are symbols with hooklike values whose names don't end in | |||
| 144 | pertinent symbols.") | 144 | pertinent symbols.") |
| 145 | 145 | ||
| 146 | (defvar unload-function-defs-list nil | 146 | (defvar unload-function-defs-list nil |
| 147 | "List of defintions in the Lisp library being unloaded. | 147 | "List of definitions in the Lisp library being unloaded. |
| 148 | 148 | ||
| 149 | This is meant to be used by `FEATURE-unload-function'; see the | 149 | This is meant to be used by `FEATURE-unload-function'; see the |
| 150 | documentation of `unload-feature' for details.") | 150 | documentation of `unload-feature' for details.") |
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index 1ba8ec9f821..47583e3f860 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el | |||
| @@ -83,7 +83,7 @@ | |||
| 83 | ;; work properly. If you don't know what custom is all about and want | 83 | ;; work properly. If you don't know what custom is all about and want |
| 84 | ;; to edit your user option elisp variables the old fashioned way, | 84 | ;; to edit your user option elisp variables the old fashioned way, |
| 85 | ;; just imagine that all the "defcustom" stuff you see below is really | 85 | ;; just imagine that all the "defcustom" stuff you see below is really |
| 86 | ;; "defvar", and ignore everthing else. For info about custom, see | 86 | ;; "defvar", and ignore everything else. For info about custom, see |
| 87 | ;; <URL:http://www.dina.kvl.dk/~abraham/custom/>. | 87 | ;; <URL:http://www.dina.kvl.dk/~abraham/custom/>. |
| 88 | ;; | 88 | ;; |
| 89 | ;; This code does in elisp a superset of the stuff that used to be done | 89 | ;; This code does in elisp a superset of the stuff that used to be done |
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 5054f1d232d..89c7db241d8 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el | |||
| @@ -412,7 +412,7 @@ element is not omitted." | |||
| 412 | (program &optional infile destination display &rest args) | 412 | (program &optional infile destination display &rest args) |
| 413 | "Calls `call-process' on the local host. | 413 | "Calls `call-process' on the local host. |
| 414 | This is needed because for some Emacs flavors Tramp has | 414 | This is needed because for some Emacs flavors Tramp has |
| 415 | defadviced `call-process' to behave like `process-file'. The | 415 | defadvised `call-process' to behave like `process-file'. The |
| 416 | Lisp error raised when PROGRAM is nil is trapped also, returning 1." | 416 | Lisp error raised when PROGRAM is nil is trapped also, returning 1." |
| 417 | (let ((default-directory | 417 | (let ((default-directory |
| 418 | (if (file-remote-p default-directory) | 418 | (if (file-remote-p default-directory) |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 1b00e81ef5d..50a3c1fca5e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -549,7 +549,7 @@ as given in your `~/.profile'." | |||
| 549 | "*List of environment variables to be set on the remote host. | 549 | "*List of environment variables to be set on the remote host. |
| 550 | 550 | ||
| 551 | Each element should be a string of the form ENVVARNAME=VALUE. An | 551 | Each element should be a string of the form ENVVARNAME=VALUE. An |
| 552 | entry ENVVARNAME= diables the corresponding environment variable, | 552 | entry ENVVARNAME= disables the corresponding environment variable, |
| 553 | which might have been set in the init files like ~/.profile. | 553 | which might have been set in the init files like ~/.profile. |
| 554 | 554 | ||
| 555 | Special handling is applied to the PATH environment, which should | 555 | Special handling is applied to the PATH environment, which should |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a47e7fa8f6f..0ee6ad8dea4 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -152,7 +152,7 @@ local host, so if you want to use `~' in those commands, you should | |||
| 152 | choose a shell here which groks tilde expansion. `/bin/sh' normally | 152 | choose a shell here which groks tilde expansion. `/bin/sh' normally |
| 153 | does not understand tilde expansion. | 153 | does not understand tilde expansion. |
| 154 | 154 | ||
| 155 | For encoding and deocding, commands like the following are executed: | 155 | For encoding and decoding, commands like the following are executed: |
| 156 | 156 | ||
| 157 | /bin/sh -c COMMAND < INPUT > OUTPUT | 157 | /bin/sh -c COMMAND < INPUT > OUTPUT |
| 158 | 158 | ||
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index b1a8a4b9fdb..6279ed3df0d 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el | |||
| @@ -2125,7 +2125,7 @@ the currently selected interval size." | |||
| 2125 | "Write out a clock table at position IPOS in the current buffer. | 2125 | "Write out a clock table at position IPOS in the current buffer. |
| 2126 | TABLES is a list of tables with clocking data as produced by | 2126 | TABLES is a list of tables with clocking data as produced by |
| 2127 | `org-clock-get-table-data'. PARAMS is the parameter property list obtained | 2127 | `org-clock-get-table-data'. PARAMS is the parameter property list obtained |
| 2128 | from the dynamic block defintion." | 2128 | from the dynamic block definition." |
| 2129 | ;; This function looks quite complicated, mainly because there are a | 2129 | ;; This function looks quite complicated, mainly because there are a |
| 2130 | ;; lot of options which can add or remove columns. I have massively | 2130 | ;; lot of options which can add or remove columns. I have massively |
| 2131 | ;; commented this function, the I hope it is understandable. If | 2131 | ;; commented this function, the I hope it is understandable. If |
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index 896acc5aeae..5e4935caa7e 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el | |||
| @@ -272,7 +272,7 @@ Works on both Emacs and XEmacs." | |||
| 272 | nil)) | 272 | nil)) |
| 273 | 273 | ||
| 274 | (defmacro org-xemacs-without-invisibility (&rest body) | 274 | (defmacro org-xemacs-without-invisibility (&rest body) |
| 275 | "Turn off exents with invisibility while executing BODY." | 275 | "Turn off extents with invisibility while executing BODY." |
| 276 | `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol) | 276 | `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol) |
| 277 | 'all-extents-closed-open 'invisible)) | 277 | 'all-extents-closed-open 'invisible)) |
| 278 | ext-inv-specs) | 278 | ext-inv-specs) |
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index 14b3e12c888..1a14c71d510 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el | |||
| @@ -681,7 +681,7 @@ Assume point is at an item." | |||
| 681 | (cond | 681 | (cond |
| 682 | ((<= (point) lim-up) | 682 | ((<= (point) lim-up) |
| 683 | ;; At upward limit: if we ended at an item, store it, | 683 | ;; At upward limit: if we ended at an item, store it, |
| 684 | ;; else dimiss useless data recorded above BEG-CELL. | 684 | ;; else dismiss useless data recorded above BEG-CELL. |
| 685 | ;; Jump to part 2. | 685 | ;; Jump to part 2. |
| 686 | (throw 'exit | 686 | (throw 'exit |
| 687 | (setq itm-lst | 687 | (setq itm-lst |
diff --git a/lisp/org/org.el b/lisp/org/org.el index 5d988b3cecd..f88ed3c7ebc 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -1482,7 +1482,7 @@ in the search text." | |||
| 1482 | :type '(choice | 1482 | :type '(choice |
| 1483 | (const :tag "Use fuzy text search" nil) | 1483 | (const :tag "Use fuzy text search" nil) |
| 1484 | (const :tag "Match only exact headline" t) | 1484 | (const :tag "Match only exact headline" t) |
| 1485 | (const :tag "Match extact headline or query to create it" | 1485 | (const :tag "Match exact headline or query to create it" |
| 1486 | query-to-create))) | 1486 | query-to-create))) |
| 1487 | 1487 | ||
| 1488 | (defcustom org-link-frame-setup | 1488 | (defcustom org-link-frame-setup |
| @@ -5052,7 +5052,7 @@ The time stamps may be either active or inactive.") | |||
| 5052 | (defvar org-emph-face nil) | 5052 | (defvar org-emph-face nil) |
| 5053 | 5053 | ||
| 5054 | (defun org-do-emphasis-faces (limit) | 5054 | (defun org-do-emphasis-faces (limit) |
| 5055 | "Run through the buffer and add overlays to emphasised strings." | 5055 | "Run through the buffer and add overlays to emphasized strings." |
| 5056 | (let (rtn a) | 5056 | (let (rtn a) |
| 5057 | (while (and (not rtn) (re-search-forward org-emph-re limit t)) | 5057 | (while (and (not rtn) (re-search-forward org-emph-re limit t)) |
| 5058 | (if (not (= (char-after (match-beginning 3)) | 5058 | (if (not (= (char-after (match-beginning 3)) |
| @@ -14835,7 +14835,7 @@ user." | |||
| 14835 | (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day) | 14835 | (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day) |
| 14836 | t nil ans))) | 14836 | t nil ans))) |
| 14837 | 14837 | ||
| 14838 | ;; Help matching dottet european dates | 14838 | ;; Help matching dotted european dates |
| 14839 | (when (string-match | 14839 | (when (string-match |
| 14840 | "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans) | 14840 | "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans) |
| 14841 | (setq year (if (match-end 3) | 14841 | (setq year (if (match-end 3) |
diff --git a/lisp/play/animate.el b/lisp/play/animate.el index facdfa2f347..ec0cacc4a68 100644 --- a/lisp/play/animate.el +++ b/lisp/play/animate.el | |||
| @@ -93,7 +93,7 @@ | |||
| 93 | 93 | ||
| 94 | (defvar animation-buffer-name nil | 94 | (defvar animation-buffer-name nil |
| 95 | "*String naming the default buffer for animations. | 95 | "*String naming the default buffer for animations. |
| 96 | When nil animations dipslayed in the buffer named *Animation*.") | 96 | When nil animations displayed in the buffer named *Animation*.") |
| 97 | 97 | ||
| 98 | ;;;###autoload | 98 | ;;;###autoload |
| 99 | (defun animate-string (string vpos &optional hpos) | 99 | (defun animate-string (string vpos &optional hpos) |
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el index b9ce669533a..4d4ea71cd7a 100644 --- a/lisp/play/decipher.el +++ b/lisp/play/decipher.el | |||
| @@ -672,7 +672,7 @@ X: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z * 11 14 9% | |||
| 672 | 1 1 1 2 1 1 2 5 7 | 672 | 1 1 1 2 1 1 2 5 7 |
| 673 | This says that X comes before D once, and after B once. X begins 5 | 673 | This says that X comes before D once, and after B once. X begins 5 |
| 674 | words, and ends 3 words (`*' represents a space). X comes before 8 | 674 | words, and ends 3 words (`*' represents a space). X comes before 8 |
| 675 | different letters, after 7 differerent letters, and is next to a total | 675 | different letters, after 7 different letters, and is next to a total |
| 676 | of 11 different letters. It occurs 14 times, making up 9% of the | 676 | of 11 different letters. It occurs 14 times, making up 9% of the |
| 677 | ciphertext." | 677 | ciphertext." |
| 678 | (interactive (list (upcase (following-char)))) | 678 | (interactive (list (upcase (following-char)))) |
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el index f0e6670fe58..8629baf35d3 100644 --- a/lisp/play/landmark.el +++ b/lisp/play/landmark.el | |||
| @@ -1584,7 +1584,7 @@ If the game is finished, this command requests for another game." | |||
| 1584 | 1584 | ||
| 1585 | ;;;_ - something which doesn't work | 1585 | ;;;_ - something which doesn't work |
| 1586 | ; no-a-worka!! | 1586 | ; no-a-worka!! |
| 1587 | ;(defum landmark-sum-list (list) | 1587 | ;(defun landmark-sum-list (list) |
| 1588 | ; (if (> (length list) 0) | 1588 | ; (if (> (length list) 0) |
| 1589 | ; (+ (car list) (landmark-sum-list (cdr list))) | 1589 | ; (+ (car list) (landmark-sum-list (cdr list))) |
| 1590 | ; 0)) | 1590 | ; 0)) |
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 4cf00cd3cfd..0cfdab23702 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el | |||
| @@ -1163,7 +1163,8 @@ If OTHER-FRAME is non-nil, display the cross-reference in another frame." | |||
| 1163 | 1163 | ||
| 1164 | (defun ada-goto-declaration-other-frame (pos) | 1164 | (defun ada-goto-declaration-other-frame (pos) |
| 1165 | "Display the declaration of the identifier around POS. | 1165 | "Display the declaration of the identifier around POS. |
| 1166 | The declation is shown in another frame if `ada-xref-other-buffer' is non-nil." | 1166 | The declaration is shown in another frame if `ada-xref-other-buffer' is |
| 1167 | non-nil." | ||
| 1167 | (interactive "d") | 1168 | (interactive "d") |
| 1168 | (ada-goto-declaration pos t)) | 1169 | (ada-goto-declaration pos t)) |
| 1169 | 1170 | ||
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 74f9acab5b5..aa1289cd632 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el | |||
| @@ -776,7 +776,7 @@ | |||
| 776 | (setq anchor (point)) | 776 | (setq anchor (point)) |
| 777 | (search-forward-regexp c-awk-harmless-string*-here-re nil t) | 777 | (search-forward-regexp c-awk-harmless-string*-here-re nil t) |
| 778 | ;; We are now looking at either a " or a /. | 778 | ;; We are now looking at either a " or a /. |
| 779 | ;; Do our thing on the string, regexp or divsion sign. | 779 | ;; Do our thing on the string, regexp or division sign. |
| 780 | (setq anchor-state-/div | 780 | (setq anchor-state-/div |
| 781 | (if (looking-at "_?\"") | 781 | (if (looking-at "_?\"") |
| 782 | (c-awk-syntax-tablify-string) | 782 | (c-awk-syntax-tablify-string) |
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 13858ad0da1..1925d16ba58 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -1304,7 +1304,7 @@ versions of Emacs." | |||
| 1304 | (get-text-property (point) 'syntax-type)) | 1304 | (get-text-property (point) 'syntax-type)) |
| 1305 | '(here-doc pod))] | 1305 | '(here-doc pod))] |
| 1306 | "----" | 1306 | "----" |
| 1307 | ["CPerl pretty print (exprmntl)" cperl-ps-print | 1307 | ["CPerl pretty print (experimental)" cperl-ps-print |
| 1308 | (fboundp 'ps-extend-face-list)] | 1308 | (fboundp 'ps-extend-face-list)] |
| 1309 | "----" | 1309 | "----" |
| 1310 | ["Syntaxify region" cperl-find-pods-heres-region | 1310 | ["Syntaxify region" cperl-find-pods-heres-region |
| @@ -5793,7 +5793,7 @@ indentation and initial hashes. Behaves usually outside of comment." | |||
| 5793 | ;; "\\|") | 5793 | ;; "\\|") |
| 5794 | '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0 | 5794 | '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0 |
| 5795 | font-lock-function-name-face keep) ; Not very good, triggers at "[a-z]" | 5795 | font-lock-function-name-face keep) ; Not very good, triggers at "[a-z]" |
| 5796 | ;; This highlights declarations and definitions differenty. | 5796 | ;; This highlights declarations and definitions differently. |
| 5797 | ;; We do not try to highlight in the case of attributes: | 5797 | ;; We do not try to highlight in the case of attributes: |
| 5798 | ;; it is already done by `cperl-find-pods-heres' | 5798 | ;; it is already done by `cperl-find-pods-heres' |
| 5799 | (list (concat "\\<sub" | 5799 | (list (concat "\\<sub" |
| @@ -8946,7 +8946,7 @@ do extra unwind via `cperl-unwind-to-safe'." | |||
| 8946 | ;; Called when any modification is made to buffer text. | 8946 | ;; Called when any modification is made to buffer text. |
| 8947 | (defun cperl-after-change-function (beg end old-len) | 8947 | (defun cperl-after-change-function (beg end old-len) |
| 8948 | ;; We should have been informed about changes by `font-lock'. Since it | 8948 | ;; We should have been informed about changes by `font-lock'. Since it |
| 8949 | ;; does not inform as which calls are defered, do it ourselves | 8949 | ;; does not inform as which calls are deferred, do it ourselves |
| 8950 | (if cperl-syntax-done-to | 8950 | (if cperl-syntax-done-to |
| 8951 | (setq cperl-syntax-done-to (min cperl-syntax-done-to beg)))) | 8951 | (setq cperl-syntax-done-to (min cperl-syntax-done-to beg)))) |
| 8952 | 8952 | ||
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index 597d84619ab..f98f3d191d7 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el | |||
| @@ -2084,7 +2084,7 @@ special." | |||
| 2084 | "*Specify extra width for arrow shape drawing. | 2084 | "*Specify extra width for arrow shape drawing. |
| 2085 | 2085 | ||
| 2086 | The extra width is used to avoid that the arrowhead and the terminal border | 2086 | The extra width is used to avoid that the arrowhead and the terminal border |
| 2087 | overlap. It depens on `ebnf-arrow-shape' and `ebnf-line-width'." | 2087 | overlap. It depends on `ebnf-arrow-shape' and `ebnf-line-width'." |
| 2088 | :type 'number | 2088 | :type 'number |
| 2089 | :version "22" | 2089 | :version "22" |
| 2090 | :group 'ebnf-shape) | 2090 | :group 'ebnf-shape) |
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index d321e9c1388..13cba0fe701 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el | |||
| @@ -1144,7 +1144,7 @@ error message." | |||
| 1144 | (setq order tag-order)) | 1144 | (setq order tag-order)) |
| 1145 | ;; We throw out on match, so only get here if there were no matches. | 1145 | ;; We throw out on match, so only get here if there were no matches. |
| 1146 | ;; Clear out the markers we use to avoid duplicate matches so they | 1146 | ;; Clear out the markers we use to avoid duplicate matches so they |
| 1147 | ;; don't slow down editting and are immediately available for GC. | 1147 | ;; don't slow down editing and are immediately available for GC. |
| 1148 | (while tag-lines-already-matched | 1148 | (while tag-lines-already-matched |
| 1149 | (set-marker (car tag-lines-already-matched) nil nil) | 1149 | (set-marker (car tag-lines-already-matched) nil nil) |
| 1150 | (setq tag-lines-already-matched (cdr tag-lines-already-matched))) | 1150 | (setq tag-lines-already-matched (cdr tag-lines-already-matched))) |
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index b54b2dc5f47..c60e8d72abc 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el | |||
| @@ -3387,7 +3387,7 @@ This event can be examined by forms in `gud-tooltip-display'.") | |||
| 3387 | 3387 | ||
| 3388 | (defun gud-tooltip-dereference (&optional arg) | 3388 | (defun gud-tooltip-dereference (&optional arg) |
| 3389 | "Toggle whether tooltips should show `* expr' or `expr'. | 3389 | "Toggle whether tooltips should show `* expr' or `expr'. |
| 3390 | With arg, dereference expr if ARG is positive, otherwise do not derereference." | 3390 | With arg, dereference expr if ARG is positive, otherwise do not dereference." |
| 3391 | (interactive "P") | 3391 | (interactive "P") |
| 3392 | (setq gud-tooltip-dereference | 3392 | (setq gud-tooltip-dereference |
| 3393 | (if (null arg) | 3393 | (if (null arg) |
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 8d8966ee159..a2dd67a0f13 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el | |||
| @@ -705,7 +705,8 @@ Those words in `idlwave-completion-help-links' have links. The | |||
| 705 | ;; we kill the help frame before the return-frame is selected. | 705 | ;; we kill the help frame before the return-frame is selected. |
| 706 | ;; To protect the workings, we wait for up to one second | 706 | ;; To protect the workings, we wait for up to one second |
| 707 | ;; and check if the return-frame *is* now selected. | 707 | ;; and check if the return-frame *is* now selected. |
| 708 | ;; This is marked "eperimental" since we are not sure when its OK. | 708 | ;; This is marked "experimental" since we are not sure when |
| 709 | ;; it's OK. | ||
| 709 | (let ((maxtime 1.0) (time 0.) (step 0.1)) | 710 | (let ((maxtime 1.0) (time 0.) (step 0.1)) |
| 710 | (select-frame idlwave-help-return-frame) | 711 | (select-frame idlwave-help-return-frame) |
| 711 | (while (and (sit-for step) | 712 | (while (and (sit-for step) |
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 4040a5c431e..0e3fdc78a39 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el | |||
| @@ -3352,7 +3352,7 @@ If one hasn't been set, or if it's stale, prompt for a new one." | |||
| 3352 | ;; etc. and produce maddening "unbalanced parenthesis" errors. | 3352 | ;; etc. and produce maddening "unbalanced parenthesis" errors. |
| 3353 | ;; When we attempt to find the error and scroll to the portion of | 3353 | ;; When we attempt to find the error and scroll to the portion of |
| 3354 | ;; the buffer containing the problem, JIT-lock will apply the | 3354 | ;; the buffer containing the problem, JIT-lock will apply the |
| 3355 | ;; correct syntax to the regular expresion literal and the problem | 3355 | ;; correct syntax to the regular expression literal and the problem |
| 3356 | ;; will mysteriously disappear. | 3356 | ;; will mysteriously disappear. |
| 3357 | ;; FIXME: We should actually do this fontification lazily by adding | 3357 | ;; FIXME: We should actually do this fontification lazily by adding |
| 3358 | ;; calls to syntax-propertize wherever it's really needed. | 3358 | ;; calls to syntax-propertize wherever it's really needed. |
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index 958c1bfb0cc..d0a34179cc8 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el | |||
| @@ -161,7 +161,7 @@ | |||
| 161 | "[ \t\f]+\\(\\sw+\\|\\s_+\\|\\s.+\\)") | 161 | "[ \t\f]+\\(\\sw+\\|\\s_+\\|\\s.+\\)") |
| 162 | '((1 font-lock-keyword-face) | 162 | '((1 font-lock-keyword-face) |
| 163 | (2 font-lock-function-name-face))) | 163 | (2 font-lock-function-name-face))) |
| 164 | ;; binary macro defintions: <leveldef> x operator y | 164 | ;; binary macro definitions: <leveldef> x operator y |
| 165 | (cons (concat "\\<" macro-keywords-2 "\\>" | 165 | (cons (concat "\\<" macro-keywords-2 "\\>" |
| 166 | "[ \t\f]+\\(\\sw+\\)" | 166 | "[ \t\f]+\\(\\sw+\\)" |
| 167 | "[ \t\f]*\\(\\sw+\\|\\s.+\\)" | 167 | "[ \t\f]*\\(\\sw+\\|\\s.+\\)" |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index fe6bab0160d..8d2e6715444 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -119,7 +119,7 @@ | |||
| 119 | (1 font-lock-type-face)) | 119 | (1 font-lock-type-face)) |
| 120 | ;; Built-ins. (The next three blocks are from | 120 | ;; Built-ins. (The next three blocks are from |
| 121 | ;; `__builtin__.__dict__.keys()' in Python 2.7) These patterns | 121 | ;; `__builtin__.__dict__.keys()' in Python 2.7) These patterns |
| 122 | ;; are debateable, but they at least help to spot possible | 122 | ;; are debatable, but they at least help to spot possible |
| 123 | ;; shadowing of builtins. | 123 | ;; shadowing of builtins. |
| 124 | (,(rx symbol-start (or | 124 | (,(rx symbol-start (or |
| 125 | ;; exceptions | 125 | ;; exceptions |
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 3a3c7f0baa3..2d8334bcb7d 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el | |||
| @@ -913,7 +913,7 @@ the MSB or LSB of a signal inside an AUTORESET." | |||
| 913 | (put 'verilog-assignment-delay 'safe-local-variable 'stringp) | 913 | (put 'verilog-assignment-delay 'safe-local-variable 'stringp) |
| 914 | 914 | ||
| 915 | (defcustom verilog-auto-arg-sort nil | 915 | (defcustom verilog-auto-arg-sort nil |
| 916 | "*If set, AUTOARG signal names will be sorted, not in delaration order. | 916 | "*If set, AUTOARG signal names will be sorted, not in declaration order. |
| 917 | Declaration order is advantageous with order based instantiations | 917 | Declaration order is advantageous with order based instantiations |
| 918 | and is the default for backward compatibility. Sorted order | 918 | and is the default for backward compatibility. Sorted order |
| 919 | reduces changes when declarations are moved around in a file, and | 919 | reduces changes when declarations are moved around in a file, and |
| @@ -2151,7 +2151,7 @@ find the errors." | |||
| 2151 | "interface" "endinterface" | 2151 | "interface" "endinterface" |
| 2152 | "module" "macromodule" "endmodule" | 2152 | "module" "macromodule" "endmodule" |
| 2153 | "package" "endpackage" | 2153 | "package" "endpackage" |
| 2154 | "primitive" "endprimative" | 2154 | "primitive" "endprimitive" |
| 2155 | "program" "endprogram" | 2155 | "program" "endprogram" |
| 2156 | "property" "endproperty" | 2156 | "property" "endproperty" |
| 2157 | "sequence" "randsequence" "endsequence" | 2157 | "sequence" "randsequence" "endsequence" |
| @@ -3579,7 +3579,7 @@ With ARG, first kill any existing labels." | |||
| 3579 | "Move backward to beginning of statement." | 3579 | "Move backward to beginning of statement." |
| 3580 | (interactive) | 3580 | (interactive) |
| 3581 | ;; Move back token by token until we see the end | 3581 | ;; Move back token by token until we see the end |
| 3582 | ;; of some ealier line. | 3582 | ;; of some earlier line. |
| 3583 | (let (h) | 3583 | (let (h) |
| 3584 | (while | 3584 | (while |
| 3585 | ;; If the current point does not begin a new | 3585 | ;; If the current point does not begin a new |
diff --git a/lisp/ses.el b/lisp/ses.el index b1d7d7bfb9e..c71c603726c 100644 --- a/lisp/ses.el +++ b/lisp/ses.el | |||
| @@ -980,7 +980,7 @@ if the cell's value is unchanged and FORCE is nil." | |||
| 980 | (error "Circular references: %s" ses--deferred-recalc)) | 980 | (error "Circular references: %s" ses--deferred-recalc)) |
| 981 | (message " ")) | 981 | (message " ")) |
| 982 | ;; Can't use save-excursion here: if the cell under point is updated, | 982 | ;; Can't use save-excursion here: if the cell under point is updated, |
| 983 | ;; save-excusion's marker will move past the cell. | 983 | ;; save-excursion's marker will move past the cell. |
| 984 | (goto-char pos))) | 984 | (goto-char pos))) |
| 985 | 985 | ||
| 986 | 986 | ||
| @@ -3204,7 +3204,7 @@ By passing in REST some flags one can configure the way the range | |||
| 3204 | is read and how it is formatted. | 3204 | is read and how it is formatted. |
| 3205 | 3205 | ||
| 3206 | In the sequel we assume that cells A1, B1, A2 B2 have respective values | 3206 | In the sequel we assume that cells A1, B1, A2 B2 have respective values |
| 3207 | 1 2 3 and 4 for examplication. | 3207 | 1 2 3 and 4. |
| 3208 | 3208 | ||
| 3209 | Readout direction is specified by a `>v', '`>^', `<v', `<^', | 3209 | Readout direction is specified by a `>v', '`>^', `<v', `<^', |
| 3210 | `v>', `v<', `^>', `^<' flag. For historical reasons, in absence | 3210 | `v>', `v<', `^>', `^<' flag. For historical reasons, in absence |
| @@ -3230,7 +3230,7 @@ vector or a matrix depending on the number of rows, `*1' will | |||
| 3230 | flatten the result to a one row vector, and `*2' will make a | 3230 | flatten the result to a one row vector, and `*2' will make a |
| 3231 | matrix whatever the number of rows. | 3231 | matrix whatever the number of rows. |
| 3232 | 3232 | ||
| 3233 | Warning: interaction with Calc is expermimental and may produce | 3233 | Warning: interaction with Calc is experimental and may produce |
| 3234 | confusing results if you are not aware of Calc data format. Use | 3234 | confusing results if you are not aware of Calc data format. Use |
| 3235 | `math-format-value' as a printer for Calc objects." | 3235 | `math-format-value' as a printer for Calc objects." |
| 3236 | (let (result-row | 3236 | (let (result-row |
diff --git a/lisp/simple.el b/lisp/simple.el index ca50282df15..e70d37588a0 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -2409,7 +2409,7 @@ and only used if a buffer is displayed." | |||
| 2409 | 1)) | 2409 | 1)) |
| 2410 | 1))) | 2410 | 1))) |
| 2411 | ;; Don't use the echo area if the output buffer is | 2411 | ;; Don't use the echo area if the output buffer is |
| 2412 | ;; already dispayed in the selected frame. | 2412 | ;; already displayed in the selected frame. |
| 2413 | (not (get-buffer-window (current-buffer)))) | 2413 | (not (get-buffer-window (current-buffer)))) |
| 2414 | ;; Echo area | 2414 | ;; Echo area |
| 2415 | (goto-char (point-max)) | 2415 | (goto-char (point-max)) |
diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 00f68a0b45f..23a91888c1b 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el | |||
| @@ -631,7 +631,7 @@ with `.' followed by extensions, followed by full-filenames." | |||
| 631 | (substring (car extlist) 1))) | 631 | (substring (car extlist) 1))) |
| 632 | (setq regex2 (concat regex2 (if regex2 "\\|" "") (car extlist)))) | 632 | (setq regex2 (concat regex2 (if regex2 "\\|" "") (car extlist)))) |
| 633 | (setq extlist (cdr extlist))) | 633 | (setq extlist (cdr extlist))) |
| 634 | ;; concat all the sub-exressions together, making sure all types | 634 | ;; Concatenate all the subexpressions together, making sure all types |
| 635 | ;; of parts exist during concatenation. | 635 | ;; of parts exist during concatenation. |
| 636 | (concat "\\(" | 636 | (concat "\\(" |
| 637 | (if regex1 (concat "\\(\\.\\(" regex1 "\\)\\)") "") | 637 | (if regex1 (concat "\\(\\.\\(" regex1 "\\)\\)") "") |
| @@ -2105,7 +2105,7 @@ cell of the form ( 'DIRLIST . 'FILELIST )." | |||
| 2105 | (let ((sf (cdr (reverse speedbar-shown-directories)))) | 2105 | (let ((sf (cdr (reverse speedbar-shown-directories)))) |
| 2106 | (setq speedbar-shown-directories | 2106 | (setq speedbar-shown-directories |
| 2107 | (list (expand-file-name default-directory))) | 2107 | (list (expand-file-name default-directory))) |
| 2108 | ;; exand them all as we find them | 2108 | ;; Expand them all as we find them. |
| 2109 | (while sf | 2109 | (while sf |
| 2110 | (if (speedbar-goto-this-file (car sf)) | 2110 | (if (speedbar-goto-this-file (car sf)) |
| 2111 | (progn | 2111 | (progn |
| @@ -3292,7 +3292,7 @@ With universal argument ARG, flush cached data." | |||
| 3292 | Optional argument ARG indicates that any cache should be flushed." | 3292 | Optional argument ARG indicates that any cache should be flushed." |
| 3293 | (interactive "P") | 3293 | (interactive "P") |
| 3294 | (speedbar-expand-line arg) | 3294 | (speedbar-expand-line arg) |
| 3295 | ;; Now, inside the area expaded here, expand all subnodes of | 3295 | ;; Now, inside the area expanded here, expand all subnodes of |
| 3296 | ;; the same descendant type. | 3296 | ;; the same descendant type. |
| 3297 | (save-excursion | 3297 | (save-excursion |
| 3298 | (speedbar-next 1) ;; Move into the list. | 3298 | (speedbar-next 1) ;; Move into the list. |
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 0e9de519c8c..5b21913c32e 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el | |||
| @@ -118,7 +118,7 @@ | |||
| 118 | ;; function keys F11->F42 from the termcap/terminfo information. On | 118 | ;; function keys F11->F42 from the termcap/terminfo information. On |
| 119 | ;; a PC-style keyboard these keys correspond to | 119 | ;; a PC-style keyboard these keys correspond to |
| 120 | ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The | 120 | ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The |
| 121 | ;; code here subsitutes the corresponding defintions in | 121 | ;; code here subsitutes the corresponding definitions in |
| 122 | ;; function-key-map. This substitution is needed because if a key | 122 | ;; function-key-map. This substitution is needed because if a key |
| 123 | ;; definition if found in function-key-map, there are no further | 123 | ;; definition if found in function-key-map, there are no further |
| 124 | ;; lookups in other keymaps. | 124 | ;; lookups in other keymaps. |
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 20d9c18c43e..d13437f4c7c 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el | |||
| @@ -2514,7 +2514,7 @@ This function returns a point-list." | |||
| 2514 | 2514 | ||
| 2515 | 2515 | ||
| 2516 | ;; | 2516 | ;; |
| 2517 | ;; functions for accessing endoints and elements in object requiring | 2517 | ;; functions for accessing endpoints and elements in object requiring |
| 2518 | ;; 2 endpoints | 2518 | ;; 2 endpoints |
| 2519 | ;; | 2519 | ;; |
| 2520 | 2520 | ||
| @@ -3582,7 +3582,7 @@ FILL-INFO is a list of vectors on the form [X Y ELLIPSE-WIDTH-ON-THIS-LINE]." | |||
| 3582 | (width (abs (- x2 x1))) | 3582 | (width (abs (- x2 x1))) |
| 3583 | (height (abs (- y2 y1))) | 3583 | (height (abs (- y2 y1))) |
| 3584 | ;; When drawing our circle, we want it to through the cursor | 3584 | ;; When drawing our circle, we want it to through the cursor |
| 3585 | ;; just as when drawing the ellispe, but we have to take | 3585 | ;; just as when drawing the ellipse, but we have to take |
| 3586 | ;; care for the aspect-ratio. | 3586 | ;; care for the aspect-ratio. |
| 3587 | ;; The equation for the ellipse (where a is the x-radius and | 3587 | ;; The equation for the ellipse (where a is the x-radius and |
| 3588 | ;; b is the y-radius): | 3588 | ;; b is the y-radius): |
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 9b924ba7ad9..7de15c66cec 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el | |||
| @@ -59,7 +59,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." | |||
| 59 | (error "Not on a crossref macro argument")) | 59 | (error "Not on a crossref macro argument")) |
| 60 | 60 | ||
| 61 | (setq reftex-call-back-to-this-buffer (current-buffer)) | 61 | (setq reftex-call-back-to-this-buffer (current-buffer)) |
| 62 | 62 | ||
| 63 | (cond | 63 | (cond |
| 64 | ((string-match "\\`\\\\cite\\|cite\\*?\\'\\|bibentry" macro) | 64 | ((string-match "\\`\\\\cite\\|cite\\*?\\'\\|bibentry" macro) |
| 65 | ;; A citation macro: search for bibitems or BibTeX entries | 65 | ;; A citation macro: search for bibitems or BibTeX entries |
| @@ -87,7 +87,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." | |||
| 87 | (format reftex-find-index-entry-regexp-format | 87 | (format reftex-find-index-entry-regexp-format |
| 88 | (regexp-quote key)) | 88 | (regexp-quote key)) |
| 89 | 3 nil nil))) | 89 | 3 nil nil))) |
| 90 | (t | 90 | (t |
| 91 | (reftex-access-scan-info arg) | 91 | (reftex-access-scan-info arg) |
| 92 | (catch 'exit | 92 | (catch 'exit |
| 93 | (let ((list reftex-view-crossref-extra) | 93 | (let ((list reftex-view-crossref-extra) |
| @@ -97,14 +97,14 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." | |||
| 97 | action (nth 1 entry) | 97 | action (nth 1 entry) |
| 98 | group (nth 2 entry)) | 98 | group (nth 2 entry)) |
| 99 | (when (string-match mre macro) | 99 | (when (string-match mre macro) |
| 100 | (setq dw (reftex-view-regexp-match | 100 | (setq dw (reftex-view-regexp-match |
| 101 | (format action key) group nil nil)) | 101 | (format action key) group nil nil)) |
| 102 | (throw 'exit t)))) | 102 | (throw 'exit t)))) |
| 103 | (error "Not on a crossref macro argument")))) | 103 | (error "Not on a crossref macro argument")))) |
| 104 | (if (and (eq arg 2) (windowp dw)) (select-window dw))))) | 104 | (if (and (eq arg 2) (windowp dw)) (select-window dw))))) |
| 105 | 105 | ||
| 106 | (defun reftex-view-cr-cite (arg key how) | 106 | (defun reftex-view-cr-cite (arg key how) |
| 107 | ;; View crossreference of a ref cite. HOW can have the values | 107 | ;; View crossreference of a ref cite. HOW can have the values |
| 108 | ;; nil: Show in another window. | 108 | ;; nil: Show in another window. |
| 109 | ;; echo: Show one-line info in echo area. | 109 | ;; echo: Show one-line info in echo area. |
| 110 | ;; tmp-window: Show in small window and arrange for window to disappear. | 110 | ;; tmp-window: Show in small window and arrange for window to disappear. |
| @@ -114,7 +114,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." | |||
| 114 | 114 | ||
| 115 | (if (eq how 'tmp-window) | 115 | (if (eq how 'tmp-window) |
| 116 | ;; Remember the window configuration | 116 | ;; Remember the window configuration |
| 117 | (put 'reftex-auto-view-crossref 'last-window-conf | 117 | (put 'reftex-auto-view-crossref 'last-window-conf |
| 118 | (current-window-configuration))) | 118 | (current-window-configuration))) |
| 119 | 119 | ||
| 120 | (let (files size item (pos (point)) (win (selected-window)) pop-win | 120 | (let (files size item (pos (point)) (win (selected-window)) pop-win |
| @@ -130,7 +130,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." | |||
| 130 | (setq item t | 130 | (setq item t |
| 131 | files (reftex-uniquify | 131 | files (reftex-uniquify |
| 132 | (mapcar 'cdr | 132 | (mapcar 'cdr |
| 133 | (reftex-all-assq | 133 | (reftex-all-assq |
| 134 | 'thebib (symbol-value reftex-docstruct-symbol)))))) | 134 | 'thebib (symbol-value reftex-docstruct-symbol)))))) |
| 135 | (reftex-default-bibliography | 135 | (reftex-default-bibliography |
| 136 | (setq item nil | 136 | (setq item nil |
| @@ -169,17 +169,17 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." | |||
| 169 | (select-window pop-win))))) | 169 | (select-window pop-win))))) |
| 170 | 170 | ||
| 171 | (defun reftex-view-cr-ref (arg label how) | 171 | (defun reftex-view-cr-ref (arg label how) |
| 172 | ;; View crossreference of a ref macro. HOW can have the values | 172 | ;; View crossreference of a ref macro. HOW can have the values |
| 173 | ;; nil: Show in another window. | 173 | ;; nil: Show in another window. |
| 174 | ;; echo: Show one-line info in echo area. | 174 | ;; echo: Show one-line info in echo area. |
| 175 | ;; tmp-window: Show in small window and arrange for window to disappear. | 175 | ;; tmp-window: Show in small window and arrange for window to disappear. |
| 176 | 176 | ||
| 177 | ;; Ensure access to scanning info | 177 | ;; Ensure access to scanning info |
| 178 | (reftex-access-scan-info (or arg current-prefix-arg)) | 178 | (reftex-access-scan-info (or arg current-prefix-arg)) |
| 179 | 179 | ||
| 180 | (if (eq how 'tmp-window) | 180 | (if (eq how 'tmp-window) |
| 181 | ;; Remember the window configuration | 181 | ;; Remember the window configuration |
| 182 | (put 'reftex-auto-view-crossref 'last-window-conf | 182 | (put 'reftex-auto-view-crossref 'last-window-conf |
| 183 | (current-window-configuration))) | 183 | (current-window-configuration))) |
| 184 | 184 | ||
| 185 | (let* ((xr-data (assoc 'xr (symbol-value reftex-docstruct-symbol))) | 185 | (let* ((xr-data (assoc 'xr (symbol-value reftex-docstruct-symbol))) |
| @@ -191,14 +191,14 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." | |||
| 191 | ;; Label is defined in external document | 191 | ;; Label is defined in external document |
| 192 | (save-excursion | 192 | (save-excursion |
| 193 | (save-match-data | 193 | (save-match-data |
| 194 | (set-buffer | 194 | (set-buffer |
| 195 | (or (reftex-get-file-buffer-force | 195 | (or (reftex-get-file-buffer-force |
| 196 | (cdr (assoc (match-string 1 label) (nth 1 | 196 | (cdr (assoc (match-string 1 label) (nth 1 |
| 197 | xr-data)))) | 197 | xr-data)))) |
| 198 | (error "Problem with external label %s" label)))) | 198 | (error "Problem with external label %s" label)))) |
| 199 | (setq label (substring label (match-end 1))) | 199 | (setq label (substring label (match-end 1))) |
| 200 | (reftex-access-scan-info) | 200 | (reftex-access-scan-info) |
| 201 | (setq entry | 201 | (setq entry |
| 202 | (assoc label (symbol-value reftex-docstruct-symbol))))) | 202 | (assoc label (symbol-value reftex-docstruct-symbol))))) |
| 203 | (if (eq how 'echo) | 203 | (if (eq how 'echo) |
| 204 | ;; Display in echo area | 204 | ;; Display in echo area |
| @@ -234,7 +234,7 @@ With argument, actually select the window showing the cross reference." | |||
| 234 | 234 | ||
| 235 | (defun reftex-view-crossref-when-idle () | 235 | (defun reftex-view-crossref-when-idle () |
| 236 | ;; Display info about crossref at point in echo area or a window. | 236 | ;; Display info about crossref at point in echo area or a window. |
| 237 | ;; This function was desigend to work with an idle timer. | 237 | ;; This function was designed to work with an idle timer. |
| 238 | ;; We try to get out of here as quickly as possible if the call is useless. | 238 | ;; We try to get out of here as quickly as possible if the call is useless. |
| 239 | (and reftex-mode | 239 | (and reftex-mode |
| 240 | ;; Make sure message area is free if we need it. | 240 | ;; Make sure message area is free if we need it. |
| @@ -244,7 +244,7 @@ With argument, actually select the window showing the cross reference." | |||
| 244 | reftex-mouse-view-crossref))) | 244 | reftex-mouse-view-crossref))) |
| 245 | ;; Quick precheck if this might be a relevant spot | 245 | ;; Quick precheck if this might be a relevant spot |
| 246 | ;; `reftex-view-crossref' will do a more thorough check. | 246 | ;; `reftex-view-crossref' will do a more thorough check. |
| 247 | (save-excursion | 247 | (save-excursion |
| 248 | (search-backward "\\" nil t) | 248 | (search-backward "\\" nil t) |
| 249 | (looking-at "\\\\[a-zA-Z]*\\(cite\\|ref\\|bibentry\\)")) | 249 | (looking-at "\\\\[a-zA-Z]*\\(cite\\|ref\\|bibentry\\)")) |
| 250 | 250 | ||
| @@ -262,12 +262,12 @@ With argument, actually select the window showing the cross reference." | |||
| 262 | (set-window-configuration (get 'reftex-auto-view-crossref 'last-window-conf)) | 262 | (set-window-configuration (get 'reftex-auto-view-crossref 'last-window-conf)) |
| 263 | (put 'reftex-auto-view-crossref 'last-window-conf nil) | 263 | (put 'reftex-auto-view-crossref 'last-window-conf nil) |
| 264 | (remove-hook 'pre-command-hook 'reftex-restore-window-conf)) | 264 | (remove-hook 'pre-command-hook 'reftex-restore-window-conf)) |
| 265 | 265 | ||
| 266 | (defun reftex-echo-ref (label entry docstruct) | 266 | (defun reftex-echo-ref (label entry docstruct) |
| 267 | ;; Display crossref info in echo area. | 267 | ;; Display crossref info in echo area. |
| 268 | (cond | 268 | (cond |
| 269 | ((null docstruct) | 269 | ((null docstruct) |
| 270 | (message "%s" | 270 | (message "%s" |
| 271 | (substitute-command-keys (format reftex-no-info-message "ref")))) | 271 | (substitute-command-keys (format reftex-no-info-message "ref")))) |
| 272 | ((null entry) | 272 | ((null entry) |
| 273 | (message "ref: unknown label: %s" label)) | 273 | (message "ref: unknown label: %s" label)) |
| @@ -293,14 +293,14 @@ With argument, actually select the window showing the cross reference." | |||
| 293 | (unless reftex-revisit-to-echo | 293 | (unless reftex-revisit-to-echo |
| 294 | (setq files (reftex-visited-files files))) | 294 | (setq files (reftex-visited-files files))) |
| 295 | 295 | ||
| 296 | (setq entry | 296 | (setq entry |
| 297 | (condition-case nil | 297 | (condition-case nil |
| 298 | (save-excursion | 298 | (save-excursion |
| 299 | (reftex-pop-to-bibtex-entry key files nil nil item t)) | 299 | (reftex-pop-to-bibtex-entry key files nil nil item t)) |
| 300 | (error | 300 | (error |
| 301 | (if (and files (= (length all-files) (length files))) | 301 | (if (and files (= (length all-files) (length files))) |
| 302 | (message "cite: no such database entry: %s" key) | 302 | (message "cite: no such database entry: %s" key) |
| 303 | (message "%s" (substitute-command-keys | 303 | (message "%s" (substitute-command-keys |
| 304 | (format reftex-no-info-message "cite")))) | 304 | (format reftex-no-info-message "cite")))) |
| 305 | nil))) | 305 | nil))) |
| 306 | (when entry | 306 | (when entry |
| @@ -337,7 +337,7 @@ will display info in the echo area." | |||
| 337 | (if (featurep 'xemacs) | 337 | (if (featurep 'xemacs) |
| 338 | (if reftex-use-itimer-in-xemacs | 338 | (if reftex-use-itimer-in-xemacs |
| 339 | (start-itimer "RefTeX Idle Timer" | 339 | (start-itimer "RefTeX Idle Timer" |
| 340 | 'reftex-view-crossref-when-idle | 340 | 'reftex-view-crossref-when-idle |
| 341 | reftex-idle-time reftex-idle-time t) | 341 | reftex-idle-time reftex-idle-time t) |
| 342 | (add-hook 'post-command-hook 'reftex-start-itimer-once) | 342 | (add-hook 'post-command-hook 'reftex-start-itimer-once) |
| 343 | t) | 343 | t) |
| @@ -352,7 +352,7 @@ will display info in the echo area." | |||
| 352 | (not (itimer-live-p reftex-auto-view-crossref-timer)) | 352 | (not (itimer-live-p reftex-auto-view-crossref-timer)) |
| 353 | (setq reftex-auto-view-crossref-timer | 353 | (setq reftex-auto-view-crossref-timer |
| 354 | (start-itimer "RefTeX Idle Timer" | 354 | (start-itimer "RefTeX Idle Timer" |
| 355 | 'reftex-view-crossref-when-idle | 355 | 'reftex-view-crossref-when-idle |
| 356 | reftex-idle-time nil t)))) | 356 | reftex-idle-time nil t)))) |
| 357 | 357 | ||
| 358 | (declare-function bibtex-beginning-of-entry "bibtex" ()) | 358 | (declare-function bibtex-beginning-of-entry "bibtex" ()) |
| @@ -364,7 +364,7 @@ prompts upon first use for a buffer in RefTeX mode. To reset this | |||
| 364 | link to a document, call the function with with a prefix arg. | 364 | link to a document, call the function with with a prefix arg. |
| 365 | Calling this function several times find successive citation locations." | 365 | Calling this function several times find successive citation locations." |
| 366 | (interactive "P") | 366 | (interactive "P") |
| 367 | (when arg | 367 | (when arg |
| 368 | ;; Break connection to reference buffer | 368 | ;; Break connection to reference buffer |
| 369 | (put 'reftex-bibtex-view-cite-locations :ref-buffer nil)) | 369 | (put 'reftex-bibtex-view-cite-locations :ref-buffer nil)) |
| 370 | (let ((ref-buffer (get 'reftex-bibtex-view-cite-locations :ref-buffer))) | 370 | (let ((ref-buffer (get 'reftex-bibtex-view-cite-locations :ref-buffer))) |
| @@ -372,10 +372,10 @@ Calling this function several times find successive citation locations." | |||
| 372 | (unless ref-buffer | 372 | (unless ref-buffer |
| 373 | (setq ref-buffer | 373 | (setq ref-buffer |
| 374 | (save-current-buffer | 374 | (save-current-buffer |
| 375 | (completing-read | 375 | (completing-read |
| 376 | "Reference buffer: " | 376 | "Reference buffer: " |
| 377 | (delq nil | 377 | (delq nil |
| 378 | (mapcar | 378 | (mapcar |
| 379 | (lambda (b) | 379 | (lambda (b) |
| 380 | (set-buffer b) | 380 | (set-buffer b) |
| 381 | (if reftex-mode (list (buffer-name b)) nil)) | 381 | (if reftex-mode (list (buffer-name b)) nil)) |
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index b7978fb37b6..bf46635c479 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el | |||
| @@ -230,7 +230,7 @@ one with the `xr' package." | |||
| 230 | ;; Save all document buffers before this operation | 230 | ;; Save all document buffers before this operation |
| 231 | (reftex-save-all-document-buffers) | 231 | (reftex-save-all-document-buffers) |
| 232 | 232 | ||
| 233 | ;; First test to check for erros | 233 | ;; First test to check for errors. |
| 234 | (setq n (reftex-translate | 234 | (setq n (reftex-translate |
| 235 | files search-re translate-alist error-fmt 'test)) | 235 | files search-re translate-alist error-fmt 'test)) |
| 236 | 236 | ||
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index dbed09c9ccb..d8b5384c6df 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el | |||
| @@ -470,7 +470,7 @@ Label context is only displayed when the labels are there as well." | |||
| 470 | (defun reftex-toc-max-level (arg) | 470 | (defun reftex-toc-max-level (arg) |
| 471 | "Set the maximum level of toc lines in this buffer to value of prefix ARG. | 471 | "Set the maximum level of toc lines in this buffer to value of prefix ARG. |
| 472 | When no prefix is given, set the max level to a large number, so that all | 472 | When no prefix is given, set the max level to a large number, so that all |
| 473 | levels are shown. For eaxample, to set the level to 3, type `3 m'." | 473 | levels are shown. For example, to set the level to 3, type `3 m'." |
| 474 | (interactive "P") | 474 | (interactive "P") |
| 475 | (setq reftex-toc-max-level (if arg | 475 | (setq reftex-toc-max-level (if arg |
| 476 | (prefix-numeric-value arg) | 476 | (prefix-numeric-value arg) |
| @@ -850,7 +850,7 @@ When finished, we exit with an error message." | |||
| 850 | (defun reftex-toc-rename-label () | 850 | (defun reftex-toc-rename-label () |
| 851 | "Rename the currently selected label in the *TOC* buffer. | 851 | "Rename the currently selected label in the *TOC* buffer. |
| 852 | This launches a global search and replace in order to rename a label. | 852 | This launches a global search and replace in order to rename a label. |
| 853 | Renaming a label is hardly ever necessary - the only exeption is after | 853 | Renaming a label is hardly ever necessary - the only exception is after |
| 854 | promotion/demotion in connection with a package like fancyref, where the | 854 | promotion/demotion in connection with a package like fancyref, where the |
| 855 | label prefix determines the wording of a reference." | 855 | label prefix determines the wording of a reference." |
| 856 | (interactive) | 856 | (interactive) |
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index c4dbd365c43..b73056a803b 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | ;; - For XEmacs 21.x, you need to install the RefTeX plug-in package | 42 | ;; - For XEmacs 21.x, you need to install the RefTeX plug-in package |
| 43 | ;; available from the XEmacs distribution sites. | 43 | ;; available from the XEmacs distribution sites. |
| 44 | ;; - If you have downloaded this file from the maintainers webpage, follow | 44 | ;; - If you have downloaded this file from the maintainers webpage, follow |
| 45 | ;; the instructions in the INSTALL file of the distrubution. | 45 | ;; the instructions in the INSTALL file of the distribution. |
| 46 | ;; | 46 | ;; |
| 47 | ;; To turn RefTeX Mode on and off in a buffer, use `M-x reftex-mode'. | 47 | ;; To turn RefTeX Mode on and off in a buffer, use `M-x reftex-mode'. |
| 48 | ;; | 48 | ;; |
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 1194742a24c..094885bb0d0 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el | |||
| @@ -620,7 +620,7 @@ if large. You can use `Info-split' to do this manually." | |||
| 620 | "var{\\|" | 620 | "var{\\|" |
| 621 | "w{\\|" | 621 | "w{\\|" |
| 622 | "xref{\\|" | 622 | "xref{\\|" |
| 623 | "@-\\|" ; @- is a descretionary hyphen (not an accent) (a noop). | 623 | "@-\\|" ; @- is a discretionary hyphen (not an accent) (a noop). |
| 624 | texinfo-accent-commands | 624 | texinfo-accent-commands |
| 625 | "\\)" | 625 | "\\)" |
| 626 | ) | 626 | ) |
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el index bb937a44423..8a7bb76160b 100644 --- a/lisp/url/url-ldap.el +++ b/lisp/url/url-ldap.el | |||
| @@ -173,7 +173,7 @@ URL can be a URL string, or a URL vector of the type returned by | |||
| 173 | (if attributes | 173 | (if attributes |
| 174 | (setq attributes (mapcar 'url-unhex-string (split-string attributes ",")))) | 174 | (setq attributes (mapcar 'url-unhex-string (split-string attributes ",")))) |
| 175 | 175 | ||
| 176 | ;; Parse out the exentions | 176 | ;; Parse out the extensions. |
| 177 | (if extensions | 177 | (if extensions |
| 178 | (setq extensions (mapcar (lambda (ext) | 178 | (setq extensions (mapcar (lambda (ext) |
| 179 | (if (string-match "\\([^=]*\\)=\\(.*\\)" ext) | 179 | (if (string-match "\\([^=]*\\)=\\(.*\\)" ext) |
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index 42d33553e14..cfb98c6937e 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el | |||
| @@ -335,7 +335,7 @@ Currently supported methods: | |||
| 335 | `socks': Connect through a socks server; | 335 | `socks': Connect through a socks server; |
| 336 | `tls': Connect with TLS; | 336 | `tls': Connect with TLS; |
| 337 | `ssl': Connect with SSL (deprecated, use `tls' instead); | 337 | `ssl': Connect with SSL (deprecated, use `tls' instead); |
| 338 | `native': Connect directy." | 338 | `native': Connect directly." |
| 339 | :type '(radio (const :tag "Telnet to gateway host" :value telnet) | 339 | :type '(radio (const :tag "Telnet to gateway host" :value telnet) |
| 340 | (const :tag "Rlogin to gateway host" :value rlogin) | 340 | (const :tag "Rlogin to gateway host" :value rlogin) |
| 341 | (const :tag "Use SOCKS proxy" :value socks) | 341 | (const :tag "Use SOCKS proxy" :value socks) |
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index 46b95130ca0..f6340392dc2 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el | |||
| @@ -502,7 +502,7 @@ It is expected to call the function.") | |||
| 502 | (if (or (null cvs-version) | 502 | (if (or (null cvs-version) |
| 503 | (or (>= (cdr cvs-version) 10) (> (car cvs-version) 1))) | 503 | (or (>= (cdr cvs-version) 10) (> (car cvs-version) 1))) |
| 504 | ;; Supposedly some recent versions of CVS output some directory info | 504 | ;; Supposedly some recent versions of CVS output some directory info |
| 505 | ;; as they recurse downthe tree, but it's not good enough in the case | 505 | ;; as they recurse down the tree, but it's not good enough in the case |
| 506 | ;; where we run "cvs status foo bar/foo". | 506 | ;; where we run "cvs status foo bar/foo". |
| 507 | '("status") | 507 | '("status") |
| 508 | t) | 508 | t) |
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el index 311841d37a0..4915cb9bf7f 100644 --- a/lisp/vc/pcvs-util.el +++ b/lisp/vc/pcvs-util.el | |||
| @@ -307,7 +307,7 @@ If it is \\[universal-argument] \\[universal-argument], behave just | |||
| 307 | See `cvs-prefix-set' for further description of the behavior.")) | 307 | See `cvs-prefix-set' for further description of the behavior.")) |
| 308 | (defvar ,cps | 308 | (defvar ,cps |
| 309 | (let ((defaults ,defaults)) | 309 | (let ((defaults ,defaults)) |
| 310 | ;; sanity ensurance | 310 | ;; sanity insurance |
| 311 | (unless (>= (length defaults) cvs-prefix-number) | 311 | (unless (>= (length defaults) cvs-prefix-number) |
| 312 | (setq defaults (append defaults | 312 | (setq defaults (append defaults |
| 313 | (make-list (1- cvs-prefix-number) | 313 | (make-list (1- cvs-prefix-number) |
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 5595dc0b03f..256719d4c84 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el | |||
| @@ -620,7 +620,7 @@ If non-nil, NEW means to create a new buffer no matter what." | |||
| 620 | (str (car hf)) | 620 | (str (car hf)) |
| 621 | (done "") | 621 | (done "") |
| 622 | (tin (ewoc-nth cvs-cookies 0))) | 622 | (tin (ewoc-nth cvs-cookies 0))) |
| 623 | ;; look for the first *real* fileinfo (to determine emptyness) | 623 | ;; look for the first *real* fileinfo (to determine emptiness) |
| 624 | (while | 624 | (while |
| 625 | (and tin | 625 | (and tin |
| 626 | (memq (cvs-fileinfo->type (ewoc-data tin)) | 626 | (memq (cvs-fileinfo->type (ewoc-data tin)) |
diff --git a/lisp/window.el b/lisp/window.el index 6de37c1d16e..4550526b44d 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -3432,7 +3432,7 @@ is non-nil." | |||
| 3432 | "Balance the sizes of windows of WINDOW-OR-FRAME. | 3432 | "Balance the sizes of windows of WINDOW-OR-FRAME. |
| 3433 | WINDOW-OR-FRAME is optional and defaults to the selected frame. | 3433 | WINDOW-OR-FRAME is optional and defaults to the selected frame. |
| 3434 | If WINDOW-OR-FRAME denotes a frame, balance the sizes of all | 3434 | If WINDOW-OR-FRAME denotes a frame, balance the sizes of all |
| 3435 | windows of that frame. If WINDOW-OR-FRAME denots a window, | 3435 | windows of that frame. If WINDOW-OR-FRAME denotes a window, |
| 3436 | recursively balance the sizes of all child windows of that | 3436 | recursively balance the sizes of all child windows of that |
| 3437 | window." | 3437 | window." |
| 3438 | (interactive) | 3438 | (interactive) |
diff --git a/lisp/woman.el b/lisp/woman.el index 4999a08bb72..a16bfa39c86 100644 --- a/lisp/woman.el +++ b/lisp/woman.el | |||
| @@ -2023,7 +2023,7 @@ Optional argument REDRAW, if non-nil, forces mode line to be updated." | |||
| 2023 | ;; Both advices are disabled because "a file in Emacs should not put | 2023 | ;; Both advices are disabled because "a file in Emacs should not put |
| 2024 | ;; advice on a function in Emacs" (see Info node "(elisp)Advising | 2024 | ;; advice on a function in Emacs" (see Info node "(elisp)Advising |
| 2025 | ;; Functions"). Counting the formatting time is useful for | 2025 | ;; Functions"). Counting the formatting time is useful for |
| 2026 | ;; developping, but less applicable for daily use. The advice for | 2026 | ;; developing, but less applicable for daily use. The advice for |
| 2027 | ;; `Man-getpage-in-background' can be discarded, because the | 2027 | ;; `Man-getpage-in-background' can be discarded, because the |
| 2028 | ;; key-binding in `woman-mode-map' has been remapped to call `woman' | 2028 | ;; key-binding in `woman-mode-map' has been remapped to call `woman' |
| 2029 | ;; but `man'. Michael Albinus <michael.albinus@gmx.de> | 2029 | ;; but `man'. Michael Albinus <michael.albinus@gmx.de> |
| @@ -484,7 +484,7 @@ static Lisp_Object Vccl_program_table; | |||
| 484 | If the element is t or lambda, finish without changing reg[rrr]. | 484 | If the element is t or lambda, finish without changing reg[rrr]. |
| 485 | If the element is a number, set reg[rrr] to the number and finish. | 485 | If the element is a number, set reg[rrr] to the number and finish. |
| 486 | 486 | ||
| 487 | Detail of the map structure is descibed in the comment for | 487 | Detail of the map structure is described in the comment for |
| 488 | CCL_MapMultiple below. */ | 488 | CCL_MapMultiple below. */ |
| 489 | 489 | ||
| 490 | #define CCL_IterateMultipleMap 0x10 /* Iterate multiple maps | 490 | #define CCL_IterateMultipleMap 0x10 /* Iterate multiple maps |
| @@ -1808,7 +1808,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size | |||
| 1808 | 1808 | ||
| 1809 | /* Resolve symbols in the specified CCL code (Lisp vector). This | 1809 | /* Resolve symbols in the specified CCL code (Lisp vector). This |
| 1810 | function converts symbols of code conversion maps and character | 1810 | function converts symbols of code conversion maps and character |
| 1811 | translation tables embeded in the CCL code into their ID numbers. | 1811 | translation tables embedded in the CCL code into their ID numbers. |
| 1812 | 1812 | ||
| 1813 | The return value is a vector (CCL itself or a new vector in which | 1813 | The return value is a vector (CCL itself or a new vector in which |
| 1814 | all symbols are resolved), Qt if resolving of some symbol failed, | 1814 | all symbols are resolved), Qt if resolving of some symbol failed, |
diff --git a/src/chartab.c b/src/chartab.c index 7e8161461f3..724b3076a11 100644 --- a/src/chartab.c +++ b/src/chartab.c | |||
| @@ -1196,7 +1196,7 @@ uniprop_table_uncompress (Lisp_Object table, int idx) | |||
| 1196 | } | 1196 | } |
| 1197 | 1197 | ||
| 1198 | 1198 | ||
| 1199 | /* Decode VALUE as an elemnet of char-table TABLE. */ | 1199 | /* Decode VALUE as an element of char-table TABLE. */ |
| 1200 | 1200 | ||
| 1201 | static Lisp_Object | 1201 | static Lisp_Object |
| 1202 | uniprop_decode_value_run_length (Lisp_Object table, Lisp_Object value) | 1202 | uniprop_decode_value_run_length (Lisp_Object table, Lisp_Object value) |
diff --git a/src/dired.c b/src/dired.c index fac3a34ab9b..acc81a6ed9d 100644 --- a/src/dired.c +++ b/src/dired.c | |||
| @@ -628,7 +628,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v | |||
| 628 | 628 | ||
| 629 | if (includeall && !canexclude) | 629 | if (includeall && !canexclude) |
| 630 | { /* If we have one non-excludable file, we want to exclude the | 630 | { /* If we have one non-excludable file, we want to exclude the |
| 631 | excudable files. */ | 631 | excludable files. */ |
| 632 | includeall = 0; | 632 | includeall = 0; |
| 633 | /* Throw away any previous excludable match found. */ | 633 | /* Throw away any previous excludable match found. */ |
| 634 | bestmatch = Qnil; | 634 | bestmatch = Qnil; |
diff --git a/src/doprnt.c b/src/doprnt.c index b4d13c59137..35af2297ff4 100644 --- a/src/doprnt.c +++ b/src/doprnt.c | |||
| @@ -26,7 +26,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 26 | of the (`int') argument, suitable for display in an Emacs buffer. | 26 | of the (`int') argument, suitable for display in an Emacs buffer. |
| 27 | 27 | ||
| 28 | . For %s and %c, when field width is specified (e.g., %25s), it accounts for | 28 | . For %s and %c, when field width is specified (e.g., %25s), it accounts for |
| 29 | the diplay width of each character, according to char-width-table. That | 29 | the display width of each character, according to char-width-table. That |
| 30 | is, it does not assume that each character takes one column on display. | 30 | is, it does not assume that each character takes one column on display. |
| 31 | 31 | ||
| 32 | . If the size of the buffer is not enough to produce the formatted string in | 32 | . If the size of the buffer is not enough to produce the formatted string in |
diff --git a/src/frame.c b/src/frame.c index ab60fd5b808..c14f4db91da 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -2487,7 +2487,7 @@ If FRAME is omitted, the selected frame is used. The exact value | |||
| 2487 | of the result depends on the window-system and toolkit in use: | 2487 | of the result depends on the window-system and toolkit in use: |
| 2488 | 2488 | ||
| 2489 | In the Gtk+ version of Emacs, it includes only any window (including | 2489 | In the Gtk+ version of Emacs, it includes only any window (including |
| 2490 | the minibuffer or eacho area), mode line, and header line. It does not | 2490 | the minibuffer or echo area), mode line, and header line. It does not |
| 2491 | include the tool bar or menu bar. | 2491 | include the tool bar or menu bar. |
| 2492 | 2492 | ||
| 2493 | With the Motif or Lucid toolkits, it also includes the tool bar (but | 2493 | With the Motif or Lucid toolkits, it also includes the tool bar (but |
diff --git a/src/gtkutil.c b/src/gtkutil.c index 04104064096..0b7fd41f5f6 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -1423,7 +1423,7 @@ get_dialog_title (char key) | |||
| 1423 | /* Callback for dialogs that get WM_DELETE_WINDOW. We pop down | 1423 | /* Callback for dialogs that get WM_DELETE_WINDOW. We pop down |
| 1424 | the dialog, but return TRUE so the event does not propagate further | 1424 | the dialog, but return TRUE so the event does not propagate further |
| 1425 | in GTK. This prevents GTK from destroying the dialog widget automatically | 1425 | in GTK. This prevents GTK from destroying the dialog widget automatically |
| 1426 | and we can always destrou the widget manually, regardles of how | 1426 | and we can always destroy the widget manually, regardless of how |
| 1427 | it was popped down (button press or WM_DELETE_WINDOW). | 1427 | it was popped down (button press or WM_DELETE_WINDOW). |
| 1428 | W is the dialog widget. | 1428 | W is the dialog widget. |
| 1429 | EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used). | 1429 | EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used). |
| @@ -2294,7 +2294,7 @@ tearoff_activate (GtkWidget *widget, gpointer client_data) | |||
| 2294 | 2294 | ||
| 2295 | 2295 | ||
| 2296 | /* Create a menu item widget, and connect the callbacks. | 2296 | /* Create a menu item widget, and connect the callbacks. |
| 2297 | ITEM decribes the menu item. | 2297 | ITEM describes the menu item. |
| 2298 | F is the frame the created menu belongs to. | 2298 | F is the frame the created menu belongs to. |
| 2299 | SELECT_CB is the callback to use when a menu item is selected. | 2299 | SELECT_CB is the callback to use when a menu item is selected. |
| 2300 | HIGHLIGHT_CB is the callback to call when entering/leaving menu items. | 2300 | HIGHLIGHT_CB is the callback to call when entering/leaving menu items. |
diff --git a/src/keyboard.c b/src/keyboard.c index 87dd2b0e251..5d1784ad0b0 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -932,7 +932,7 @@ pop_kboard (void) | |||
| 932 | state later. | 932 | state later. |
| 933 | 933 | ||
| 934 | If Emacs is already in single_kboard mode, and F's keyboard is | 934 | If Emacs is already in single_kboard mode, and F's keyboard is |
| 935 | locked, then this function will throw an errow. */ | 935 | locked, then this function will throw an error. */ |
| 936 | 936 | ||
| 937 | void | 937 | void |
| 938 | temporarily_switch_to_single_kboard (struct frame *f) | 938 | temporarily_switch_to_single_kboard (struct frame *f) |
| @@ -5393,7 +5393,7 @@ make_lispy_event (struct input_event *event) | |||
| 5393 | || !lispy_function_keys[event->code - FUNCTION_KEY_OFFSET]) | 5393 | || !lispy_function_keys[event->code - FUNCTION_KEY_OFFSET]) |
| 5394 | { | 5394 | { |
| 5395 | /* We need to use an alist rather than a vector as the cache | 5395 | /* We need to use an alist rather than a vector as the cache |
| 5396 | since we can't make a vector long enuf. */ | 5396 | since we can't make a vector long enough. */ |
| 5397 | if (NILP (KVAR (current_kboard, system_key_syms))) | 5397 | if (NILP (KVAR (current_kboard, system_key_syms))) |
| 5398 | KVAR (current_kboard, system_key_syms) = Fcons (Qnil, Qnil); | 5398 | KVAR (current_kboard, system_key_syms) = Fcons (Qnil, Qnil); |
| 5399 | return modify_event_symbol (event->code, | 5399 | return modify_event_symbol (event->code, |
diff --git a/src/w32fns.c b/src/w32fns.c index b4166cbf691..4a6da46141c 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -6709,7 +6709,7 @@ DEFUN ("default-printer-name", Fdefault_printer_name, Sdefault_printer_name, | |||
| 6709 | ClosePrinter (hPrn); | 6709 | ClosePrinter (hPrn); |
| 6710 | return Qnil; | 6710 | return Qnil; |
| 6711 | } | 6711 | } |
| 6712 | /* Call GetPrinter again with big enouth memory block */ | 6712 | /* Call GetPrinter again with big enough memory block. */ |
| 6713 | err = GetPrinter (hPrn, 2, (LPBYTE)ppi2, dwNeeded, &dwReturned); | 6713 | err = GetPrinter (hPrn, 2, (LPBYTE)ppi2, dwNeeded, &dwReturned); |
| 6714 | ClosePrinter (hPrn); | 6714 | ClosePrinter (hPrn); |
| 6715 | if (!err) | 6715 | if (!err) |
diff --git a/src/w32font.c b/src/w32font.c index ac1d678edee..bd58e7e757b 100644 --- a/src/w32font.c +++ b/src/w32font.c | |||
| @@ -330,7 +330,7 @@ w32font_list (Lisp_Object frame, Lisp_Object font_spec) | |||
| 330 | 330 | ||
| 331 | /* w32 implementation of match for font backend. | 331 | /* w32 implementation of match for font backend. |
| 332 | Return a font entity most closely matching with FONT_SPEC on | 332 | Return a font entity most closely matching with FONT_SPEC on |
| 333 | FRAME. The closeness is detemined by the font backend, thus | 333 | FRAME. The closeness is determined by the font backend, thus |
| 334 | `face-font-selection-order' is ignored here. */ | 334 | `face-font-selection-order' is ignored here. */ |
| 335 | static Lisp_Object | 335 | static Lisp_Object |
| 336 | w32font_match (Lisp_Object frame, Lisp_Object font_spec) | 336 | w32font_match (Lisp_Object frame, Lisp_Object font_spec) |
diff --git a/src/w32proc.c b/src/w32proc.c index 65d63597fae..c2020b40241 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -2296,7 +2296,7 @@ filesystems via ange-ftp. */); | |||
| 2296 | doc: /* Non-nil means attempt to fake realistic inode values. | 2296 | doc: /* Non-nil means attempt to fake realistic inode values. |
| 2297 | This works by hashing the truename of files, and should detect | 2297 | This works by hashing the truename of files, and should detect |
| 2298 | aliasing between long and short (8.3 DOS) names, but can have | 2298 | aliasing between long and short (8.3 DOS) names, but can have |
| 2299 | false positives because of hash collisions. Note that determing | 2299 | false positives because of hash collisions. Note that determining |
| 2300 | the truename of a file can be slow. */); | 2300 | the truename of a file can be slow. */); |
| 2301 | Vw32_generate_fake_inodes = Qnil; | 2301 | Vw32_generate_fake_inodes = Qnil; |
| 2302 | #endif | 2302 | #endif |
diff --git a/src/xterm.c b/src/xterm.c index fb77faa75fe..0da78ae1bb1 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6120,7 +6120,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, | |||
| 6120 | { | 6120 | { |
| 6121 | /* Gnome shell does not iconify us when C-z is pressed. It hides | 6121 | /* Gnome shell does not iconify us when C-z is pressed. It hides |
| 6122 | the frame. So if our state says we aren't hidden anymore, | 6122 | the frame. So if our state says we aren't hidden anymore, |
| 6123 | treat is as deiconfied. */ | 6123 | treat it as deiconified. */ |
| 6124 | if (! f->async_iconified) | 6124 | if (! f->async_iconified) |
| 6125 | SET_FRAME_GARBAGED (f); | 6125 | SET_FRAME_GARBAGED (f); |
| 6126 | f->async_visible = 1; | 6126 | f->async_visible = 1; |
diff --git a/test/cedet/tests/testpolymorph.cpp b/test/cedet/tests/testpolymorph.cpp index 493b4344c17..9db2d51efe7 100644 --- a/test/cedet/tests/testpolymorph.cpp +++ b/test/cedet/tests/testpolymorph.cpp | |||
| @@ -50,7 +50,7 @@ namespace fcn_poly { | |||
| 50 | 50 | ||
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | // Test 3 - Methods w/ differet arg lists. | 53 | // Test 3 - Methods w/ different arg lists. |
| 54 | class meth_poly { | 54 | class meth_poly { |
| 55 | public: | 55 | public: |
| 56 | int pm_meth(void) { | 56 | int pm_meth(void) { |
| @@ -128,4 +128,3 @@ namespace template_multiple_spec { | |||
| 128 | 128 | ||
| 129 | 129 | ||
| 130 | // End of polymorphism test file. | 130 | // End of polymorphism test file. |
| 131 | |||