diff options
| -rw-r--r-- | admin/grammars/grammar.wy | 2 | ||||
| -rw-r--r-- | admin/grammars/js.wy | 8 | ||||
| -rw-r--r-- | doc/misc/srecode.texi | 2 | ||||
| -rw-r--r-- | doc/misc/wisent.texi | 2 | ||||
| -rw-r--r-- | etc/ETAGS.EBNF | 2 | ||||
| -rw-r--r-- | etc/MH-E-NEWS | 2 | ||||
| -rw-r--r-- | lib-src/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/ChangeLog.3 | 4 | ||||
| -rw-r--r-- | lisp/ChangeLog.4 | 2 | ||||
| -rw-r--r-- | lisp/arc-mode.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/ede/proj-comp.el | 2 | ||||
| -rw-r--r-- | lisp/emulation/edt-mapper.el | 70 | ||||
| -rw-r--r-- | lisp/htmlfontify.el | 2 | ||||
| -rw-r--r-- | lisp/international/mule-conf.el | 2 | ||||
| -rw-r--r-- | lisp/language/cyrillic.el | 2 | ||||
| -rw-r--r-- | lisp/leim/quail/ipa-praat.el | 4 | ||||
| -rw-r--r-- | lisp/leim/quail/ipa.el | 2 | ||||
| -rw-r--r-- | lisp/org/org-entities.el | 2 | ||||
| -rw-r--r-- | lisp/play/gametree.el | 14 | ||||
| -rw-r--r-- | lisp/play/handwrite.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cperl-mode.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/gud.el | 2 | ||||
| -rw-r--r-- | lisp/ps-print.el | 2 | ||||
| -rw-r--r-- | nt/cmdproxy.c | 3 | ||||
| -rw-r--r-- | src/syswait.h | 2 |
26 files changed, 73 insertions, 74 deletions
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy index a772c212360..4605e3c4f70 100644 --- a/admin/grammars/grammar.wy +++ b/admin/grammars/grammar.wy | |||
| @@ -94,7 +94,7 @@ | |||
| 94 | %token <open-paren> LBRACE "{" | 94 | %token <open-paren> LBRACE "{" |
| 95 | %token <close-paren> RBRACE "}" | 95 | %token <close-paren> RBRACE "}" |
| 96 | 96 | ||
| 97 | ;; Punctuations | 97 | ;; Punctuation |
| 98 | %type <punctuation> | 98 | %type <punctuation> |
| 99 | %token <punctuation> COLON ":" | 99 | %token <punctuation> COLON ":" |
| 100 | %token <punctuation> SEMI ";" | 100 | %token <punctuation> SEMI ";" |
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy index a01d64ec093..91dbff2330d 100644 --- a/admin/grammars/js.wy +++ b/admin/grammars/js.wy | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | (start end &optional nonterminal depth returnonerror)) | 65 | (start end &optional nonterminal depth returnonerror)) |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | ;; JAVE I prefere ecmascript-mode | 68 | ;; JAVE I preferred ecmascript-mode. |
| 69 | %languagemode ecmascript-mode javascript-mode | 69 | %languagemode ecmascript-mode javascript-mode |
| 70 | 70 | ||
| 71 | ;; The default goal | 71 | ;; The default goal |
| @@ -276,8 +276,8 @@ Statement : Block | |||
| 276 | | BreakStatement | 276 | | BreakStatement |
| 277 | | ReturnStatement | 277 | | ReturnStatement |
| 278 | | WithStatement | 278 | | WithStatement |
| 279 | ; | 279 | ; |
| 280 | 280 | ||
| 281 | FunctionDeclaration : FUNCTION VARIABLE FormalParameterListBlock Block | 281 | FunctionDeclaration : FUNCTION VARIABLE FormalParameterListBlock Block |
| 282 | (FUNCTION-TAG $2 nil $3) | 282 | (FUNCTION-TAG $2 nil $3) |
| 283 | ; | 283 | ; |
| @@ -353,7 +353,7 @@ IterationExpression : WHILE OPEN_PARENTHESIS Expression CLOSE_PARENTHESIS Statem | |||
| 353 | ContinueStatement : CONTINUE SEMICOLON | 353 | ContinueStatement : CONTINUE SEMICOLON |
| 354 | ; | 354 | ; |
| 355 | 355 | ||
| 356 | ;;JAVE break needs labels | 356 | ;;JAVE break needs labels |
| 357 | BreakStatement : BREAK SEMICOLON | 357 | BreakStatement : BREAK SEMICOLON |
| 358 | ;; | BREAK identifier SEMICOLON | 358 | ;; | BREAK identifier SEMICOLON |
| 359 | ; | 359 | ; |
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi index 033e031b648..a0fcd9e2e94 100644 --- a/doc/misc/srecode.texi +++ b/doc/misc/srecode.texi | |||
| @@ -822,7 +822,7 @@ from the name, like this: | |||
| 822 | @node Contexts | 822 | @node Contexts |
| 823 | @section Context | 823 | @section Context |
| 824 | 824 | ||
| 825 | Each template belongs to a context. When promting for a template by | 825 | Each template belongs to a context. When prompting for a template by |
| 826 | name, such as with @kbd{C-c / /}, the name is prefixed by the current | 826 | name, such as with @kbd{C-c / /}, the name is prefixed by the current |
| 827 | context. If there is no context, it defaults to @code{declaration}. | 827 | context. If there is no context, it defaults to @code{declaration}. |
| 828 | 828 | ||
diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi index c8a56ea3414..3ee080f50e0 100644 --- a/doc/misc/wisent.texi +++ b/doc/misc/wisent.texi | |||
| @@ -131,7 +131,7 @@ June 1985, Report No. UCB/CSD 85/251. | |||
| 131 | 131 | ||
| 132 | @item | 132 | @item |
| 133 | For generating the lookahead sets, Wisent uses the well-known | 133 | For generating the lookahead sets, Wisent uses the well-known |
| 134 | technique of F. DeRemer and A. Pennello described in: | 134 | technique of F. DeRemer and T. Pennello described in: |
| 135 | @quotation | 135 | @quotation |
| 136 | @cite{Efficient Computation of LALR(1) Look-Ahead Sets}@* | 136 | @cite{Efficient Computation of LALR(1) Look-Ahead Sets}@* |
| 137 | October 1982, ACM TOPLAS Vol 4 No 4, 615--49, | 137 | October 1982, ACM TOPLAS Vol 4 No 4, 615--49, |
diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF index 850c1c942bf..66a974b948c 100644 --- a/etc/ETAGS.EBNF +++ b/etc/ETAGS.EBNF | |||
| @@ -11,7 +11,7 @@ This file contains two sections: | |||
| 11 | ====================== 1) EBNF tag file description ===================== | 11 | ====================== 1) EBNF tag file description ===================== |
| 12 | 12 | ||
| 13 | Productions created from current behavior to aid extensions | 13 | Productions created from current behavior to aid extensions |
| 14 | Francesco Potorti` <pot@gnu.org> 2002 | 14 | Francesco Potortì <pot@gnu.org> 2002 |
| 15 | ---------------- | 15 | ---------------- |
| 16 | 16 | ||
| 17 | FF ::= #x0c /* tag section starter */ | 17 | FF ::= #x0c /* tag section starter */ |
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS index 29a2c80dd42..f4308cedfbc 100644 --- a/etc/MH-E-NEWS +++ b/etc/MH-E-NEWS | |||
| @@ -3205,7 +3205,7 @@ current folder. | |||
| 3205 | *** New function `mh-version' displays version information about MH | 3205 | *** New function `mh-version' displays version information about MH |
| 3206 | and mh-e. Please use the output in bug reports. | 3206 | and mh-e. Please use the output in bug reports. |
| 3207 | 3207 | ||
| 3208 | *** `mh-quit' now burys the folder buffer and show buffer. | 3208 | *** `mh-quit' now buries the folder buffer and show buffer. |
| 3209 | 3209 | ||
| 3210 | 3210 | ||
| 3211 | ** New hooks and customization variables in mh-e 4.0 | 3211 | ** New hooks and customization variables in mh-e 4.0 |
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 5f80ccdd60b..3941a63ff2b 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -5009,7 +5009,7 @@ | |||
| 5009 | 1999-06-23 Dave Love <fx@gnu.org> | 5009 | 1999-06-23 Dave Love <fx@gnu.org> |
| 5010 | 5010 | ||
| 5011 | * etags.c (erlang_attribute): Fix undefined variable usage (after | 5011 | * etags.c (erlang_attribute): Fix undefined variable usage (after |
| 5012 | Potorti). | 5012 | Potortì). |
| 5013 | 5013 | ||
| 5014 | 1999-05-02 Andrew Innes <andrewi@gnu.org> | 5014 | 1999-05-02 Andrew Innes <andrewi@gnu.org> |
| 5015 | 5015 | ||
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index 66ac43a48d2..767b4dd46ab 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 | |||
| @@ -10103,7 +10103,7 @@ | |||
| 10103 | 10103 | ||
| 10104 | 1990-02-07 David Lawrence (tale@galapas) | 10104 | 1990-02-07 David Lawrence (tale@galapas) |
| 10105 | 10105 | ||
| 10106 | * inf-lisp.el: inferior-lisp-program can be a list of the programme | 10106 | * inf-lisp.el: inferior-lisp-program can be a list of the program |
| 10107 | name and its arguments. | 10107 | name and its arguments. |
| 10108 | 10108 | ||
| 10109 | 1990-02-06 Ed Reingold (reingold@emr.cs.uiuc.edu) | 10109 | 1990-02-06 Ed Reingold (reingold@emr.cs.uiuc.edu) |
| @@ -10453,7 +10453,7 @@ | |||
| 10453 | Moved bindings off of C-c LETTER. | 10453 | Moved bindings off of C-c LETTER. |
| 10454 | Cleaned up references to cmu* files. | 10454 | Cleaned up references to cmu* files. |
| 10455 | Made comint-send-input do unconditional end-of-line before processing. | 10455 | Made comint-send-input do unconditional end-of-line before processing. |
| 10456 | cominit-exec will signal an error if no programme name. | 10456 | cominit-exec will signal an error if no program name. |
| 10457 | Removed full-copy-sparse-keymap and comint-log-user. | 10457 | Removed full-copy-sparse-keymap and comint-log-user. |
| 10458 | 10458 | ||
| 10459 | 1989-12-04 Joseph Arceneaux (jla@spiff) | 10459 | 1989-12-04 Joseph Arceneaux (jla@spiff) |
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4 index 9ac9699da88..434a06c1c1b 100644 --- a/lisp/ChangeLog.4 +++ b/lisp/ChangeLog.4 | |||
| @@ -8269,7 +8269,7 @@ | |||
| 8269 | 8269 | ||
| 8270 | 1993-06-15 Shane Hartman (shane@nugget.spr.com) | 8270 | 1993-06-15 Shane Hartman (shane@nugget.spr.com) |
| 8271 | 8271 | ||
| 8272 | * gud.el (xdb): New debugger supported (xdb under HPUX-PARISC). | 8272 | * gud.el (xdb): New debugger supported (xdb under HPUX-PA-RISC). |
| 8273 | (gud-xdb-debugger-startup): New function. | 8273 | (gud-xdb-debugger-startup): New function. |
| 8274 | (gud-xdb-file-name, gud-xdb-accumulation): New functions. | 8274 | (gud-xdb-file-name, gud-xdb-accumulation): New functions. |
| 8275 | (gud-xdb-marker-filter, gud-xdb-paths, gud-xdb-find-file): New. | 8275 | (gud-xdb-marker-filter, gud-xdb-paths, gud-xdb-find-file): New. |
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 0f03aa75c80..37ddf87cfbf 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el | |||
| @@ -78,7 +78,7 @@ | |||
| 78 | ;; interaction among members. | 78 | ;; interaction among members. |
| 79 | ;; Headers come in three flavors called level 0, 1 and 2 headers. | 79 | ;; Headers come in three flavors called level 0, 1 and 2 headers. |
| 80 | ;; Level 2 header is free of DOS specific restrictions and most | 80 | ;; Level 2 header is free of DOS specific restrictions and most |
| 81 | ;; prevalently used. Also level 1 and 2 headers consist of base | 81 | ;; commonly used. Also level 1 and 2 headers consist of base |
| 82 | ;; and extension headers. For more details see | 82 | ;; and extension headers. For more details see |
| 83 | ;; http://homepage1.nifty.com/dangan/en/Content/Program/Java/jLHA/Notes/Notes.html | 83 | ;; http://homepage1.nifty.com/dangan/en/Content/Program/Java/jLHA/Notes/Notes.html |
| 84 | ;; http://www.osirusoft.com/joejared/lzhformat.html | 84 | ;; http://www.osirusoft.com/joejared/lzhformat.html |
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el index 94bee4ac339..b53984293b3 100644 --- a/lisp/cedet/ede/proj-comp.el +++ b/lisp/cedet/ede/proj-comp.el | |||
| @@ -218,7 +218,7 @@ This will prevent rules from creating duplicate variables or rules." | |||
| 218 | (def-edebug-spec ede-pmake-insert-variable-shared (form def-body)) | 218 | (def-edebug-spec ede-pmake-insert-variable-shared (form def-body)) |
| 219 | )) | 219 | )) |
| 220 | 220 | ||
| 221 | ;;; Querys | 221 | ;;; Queries |
| 222 | (defun ede-proj-find-compiler (compilers sourcetype) | 222 | (defun ede-proj-find-compiler (compilers sourcetype) |
| 223 | "Return a compiler from the list COMPILERS that will compile SOURCETYPE." | 223 | "Return a compiler from the list COMPILERS that will compile SOURCETYPE." |
| 224 | (while (and compilers | 224 | (while (and compilers |
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el index 725eab41d20..c8b7e894552 100644 --- a/lisp/emulation/edt-mapper.el +++ b/lisp/emulation/edt-mapper.el | |||
| @@ -297,26 +297,26 @@ | |||
| 297 | 297 | ||
| 298 | Here's a picture of the standard LK-201 keypad for reference: | 298 | Here's a picture of the standard LK-201 keypad for reference: |
| 299 | 299 | ||
| 300 | _______________________ _______________________________ | 300 | ________________________ _______________________________ |
| 301 | | HELP | DO | | F17 | F18 | F19 | F20 | | 301 | | HELP | DO | | F17 | F18 | F19 | F20 | |
| 302 | | | | | | | | | | 302 | | | | | | | | | |
| 303 | |_______|_______________| |_______|_______|_______|_______| | 303 | |_______|________________| |_______|_______|_______|_______| |
| 304 | _______________________ _______________________________ | 304 | ________________________ _______________________________ |
| 305 | | FIND |INSERT |REMOVE | | PF1 | PF2 | PF3 | PF4 | | 305 | | FIND |INSERT |REMOVE | | PF1 | PF2 | PF3 | PF4 | |
| 306 | | | | | | | | | | | 306 | | | | | | | | | | |
| 307 | |_______|_______|_______| |_______|_______|_______|_______| | 307 | |_______|________|_______| |_______|_______|_______|_______| |
| 308 | |SELECT |PREVIOU| NEXT | | KP7 | KP8 | KP9 | KP- | | 308 | |SELECT |PREVIOUS|NEXT | | KP7 | KP8 | KP9 | KP- | |
| 309 | | | | | | | | | | | 309 | | | | | | | | | | |
| 310 | |_______|_______|_______| |_______|_______|_______|_______| | 310 | |_______|________|_______| |_______|_______|_______|_______| |
| 311 | | UP | | KP4 | KP5 | KP6 | KP, | | 311 | | UP | | KP4 | KP5 | KP6 | KP, | |
| 312 | | | | | | | | | 312 | | | | | | | | |
| 313 | _______|_______|_______ |_______|_______|_______|_______| | 313 | _______|________|_______ |_______|_______|_______|_______| |
| 314 | | LEFT | DOWN | RIGHT | | KP1 | KP2 | KP3 | | | 314 | | LEFT | DOWN | RIGHT | | KP1 | KP2 | KP3 | | |
| 315 | | | | | | | | | | | 315 | | | | | | | | | | |
| 316 | |_______|_______|_______| |_______|_______|_______| KPE | | 316 | |_______|________|_______| |_______|_______|_______| KPE | |
| 317 | | KP0 | KPP | | | 317 | | KP0 | KPP | | |
| 318 | | | | | | 318 | | | | | |
| 319 | |_______________|_______|_______| | 319 | |_______________|_______|_______| |
| 320 | 320 | ||
| 321 | REMEMBER: JUST PRESS RETURN TO SKIP MAPPING A KEY. | 321 | REMEMBER: JUST PRESS RETURN TO SKIP MAPPING A KEY. |
| 322 | 322 | ||
| @@ -329,20 +329,20 @@ | |||
| 329 | 329 | ||
| 330 | PRESS THE KEY SPECIFIED IN THE MINIBUFFER BELOW. | 330 | PRESS THE KEY SPECIFIED IN THE MINIBUFFER BELOW. |
| 331 | 331 | ||
| 332 | _______________________ _______________________________ | 332 | ________________________ _______________________________ |
| 333 | | HELP | DO | | F17 | F18 | F19 | F20 | | 333 | | HELP | DO | | F17 | F18 | F19 | F20 | |
| 334 | |_______|_______________| |_______|_______|_______|_______| | 334 | |_______|________________| |_______|_______|_______|_______| |
| 335 | _______________________ _______________________________ | 335 | ________________________ _______________________________ |
| 336 | | FIND |INSERT |REMOVE | | PF1 | PF2 | PF3 | PF4 | | 336 | | FIND |INSERT |REMOVE | | PF1 | PF2 | PF3 | PF4 | |
| 337 | |_______|_______|_______| |_______|_______|_______|_______| | 337 | |_______|________|_______| |_______|_______|_______|_______| |
| 338 | |SELECT |PREVIOU| NEXT | | KP7 | KP8 | KP9 | KP- | | 338 | |SELECT |PREVIOUS| NEXT | | KP7 | KP8 | KP9 | KP- | |
| 339 | |_______|_______|_______| |_______|_______|_______|_______| | 339 | |_______|________|_______| |_______|_______|_______|_______| |
| 340 | | UP | | KP4 | KP5 | KP6 | KP, | | 340 | | UP | | KP4 | KP5 | KP6 | KP, | |
| 341 | _______|_______|_______ |_______|_______|_______|_______| | 341 | _______|________|_______ |_______|_______|_______|_______| |
| 342 | | LEFT | DOWN | RIGHT | | KP1 | KP2 | KP3 | | | 342 | | LEFT | DOWN | RIGHT | | KP1 | KP2 | KP3 | | |
| 343 | |_______|_______|_______| |_______|_______|_______| KPE | | 343 | |_______|________|_______| |_______|_______|_______| KPE | |
| 344 | | KP0 | KPP | | | 344 | | KP0 | KPP | | |
| 345 | |_______________|_______|_______| | 345 | |_______________|_______|_______| |
| 346 | 346 | ||
| 347 | REMEMBER: JUST PRESS RETURN TO SKIP MAPPING A KEY."))) | 347 | REMEMBER: JUST PRESS RETURN TO SKIP MAPPING A KEY."))) |
| 348 | 348 | ||
| @@ -353,7 +353,7 @@ | |||
| 353 | (defun edt-map-key (ident descrip) | 353 | (defun edt-map-key (ident descrip) |
| 354 | (interactive) | 354 | (interactive) |
| 355 | (if (featurep 'xemacs) | 355 | (if (featurep 'xemacs) |
| 356 | (progn | 356 | (progn |
| 357 | (setq edt-key-seq (read-key-sequence (format "Press %s%s: " ident descrip))) | 357 | (setq edt-key-seq (read-key-sequence (format "Press %s%s: " ident descrip))) |
| 358 | (setq edt-key (concat "[" (format "%s" (event-key (aref edt-key-seq 0))) "]")) | 358 | (setq edt-key (concat "[" (format "%s" (event-key (aref edt-key-seq 0))) "]")) |
| 359 | (cond ((not (equal edt-key edt-return)) | 359 | (cond ((not (equal edt-key edt-return)) |
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 9fef6155705..f110597fe5c 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el | |||
| @@ -2110,7 +2110,7 @@ FILE is the specific file we are rendering." | |||
| 2110 | ;; functionality easier to implement. | 2110 | ;; functionality easier to implement. |
| 2111 | ;; ( tar file functionality not merged here because it requires a | 2111 | ;; ( tar file functionality not merged here because it requires a |
| 2112 | ;; hacked copy of etags capable of tagging stdin: if Francesco | 2112 | ;; hacked copy of etags capable of tagging stdin: if Francesco |
| 2113 | ;; Potorti accepts a patch, or otherwise implements stdin tagging, | 2113 | ;; Potortì accepts a patch, or otherwise implements stdin tagging, |
| 2114 | ;; then I will provide a `htmlfontify-tar-file' defun ) | 2114 | ;; then I will provide a `htmlfontify-tar-file' defun ) |
| 2115 | (defun hfy-parse-tags-buffer (srcdir buffer) | 2115 | (defun hfy-parse-tags-buffer (srcdir buffer) |
| 2116 | "Parse a BUFFER containing etags formatted output, loading the | 2116 | "Parse a BUFFER containing etags formatted output, loading the |
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index 7ae4426ccc5..41ee466aaeb 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el | |||
| @@ -1110,7 +1110,7 @@ | |||
| 1110 | :map "MIK") | 1110 | :map "MIK") |
| 1111 | 1111 | ||
| 1112 | (define-charset 'ptcp154 | 1112 | (define-charset 'ptcp154 |
| 1113 | "`Paratype' codepage (Asian Cyrillic)" | 1113 | "ParaType codepage (Asian Cyrillic)" |
| 1114 | :short-name "PT154" | 1114 | :short-name "PT154" |
| 1115 | :ascii-compatible-p t | 1115 | :ascii-compatible-p t |
| 1116 | :code-space [0 255] | 1116 | :code-space [0 255] |
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el index 8610c34993a..3e64d7e9ebb 100644 --- a/lisp/language/cyrillic.el +++ b/lisp/language/cyrillic.el | |||
| @@ -215,7 +215,7 @@ Support for Russian using koi8-r and the russian-computer input method.") | |||
| 215 | :charset-list '(mik)) | 215 | :charset-list '(mik)) |
| 216 | 216 | ||
| 217 | (define-coding-system 'pt154 | 217 | (define-coding-system 'pt154 |
| 218 | "Parattype Asian Cyrillic codepage" | 218 | "ParaType Asian Cyrillic codepage" |
| 219 | :coding-type 'charset | 219 | :coding-type 'charset |
| 220 | :mnemonic ?D | 220 | :mnemonic ?D |
| 221 | :charset-list '(pt154)) | 221 | :charset-list '(pt154)) |
diff --git a/lisp/leim/quail/ipa-praat.el b/lisp/leim/quail/ipa-praat.el index c5156ad892b..53229724ae3 100644 --- a/lisp/leim/quail/ipa-praat.el +++ b/lisp/leim/quail/ipa-praat.el | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | ;;; Commentary: | 23 | ;;; Commentary: |
| 24 | 24 | ||
| 25 | ;; This is a new input method for IPA characters and diacritics, which follows | 25 | ;; This is a new input method for IPA characters and diacritics, which follows |
| 26 | ;; the conventions of Praat, a GPLed program for phonetical analysis. | 26 | ;; the conventions of Praat, a GPLed program for phonetic analysis. |
| 27 | ;; | 27 | ;; |
| 28 | ;; This input method is much more complete than the current ipa.el. | 28 | ;; This input method is much more complete than the current ipa.el. |
| 29 | 29 | ||
| @@ -34,7 +34,7 @@ | |||
| 34 | (quail-define-package | 34 | (quail-define-package |
| 35 | "ipa-praat" "IPA" "IPAP" t | 35 | "ipa-praat" "IPA" "IPAP" t |
| 36 | "International Phonetic Alphabet input method. | 36 | "International Phonetic Alphabet input method. |
| 37 | This follows the input method of the phonetical analysis program | 37 | This follows the input method of the phonetic analysis program |
| 38 | Praat (http://www.fon.hum.uva.nl/praat/). | 38 | Praat (http://www.fon.hum.uva.nl/praat/). |
| 39 | 39 | ||
| 40 | 40 | ||
diff --git a/lisp/leim/quail/ipa.el b/lisp/leim/quail/ipa.el index fd283be7670..322f34ad33e 100644 --- a/lisp/leim/quail/ipa.el +++ b/lisp/leim/quail/ipa.el | |||
| @@ -440,7 +440,7 @@ displays them, incorrectly, as separate from the modified glyphs.") | |||
| 440 | (">\\" "ʡ") ;; Epiglottal plosive U+02A1 | 440 | (">\\" "ʡ") ;; Epiglottal plosive U+02A1 |
| 441 | ("^" "↑") ;; Upstep U+2191 | 441 | ("^" "↑") ;; Upstep U+2191 |
| 442 | ("!" "↓") ;; Downstep U+2193 | 442 | ("!" "↓") ;; Downstep U+2193 |
| 443 | ("!\\" "ǃ") ;; Postalveolal click U+01C3 | 443 | ("!\\" "ǃ") ;; Postalveolar click U+01C3 |
| 444 | ("\\" "ǀ") ;; Dental click U+01C0 | 444 | ("\\" "ǀ") ;; Dental click U+01C0 |
| 445 | ("\\|\\" "ǁ") ;; Lateral alveolar click U+01C1 | 445 | ("\\|\\" "ǁ") ;; Lateral alveolar click U+01C1 |
| 446 | ("=\\" "ǂ") ;; Palatal click U+01C2 | 446 | ("=\\" "ǂ") ;; Palatal click U+01C2 |
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el index 39571633922..3670f365137 100644 --- a/lisp/org/org-entities.el +++ b/lisp/org/org-entities.el | |||
| @@ -330,7 +330,7 @@ packages to be loaded, add these packages to `org-latex-packages-alist'." | |||
| 330 | ("infin" "\\propto" t "∞" "[infinity]" "[infinity]" "∞") | 330 | ("infin" "\\propto" t "∞" "[infinity]" "[infinity]" "∞") |
| 331 | ("infty" "\\infty" t "∞" "[infinity]" "[infinity]" "∞") | 331 | ("infty" "\\infty" t "∞" "[infinity]" "[infinity]" "∞") |
| 332 | ("prop" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝") | 332 | ("prop" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝") |
| 333 | ("proptp" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝") | 333 | ("propto" "\\propto" t "∝" "[proportional to]" "[proportional to]" "∝") |
| 334 | ("not" "\\textlnot{}" nil "¬" "[angled dash]" "¬" "¬") | 334 | ("not" "\\textlnot{}" nil "¬" "[angled dash]" "¬" "¬") |
| 335 | ("neg" "\\neg{}" t "¬" "[angled dash]" "¬" "¬") | 335 | ("neg" "\\neg{}" t "¬" "[angled dash]" "¬" "¬") |
| 336 | ("land" "\\land" t "∧" "[logical and]" "[logical and]" "∧") | 336 | ("land" "\\land" t "∧" "[logical and]" "[logical and]" "∧") |
diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el index 62dd56e3ba6..5bb3ca94afc 100644 --- a/lisp/play/gametree.el +++ b/lisp/play/gametree.el | |||
| @@ -399,23 +399,23 @@ depth AT-DEPTH or smaller is found." | |||
| 399 | (error | 399 | (error |
| 400 | (goto-char (point-max)) | 400 | (goto-char (point-max)) |
| 401 | (if (not (bolp)) (insert "\n")))) | 401 | (if (not (bolp)) (insert "\n")))) |
| 402 | (let ((starting-plys | 402 | (let ((starting-plies |
| 403 | (if (> (gametree-current-branch-depth) parent-depth) | 403 | (if (> (gametree-current-branch-depth) parent-depth) |
| 404 | (gametree-current-branch-ply) | 404 | (gametree-current-branch-ply) |
| 405 | (save-excursion (forward-line -1) | 405 | (save-excursion (forward-line -1) |
| 406 | (gametree-current-branch-ply))))) | 406 | (gametree-current-branch-ply))))) |
| 407 | (goto-char (1- (point))) | 407 | (goto-char (1- (point))) |
| 408 | (insert "\n") | 408 | (insert "\n") |
| 409 | (insert (format (if (= 0 (mod starting-plys 2)) | 409 | (insert (format (if (= 0 (mod starting-plies 2)) |
| 410 | gametree-full-ply-format | 410 | gametree-full-ply-format |
| 411 | gametree-half-ply-format) | 411 | gametree-half-ply-format) |
| 412 | (/ starting-plys 2)))))) | 412 | (/ starting-plies 2)))))) |
| 413 | 413 | ||
| 414 | (defun gametree-break-line-here (&optional at-move) | 414 | (defun gametree-break-line-here (&optional at-move) |
| 415 | "Split the variation node at the point position. | 415 | "Split the variation node at the point position. |
| 416 | This command works whether the current variation node is a leaf, or is | 416 | This command works whether the current variation node is a leaf, or is |
| 417 | already branching at its end. The new node is created at a level that | 417 | already branching at its end. The new node is created at a level that |
| 418 | reflects the number of game plys between the beginning of the current | 418 | reflects the number of game plies between the beginning of the current |
| 419 | variation and the breaking point. | 419 | variation and the breaking point. |
| 420 | 420 | ||
| 421 | With a numerical argument AT-MOVE, split the variation before | 421 | With a numerical argument AT-MOVE, split the variation before |
| @@ -436,7 +436,7 @@ only work of Black's moves are explicitly numbered, for instance | |||
| 436 | (goto-char (match-beginning 0)))) | 436 | (goto-char (match-beginning 0)))) |
| 437 | (gametree-transpose-following-leaves) | 437 | (gametree-transpose-following-leaves) |
| 438 | (let* ((pt (point-marker)) | 438 | (let* ((pt (point-marker)) |
| 439 | (plys (gametree-current-branch-ply)) | 439 | (plies (gametree-current-branch-ply)) |
| 440 | (depth (gametree-current-branch-depth)) | 440 | (depth (gametree-current-branch-depth)) |
| 441 | (old-depth depth)) | 441 | (old-depth depth)) |
| 442 | (if (= depth 0) | 442 | (if (= depth 0) |
| @@ -451,7 +451,7 @@ only work of Black's moves are explicitly numbered, for instance | |||
| 451 | (if (zerop old-branch-ply) | 451 | (if (zerop old-branch-ply) |
| 452 | (1+ (gametree-current-branch-depth)) | 452 | (1+ (gametree-current-branch-depth)) |
| 453 | (+ (gametree-current-branch-depth) | 453 | (+ (gametree-current-branch-depth) |
| 454 | (- plys old-branch-ply)))))) | 454 | (- plies old-branch-ply)))))) |
| 455 | (save-excursion | 455 | (save-excursion |
| 456 | (beginning-of-line 1) | 456 | (beginning-of-line 1) |
| 457 | (funcall gametree-make-heading-function depth) | 457 | (funcall gametree-make-heading-function depth) |
| @@ -471,7 +471,7 @@ only work of Black's moves are explicitly numbered, for instance | |||
| 471 | (insert "\n") | 471 | (insert "\n") |
| 472 | (if (not (= 0 old-depth)) | 472 | (if (not (= 0 old-depth)) |
| 473 | (funcall gametree-make-heading-function | 473 | (funcall gametree-make-heading-function |
| 474 | (+ depth (- (gametree-current-branch-ply) plys)))) | 474 | (+ depth (- (gametree-current-branch-ply) plies)))) |
| 475 | (gametree-prettify-heading)))) | 475 | (gametree-prettify-heading)))) |
| 476 | 476 | ||
| 477 | (defun gametree-merge-line () | 477 | (defun gametree-merge-line () |
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el index b682e0c5291..51e0a0f4e4d 100644 --- a/lisp/play/handwrite.el +++ b/lisp/play/handwrite.el | |||
| @@ -244,7 +244,7 @@ Variables: `handwrite-linespace' (default 12) | |||
| 244 | (insert "showpage exec Hwsave restore\n\n") | 244 | (insert "showpage exec Hwsave restore\n\n") |
| 245 | (insert "%%Pages " (number-to-string ipage) " 0\n") | 245 | (insert "%%Pages " (number-to-string ipage) " 0\n") |
| 246 | (insert "%%EOF\n") | 246 | (insert "%%EOF\n") |
| 247 | ;;To avoid cumbersome code we simply ignore pagefeeds | 247 | ;;To avoid cumbersome code we simply ignore formfeeds |
| 248 | (goto-char textp) | 248 | (goto-char textp) |
| 249 | (while (search-forward "\f" nil t) | 249 | (while (search-forward "\f" nil t) |
| 250 | (replace-match "" nil t) ) | 250 | (replace-match "" nil t) ) |
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 16d5da5f12c..efa8be1c80c 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el | |||
| @@ -3697,7 +3697,7 @@ comment at the start of cc-engine.el for more info." | |||
| 3697 | (while (let ((pos (or (and (looking-at c-nonsymbol-token-regexp) | 3697 | (while (let ((pos (or (and (looking-at c-nonsymbol-token-regexp) |
| 3698 | (match-end 0)) | 3698 | (match-end 0)) |
| 3699 | ;; `c-nonsymbol-token-regexp' should always match | 3699 | ;; `c-nonsymbol-token-regexp' should always match |
| 3700 | ;; since we've skipped backward over punctuator | 3700 | ;; since we've skipped backward over punctuation |
| 3701 | ;; or paren syntax, but consume one char in case | 3701 | ;; or paren syntax, but consume one char in case |
| 3702 | ;; it doesn't so that we don't leave point before | 3702 | ;; it doesn't so that we don't leave point before |
| 3703 | ;; some earlier incorrect token. | 3703 | ;; some earlier incorrect token. |
| @@ -3721,7 +3721,7 @@ comment at the start of cc-engine.el for more info." | |||
| 3721 | (if (looking-at c-nonsymbol-token-regexp) | 3721 | (if (looking-at c-nonsymbol-token-regexp) |
| 3722 | (goto-char (match-end 0)) | 3722 | (goto-char (match-end 0)) |
| 3723 | ;; `c-nonsymbol-token-regexp' should always match since | 3723 | ;; `c-nonsymbol-token-regexp' should always match since |
| 3724 | ;; we've skipped backward over punctuator or paren | 3724 | ;; we've skipped backward over punctuation or paren |
| 3725 | ;; syntax, but move forward in case it doesn't so that | 3725 | ;; syntax, but move forward in case it doesn't so that |
| 3726 | ;; we don't leave point earlier than we started with. | 3726 | ;; we don't leave point earlier than we started with. |
| 3727 | (forward-char)) | 3727 | (forward-char)) |
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 3dda0c9e3a9..c4f2b9ffe51 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -3124,7 +3124,7 @@ and closing parentheses and brackets." | |||
| 3124 | (+ (if (or (memq (elt i 2) (append "}])" nil)) ; char-after | 3124 | (+ (if (or (memq (elt i 2) (append "}])" nil)) ; char-after |
| 3125 | (eq 'continuation ; do not stagger continuations | 3125 | (eq 'continuation ; do not stagger continuations |
| 3126 | (elt (cperl-sniff-for-indent parse-data) 0))) | 3126 | (elt (cperl-sniff-for-indent parse-data) 0))) |
| 3127 | 0 ; Closing parenth or continuation of a continuation | 3127 | 0 ; Closing parenthesis or continuation of a continuation |
| 3128 | cperl-continued-statement-offset) | 3128 | cperl-continued-statement-offset) |
| 3129 | (if (or (elt i 3) ; is-block | 3129 | (if (or (elt i 3) ; is-block |
| 3130 | (not (elt i 4)) ; is-brace | 3130 | (not (elt i 4)) ; is-brace |
| @@ -5145,7 +5145,7 @@ Returns some position at the last line." | |||
| 5145 | (if (eq (following-char) ?\( ) | 5145 | (if (eq (following-char) ?\( ) |
| 5146 | (progn | 5146 | (progn |
| 5147 | (forward-sexp 1) | 5147 | (forward-sexp 1) |
| 5148 | (setq pp (point))) ; past parenth-group | 5148 | (setq pp (point))) ; past parenthesis-group |
| 5149 | ;; after `else' or nothing | 5149 | ;; after `else' or nothing |
| 5150 | (if ml ; after `else' | 5150 | (if ml ; after `else' |
| 5151 | (skip-chars-backward " \t\n") | 5151 | (skip-chars-backward " \t\n") |
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index f1a8be24013..6c8160e0aea 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el | |||
| @@ -1368,7 +1368,7 @@ and source-file directory for your debugger." | |||
| 1368 | ) | 1368 | ) |
| 1369 | 1369 | ||
| 1370 | ;; ====================================================================== | 1370 | ;; ====================================================================== |
| 1371 | ;; xdb (HP PARISC debugger) functions | 1371 | ;; xdb (HP PA-RISC debugger) functions |
| 1372 | 1372 | ||
| 1373 | ;; History of argument lists passed to xdb. | 1373 | ;; History of argument lists passed to xdb. |
| 1374 | (defvar gud-xdb-history nil) | 1374 | (defvar gud-xdb-history nil) |
diff --git a/lisp/ps-print.el b/lisp/ps-print.el index c58a4264478..6251a6caa87 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el | |||
| @@ -6121,7 +6121,7 @@ to the equivalent Latin-1 characters.") | |||
| 6121 | (goto-char from) | 6121 | (goto-char from) |
| 6122 | 6122 | ||
| 6123 | ;; ...break the region up into chunks separated by tabs, linefeeds, | 6123 | ;; ...break the region up into chunks separated by tabs, linefeeds, |
| 6124 | ;; pagefeeds, control characters, and plot each chunk. | 6124 | ;; formfeeds, control characters, and plot each chunk. |
| 6125 | (while (< from to) | 6125 | (while (< from to) |
| 6126 | ;; skip lines between cut markers | 6126 | ;; skip lines between cut markers |
| 6127 | (and ps-begin-cut-regexp ps-end-cut-regexp | 6127 | (and ps-begin-cut-regexp ps-end-cut-regexp |
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c index 0674a3fdc84..f3433f63684 100644 --- a/nt/cmdproxy.c +++ b/nt/cmdproxy.c | |||
| @@ -319,7 +319,7 @@ try_dequote_cmdline (char* cmdline) | |||
| 319 | /* Dequoting can only subtract characters, so the length of the | 319 | /* Dequoting can only subtract characters, so the length of the |
| 320 | original command line is a bound on the amount of scratch space | 320 | original command line is a bound on the amount of scratch space |
| 321 | we need. This length, in turn, is bounded by the 32k | 321 | we need. This length, in turn, is bounded by the 32k |
| 322 | CreateProces limit. */ | 322 | CreateProcess limit. */ |
| 323 | char * old_pos = cmdline; | 323 | char * old_pos = cmdline; |
| 324 | char * new_cmdline = alloca (strlen(cmdline)); | 324 | char * new_cmdline = alloca (strlen(cmdline)); |
| 325 | char * new_pos = new_cmdline; | 325 | char * new_pos = new_cmdline; |
| @@ -843,4 +843,3 @@ main (int argc, char ** argv) | |||
| 843 | 843 | ||
| 844 | return 0; | 844 | return 0; |
| 845 | } | 845 | } |
| 846 | |||
diff --git a/src/syswait.h b/src/syswait.h index 815678bbfd0..db197b82fb7 100644 --- a/src/syswait.h +++ b/src/syswait.h | |||
| @@ -25,7 +25,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 25 | 25 | ||
| 26 | #include <sys/types.h> | 26 | #include <sys/types.h> |
| 27 | 27 | ||
| 28 | #ifdef HAVE_SYS_WAIT_H /* We have sys/wait.h with POSIXoid definitions. */ | 28 | #ifdef HAVE_SYS_WAIT_H /* We have sys/wait.h with POSIXish definitions. */ |
| 29 | #include <sys/wait.h> | 29 | #include <sys/wait.h> |
| 30 | #endif /* !HAVE_SYS_WAIT_H */ | 30 | #endif /* !HAVE_SYS_WAIT_H */ |
| 31 | 31 | ||