aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/textmodes/fill.el12
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad9fa785ad..8c8408b8fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2001-01-31 Gerd Moellmann <[email protected]>
+ * textmodes/fill.el (set-fill-prefix): Cancel fill prefix if point
+ is in front of the left-margin, if any.
+
* simple.el (delete-key-deletes-forward-mode): Treat `kp-delete'
like `delete'.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index d9bf1e520d..1ddf46e236 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -74,11 +74,13 @@ See the documentation of `kinsoku' for more information.")
Filling expects lines to start with the fill prefix and
reinserts the fill prefix in each resulting line."
(interactive)
- (setq fill-prefix (buffer-substring
- (save-excursion (move-to-left-margin) (point))
- (point)))
- (if (equal fill-prefix "")
- (setq fill-prefix nil))
+ (let ((left-margin-pos (save-excursion (move-to-left-margin) (point))))
+ (if (> (point) left-margin-pos)
+ (progn
+ (setq fill-prefix (buffer-substring left-margin-pos (point)))
+ (if (equal fill-prefix "")
+ (setq fill-prefix nil)))
+ (setq fill-prefix nil)))
(if fill-prefix
(message "fill-prefix: \"%s\"" fill-prefix)
(message "fill-prefix cancelled")))