diff options
| -rw-r--r-- | doc/misc/forms.texi | 26 | ||||
| -rw-r--r-- | lisp/arc-mode.el | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 1 | ||||
| -rw-r--r-- | lisp/type-break.el | 2 |
4 files changed, 1 insertions, 31 deletions
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi index 1b94bf90f66..20b0904ad1a 100644 --- a/doc/misc/forms.texi +++ b/doc/misc/forms.texi | |||
| @@ -658,15 +658,6 @@ displayed record. You cannot delete or modify the fixed, explanatory | |||
| 658 | text that comes from string formatting elements, but you can modify the | 658 | text that comes from string formatting elements, but you can modify the |
| 659 | actual field contents. | 659 | actual field contents. |
| 660 | 660 | ||
| 661 | @ignore | ||
| 662 | @c This is for the Emacs 18 version only. | ||
| 663 | If the contents of the forms cannot be recognized properly, this is | ||
| 664 | signaled using a descriptive text. @xref{Error Messages}, for more info. | ||
| 665 | The cursor will indicate the last part of the forms which was | ||
| 666 | successfully parsed. It's important to avoid entering field contents | ||
| 667 | that would cause confusion with the field-separating fixed text. | ||
| 668 | @end ignore | ||
| 669 | |||
| 670 | If the variable @code{forms-modified-record-filter} is non-@code{nil}, | 661 | If the variable @code{forms-modified-record-filter} is non-@code{nil}, |
| 671 | it is called as a function before the new data is written to the data | 662 | it is called as a function before the new data is written to the data |
| 672 | file. The function receives one argument, a vector that contains the | 663 | file. The function receives one argument, a vector that contains the |
| @@ -795,23 +786,6 @@ The first element of a list which is an element of | |||
| 795 | A list element was supplied in @code{forms-format-list} which was not a | 786 | A list element was supplied in @code{forms-format-list} which was not a |
| 796 | string, number or list. | 787 | string, number or list. |
| 797 | 788 | ||
| 798 | @ignore | ||
| 799 | @c This applies to Emacs 18 only. | ||
| 800 | @c Error messages generated while a modified form is being analyzed. | ||
| 801 | |||
| 802 | @item Parse error: not looking at `...' | ||
| 803 | When re-parsing the contents of a forms, the text shown could not | ||
| 804 | be found. | ||
| 805 | |||
| 806 | @item Parse error: cannot find `...' | ||
| 807 | When re-parsing the contents of a forms, the text shown, which | ||
| 808 | separates two fields, could not be found. | ||
| 809 | |||
| 810 | @item Parse error: cannot parse adjacent fields @var{xx} and @var{yy} | ||
| 811 | Fields @var{xx} and @var{yy} were not separated by text, so could not be | ||
| 812 | parsed again. | ||
| 813 | @end ignore | ||
| 814 | |||
| 815 | @item Warning: this record has @var{xx} fields instead of @var{yy} | 789 | @item Warning: this record has @var{xx} fields instead of @var{yy} |
| 816 | The number of fields in this record in the data file did not match | 790 | The number of fields in this record in the data file did not match |
| 817 | @code{forms-number-of-fields}. Missing fields will be made empty. | 791 | @code{forms-number-of-fields}. Missing fields will be made empty. |
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index c998a8a1f1a..eb62a851183 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el | |||
| @@ -41,8 +41,7 @@ | |||
| 41 | ;; changes will first take effect when the archive buffer | 41 | ;; changes will first take effect when the archive buffer |
| 42 | ;; is saved. You will be warned about this. | 42 | ;; is saved. You will be warned about this. |
| 43 | ;; | 43 | ;; |
| 44 | ;; * dos-fns.el: (Part of Emacs 19). You get automatic ^M^J <--> ^J | 44 | ;; * dos-fns.el: You get automatic ^M^J <--> ^J conversion. |
| 45 | ;; conversion. | ||
| 46 | ;; | 45 | ;; |
| 47 | ;; arc-mode.el does not work well with crypt++.el; for the archives as | 46 | ;; arc-mode.el does not work well with crypt++.el; for the archives as |
| 48 | ;; such this could be fixed (but wouldn't be useful) by declaring such | 47 | ;; such this could be fixed (but wouldn't be useful) by declaring such |
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 7ff6d68c3ec..f10dc13fa07 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el | |||
| @@ -4461,7 +4461,6 @@ reinstrument it." | |||
| 4461 | (defun edebug-temp-display-freq-count () | 4461 | (defun edebug-temp-display-freq-count () |
| 4462 | "Temporarily display the frequency count data for the current definition. | 4462 | "Temporarily display the frequency count data for the current definition. |
| 4463 | It is removed when you hit any char." | 4463 | It is removed when you hit any char." |
| 4464 | ;; This seems not to work with Emacs 18.59. It undoes too far. | ||
| 4465 | (interactive) | 4464 | (interactive) |
| 4466 | (let ((inhibit-read-only t)) | 4465 | (let ((inhibit-read-only t)) |
| 4467 | (undo-boundary) | 4466 | (undo-boundary) |
diff --git a/lisp/type-break.el b/lisp/type-break.el index 5877292bab0..0d5377fb88b 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el | |||
| @@ -51,8 +51,6 @@ | |||
| 51 | ;; this, but I think the health of my hands is far more important than a | 51 | ;; this, but I think the health of my hands is far more important than a |
| 52 | ;; few pages of virtual memory. | 52 | ;; few pages of virtual memory. |
| 53 | 53 | ||
| 54 | ;; This program has no hope of working in Emacs 18. | ||
| 55 | |||
| 56 | ;; This package was inspired by Roland McGrath's hanoi-break.el. | 54 | ;; This package was inspired by Roland McGrath's hanoi-break.el. |
| 57 | ;; Several people contributed feedback and ideas, including | 55 | ;; Several people contributed feedback and ideas, including |
| 58 | ;; Roland McGrath <roland@gnu.org> | 56 | ;; Roland McGrath <roland@gnu.org> |