Mercurial > emacs
comparison lisp/simple.el @ 90399:a5812696f7bf unicode-pre-font-backend
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 274-284)
- Update from CVS
- Update etc/MORE.STUFF.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 101)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 17 May 2006 07:46:49 +0000 |
parents | 146cd8369025 2ed5d4bbedbf |
children | a8190f7e546e |
comparison
equal
deleted
inserted
replaced
90398:1f8d5cd37cf0 | 90399:a5812696f7bf |
---|---|
3644 | 3644 |
3645 ;; Process intangibility within a line. | 3645 ;; Process intangibility within a line. |
3646 ;; Move to the chosen destination position from above, | 3646 ;; Move to the chosen destination position from above, |
3647 ;; with intangibility processing enabled. | 3647 ;; with intangibility processing enabled. |
3648 | 3648 |
3649 (goto-char (point-min)) | 3649 ;; Avoid calling point-entered and point-left. |
3650 (goto-char new) | |
3650 (let ((inhibit-point-motion-hooks nil)) | 3651 (let ((inhibit-point-motion-hooks nil)) |
3651 (goto-char new) | 3652 (goto-char new) |
3652 | 3653 |
3653 ;; If intangibility moves us to a different (later) place | 3654 ;; If intangibility moves us to a different (later) place |
3654 ;; in the same line, use that as the destination. | 3655 ;; in the same line, use that as the destination. |
4056 "*String for filling to insert at front of new line, or nil for none." | 4057 "*String for filling to insert at front of new line, or nil for none." |
4057 :type '(choice (const :tag "None" nil) | 4058 :type '(choice (const :tag "None" nil) |
4058 string) | 4059 string) |
4059 :group 'fill) | 4060 :group 'fill) |
4060 (make-variable-buffer-local 'fill-prefix) | 4061 (make-variable-buffer-local 'fill-prefix) |
4062 ;;;###autoload(put 'fill-prefix 'safe-local-variable 'string-or-null-p) | |
4061 | 4063 |
4062 (defcustom auto-fill-inhibit-regexp nil | 4064 (defcustom auto-fill-inhibit-regexp nil |
4063 "*Regexp to match lines which should not be auto-filled." | 4065 "*Regexp to match lines which should not be auto-filled." |
4064 :type '(choice (const :tag "None" nil) | 4066 :type '(choice (const :tag "None" nil) |
4065 regexp) | 4067 regexp) |