Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Rename end-list property to muse-end-list.
* lisp/muse-docbook.el (muse-docbook-markup-paragraph):

* lisp/muse-html.el (muse-html-markup-paragraph):

* lisp/muse-publish.el (muse-insert-markup-end-list):

* lisp/muse-xml.el (muse-xml-markup-paragraph):

* lisp/muse.el (muse-forward-paragraph, muse-forward-list-item): Use
  muse-end-list as the property name rather than end-list.
  • Loading branch information
mwolson committed Nov 23, 2008
1 parent b3bfd6e commit 7d3a987
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 12 deletions.
5 changes: 3 additions & 2 deletions lisp/muse-docbook.el
Expand Up @@ -232,8 +232,9 @@ found in `muse-docbook-encoding-map'."
((string= (match-string 2) "footnote")
(string= (match-string 1) "/"))
(t nil)))))
(when (get-text-property (1- (point)) 'end-list)
(goto-char (previous-single-property-change (1- (point)) 'end-list)))
(when (get-text-property (1- (point)) 'muse-end-list)
(goto-char (previous-single-property-change (1- (point))
'muse-end-list)))
(muse-insert-markup "</para>"))
(goto-char end))
(cond
Expand Down
5 changes: 3 additions & 2 deletions lisp/muse-html.el
Expand Up @@ -459,8 +459,9 @@ mode instead."
(save-match-data
(and (re-search-backward "<\\(/?\\)p[ >]" nil t)
(not (string-equal (match-string 1) "/")))))
(when (get-text-property (1- (point)) 'end-list)
(goto-char (previous-single-property-change (1- (point)) 'end-list)))
(when (get-text-property (1- (point)) 'muse-end-list)
(goto-char (previous-single-property-change (1- (point))
'muse-end-list)))
(muse-insert-markup "</p>"))
(goto-char end))
(cond
Expand Down
2 changes: 1 addition & 1 deletion lisp/muse-publish.el
Expand Up @@ -1218,7 +1218,7 @@ The following contexts exist in Muse.
(defun muse-insert-markup-end-list (&rest args)
(let ((beg (point)))
(apply 'insert args)
(add-text-properties beg (point) '(end-list t))
(add-text-properties beg (point) '(muse-end-list t))
(muse-publish-mark-read-only beg (point))))

(defun muse-publish-determine-dl-indent (continue indent-sym determine-sym)
Expand Down
5 changes: 3 additions & 2 deletions lisp/muse-xml.el
Expand Up @@ -228,8 +228,9 @@ found in `muse-xml-encoding-map'."
(save-match-data
(and (re-search-backward "<\\(/?\\)p[ >]" nil t)
(not (string-equal (match-string 1) "/")))))
(when (get-text-property (1- (point)) 'end-list)
(goto-char (previous-single-property-change (1- (point)) 'end-list)))
(when (get-text-property (1- (point)) 'muse-end-list)
(goto-char (previous-single-property-change (1- (point))
'muse-end-list)))
(muse-insert-markup "</p>"))
(goto-char end))
(cond
Expand Down
10 changes: 5 additions & 5 deletions lisp/muse.el
Expand Up @@ -771,12 +771,12 @@ the contents of `muse-list-item-regexp'."

(defun muse-forward-paragraph (&optional pattern)
"Move forward safely by one paragraph, or according to PATTERN."
(when (get-text-property (point) 'end-list)
(goto-char (next-single-property-change (point) 'end-list)))
(when (get-text-property (point) 'muse-end-list)
(goto-char (next-single-property-change (point) 'muse-end-list)))
(setq pattern (if pattern
(concat "^\\(?:" pattern "\\|\n\\|\\'\\)")
"^\\s-*\\(\n\\|\\'\\)"))
(let ((next-list-end (or (next-single-property-change (point) 'end-list)
(let ((next-list-end (or (next-single-property-change (point) 'muse-end-list)
(point-max))))
(forward-line 1)
(if (re-search-forward pattern nil t)
Expand Down Expand Up @@ -823,7 +823,7 @@ provide a very liberal INDENT value, such as
(while (progn
(muse-forward-paragraph list-pattern)
;; make sure we don't go past boundary
(and (not (or (get-text-property (point) 'end-list)
(and (not (or (get-text-property (point) 'muse-end-list)
(>= (point) (point-max))))
;; move past markup that is part of another construct
(or (and (match-beginning 1)
Expand All @@ -837,7 +837,7 @@ provide a very liberal INDENT value, such as
(and (not no-skip-nested)
(muse-forward-list-item-1 type empty-line
indented-line))))))
(cond ((or (get-text-property (point) 'end-list)
(cond ((or (get-text-property (point) 'muse-end-list)
(>= (point) (point-max)))
;; at a list boundary, so stop
nil)
Expand Down

0 comments on commit 7d3a987

Please sign in to comment.