mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-30 19:53:09 +00:00
Code Issues Releases Activity

(sentence-end-without-space): Fix safety predicate.

Browse Source 
(sentence-end-double-space, sentence-end-without-period)
(paragraph-ignore-fill-prefix): Tighten the safety predicate.
This commit is contained in:
Stefan Monnier 2006-04-29 13:59:04 +00:00
parent 119d72b62c
commit 85e17b4fff
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lisp/textmodes/paragraphs.el
View File

@ -81,7 +81,7 @@ to paragraphs. The fill functions insert and delete only soft newlines."
(set-hard-newline-properties (point) (1+ (point))))))))))) (set-hard-newline-properties (point) (1+ (point)))))))))))
(defcustom paragraph-start "\f\\|[ \t]*$" "\ (defcustom paragraph-start "\f\\|[ \t]*$" "\
*Regexp for beginning of a line that starts OR separates paragraphs. Regexp for beginning of a line that starts OR separates paragraphs.
This regexp should match lines that separate paragraphs This regexp should match lines that separate paragraphs
and should also match lines that start a paragraph and should also match lines that start a paragraph
\(and are part of that paragraph). \(and are part of that paragraph).
@ -107,7 +107,7 @@ hard newline are considered to match."
;; start a new paragraph). ;; start a new paragraph).
(defcustom paragraph-separate "[ \t\f]*$" (defcustom paragraph-separate "[ \t\f]*$"
"*Regexp for beginning of a line that separates paragraphs. "Regexp for beginning of a line that separates paragraphs.
If you change this, you may have to change `paragraph-start' also. If you change this, you may have to change `paragraph-start' also.
This is matched against the text at the left margin, which is not necessarily This is matched against the text at the left margin, which is not necessarily
@ -119,7 +119,7 @@ text indented by a margin setting."
;;;###autoload(put 'paragraph-separate 'safe-local-variable 'stringp) ;;;###autoload(put 'paragraph-separate 'safe-local-variable 'stringp)
(defcustom sentence-end-double-space t (defcustom sentence-end-double-space t
"*Non-nil means a single space does not end a sentence. "Non-nil means a single space does not end a sentence.
This is relevant for filling. See also `sentence-end-without-period' This is relevant for filling. See also `sentence-end-without-period'
and `colon-double-space'. and `colon-double-space'.
@ -128,10 +128,10 @@ regexp describing the end of a sentence, when the value of the variable
`sentence-end' is nil. See Info node `(elisp)Standard Regexps'." `sentence-end' is nil. See Info node `(elisp)Standard Regexps'."
:type 'boolean :type 'boolean
:group 'fill) :group 'fill)
;;;###autoload(put 'sentence-end-double-space 'safe-local-variable 'symbolp) ;;;###autoload(put 'sentence-end-double-space 'safe-local-variable 'booleanp)
(defcustom sentence-end-without-period nil (defcustom sentence-end-without-period nil
"*Non-nil means a sentence will end without a period. "Non-nil means a sentence will end without a period.
For example, a sentence in Thai text ends with double space but For example, a sentence in Thai text ends with double space but
without a period. without a period.
@ -140,21 +140,21 @@ regexp describing the end of a sentence, when the value of the variable
`sentence-end' is nil. See Info node `(elisp)Standard Regexps'." `sentence-end' is nil. See Info node `(elisp)Standard Regexps'."
:type 'boolean :type 'boolean
:group 'fill) :group 'fill)
;;;###autoload(put 'sentence-end-without-period 'safe-local-variable 'symbolp) ;;;###autoload(put 'sentence-end-without-period 'safe-local-variable 'booleanp)
(defcustom sentence-end-without-space (defcustom sentence-end-without-space
"$B!#!%!)!*$A!##.#?#!$(0!$!%!)!*$(G!$!%!)!*(B" "$B!#!%!)!*$A!##.#?#!$(0!$!%!)!*$(G!$!%!)!*(B"
"*String of characters that end sentence without following spaces. "String of characters that end sentence without following spaces.
This value is used by the function `sentence-end' to construct the This value is used by the function `sentence-end' to construct the
regexp describing the end of a sentence, when the value of the variable regexp describing the end of a sentence, when the value of the variable
`sentence-end' is nil. See Info node `(elisp)Standard Regexps'." `sentence-end' is nil. See Info node `(elisp)Standard Regexps'."
:group 'paragraphs :group 'paragraphs
:type 'string) :type 'string)
;;;###autoload(put 'sentence-end-without-space 'safe-local-variable 'symbolp) ;;;###autoload(put 'sentence-end-without-space 'safe-local-variable 'stringp)
(defcustom sentence-end nil (defcustom sentence-end nil
"*Regexp describing the end of a sentence. "Regexp describing the end of a sentence.
The value includes the whitespace following the sentence. The value includes the whitespace following the sentence.
All paragraph boundaries also end sentences, regardless. All paragraph boundaries also end sentences, regardless.
@ -166,7 +166,7 @@ to obtain the value of this variable."
;;;###autoload(put 'sentence-end 'safe-local-variable 'string-or-null-p) ;;;###autoload(put 'sentence-end 'safe-local-variable 'string-or-null-p)
(defcustom sentence-end-base "[.?!][]\"'$B!I$,1r}(B)}]*" (defcustom sentence-end-base "[.?!][]\"'$B!I$,1r}(B)}]*"
"*Regexp matching the basic end of a sentence, not including following space." "Regexp matching the basic end of a sentence, not including following space."
:group 'paragraphs :group 'paragraphs
:type 'string :type 'string
:version "22.1") :version "22.1")
@ -195,17 +195,17 @@ in between. See Info node `(elisp)Standard Regexps'."
"[ \t\n]*"))) "[ \t\n]*")))
(defcustom page-delimiter "^\014" (defcustom page-delimiter "^\014"
"*Regexp describing line-beginnings that separate pages." "Regexp describing line-beginnings that separate pages."
:group 'paragraphs :group 'paragraphs
:type 'regexp) :type 'regexp)
;;;###autoload(put 'page-delimiter 'safe-local-variable 'stringp) ;;;###autoload(put 'page-delimiter 'safe-local-variable 'stringp)
(defcustom paragraph-ignore-fill-prefix nil (defcustom paragraph-ignore-fill-prefix nil
"*Non-nil means the paragraph commands are not affected by `fill-prefix'. "Non-nil means the paragraph commands are not affected by `fill-prefix'.
This is desirable in modes where blank lines are the paragraph delimiters." This is desirable in modes where blank lines are the paragraph delimiters."
:group 'paragraphs :group 'paragraphs
:type 'boolean) :type 'boolean)
;;;###autoload(put 'paragraph-ignore-fill-prefix 'safe-local-variable 'symbolp) ;;;###autoload(put 'paragraph-ignore-fill-prefix 'safe-local-variable 'booleanp)
(defun forward-paragraph (&optional arg) (defun forward-paragraph (&optional arg)
"Move forward to end of paragraph. "Move forward to end of paragraph.