diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog.6 | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 3a6d60dfbcd..0d0df58f58e 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 | |||
| @@ -3506,7 +3506,7 @@ | |||
| 3506 | (sgml-beginning-of-tag, sgml-value): New functions. | 3506 | (sgml-beginning-of-tag, sgml-value): New functions. |
| 3507 | 3507 | ||
| 3508 | (html-*): All these functions and variables are new. | 3508 | (html-*): All these functions and variables are new. |
| 3509 | Mostly they parametrize everything preceding. | 3509 | Mostly they parameterize everything preceding. |
| 3510 | 3510 | ||
| 3511 | * autoinsert.el (auto-insert-alist): For html-mode, use `sgml-tag'. | 3511 | * autoinsert.el (auto-insert-alist): For html-mode, use `sgml-tag'. |
| 3512 | 3512 | ||
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 62e6dd2084b..c90509d131b 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el | |||
| @@ -1399,7 +1399,7 @@ | |||
| 1399 | (setq offset (- offset #x80))) | 1399 | (setq offset (- offset #x80))) |
| 1400 | ((eq bytedecomp-op 'byte-switch) | 1400 | ((eq bytedecomp-op 'byte-switch) |
| 1401 | (cl-assert (hash-table-p last-constant) nil | 1401 | (cl-assert (hash-table-p last-constant) nil |
| 1402 | "byte-switch used without preceeding hash table") | 1402 | "byte-switch used without preceding hash table") |
| 1403 | ;; We cannot use the original hash table referenced in the op, | 1403 | ;; We cannot use the original hash table referenced in the op, |
| 1404 | ;; so we create a copy of it, and replace the addresses with | 1404 | ;; so we create a copy of it, and replace the addresses with |
| 1405 | ;; TAGs. | 1405 | ;; TAGs. |
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index e039020d366..317968aafd3 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el | |||
| @@ -2576,7 +2576,7 @@ comment at the start of cc-engine.el for more info." | |||
| 2576 | ;; or the car of the list is the "position element" of ELT, the position | 2576 | ;; or the car of the list is the "position element" of ELT, the position |
| 2577 | ;; where ELT is valid. | 2577 | ;; where ELT is valid. |
| 2578 | ;; | 2578 | ;; |
| 2579 | ;; POINT is left at the postition for which the returned state is valid. It | 2579 | ;; POINT is left at the position for which the returned state is valid. It |
| 2580 | ;; will be either the position element of ELT, or one character before | 2580 | ;; will be either the position element of ELT, or one character before |
| 2581 | ;; that. (The latter happens in Emacs <= 25 and XEmacs, when ELT indicates | 2581 | ;; that. (The latter happens in Emacs <= 25 and XEmacs, when ELT indicates |
| 2582 | ;; its position element directly follows a potential first character of a | 2582 | ;; its position element directly follows a potential first character of a |
| @@ -2647,7 +2647,7 @@ comment at the start of cc-engine.el for more info." | |||
| 2647 | ((nth 3 state) ; A string | 2647 | ((nth 3 state) ; A string |
| 2648 | (list (point) (nth 3 state) (nth 8 state))) | 2648 | (list (point) (nth 3 state) (nth 8 state))) |
| 2649 | ((and (nth 4 state) ; A comment | 2649 | ((and (nth 4 state) ; A comment |
| 2650 | (not (eq (nth 7 state) 'syntax-table))) ; but not a psuedo comment. | 2650 | (not (eq (nth 7 state) 'syntax-table))) ; but not a pseudo comment. |
| 2651 | (list (point) | 2651 | (list (point) |
| 2652 | (if (eq (nth 7 state) 1) 'c++ 'c) | 2652 | (if (eq (nth 7 state) 1) 'c++ 'c) |
| 2653 | (nth 8 state))) | 2653 | (nth 8 state))) |