diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-08-14 04:29:57 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-08-14 04:29:57 -0400 |
| commit | 6e555e763567c66ad8e50724a7dd5e286dbb1e65 (patch) | |
| tree | 86fb29daa274d8007063babec826719154bf087e /kotl/kfill.el | |
| parent | 98a5ecb3bf80f2b53523c769459d1a1a49491125 (diff) | |
| parent | 332ef336a7ad87e25c0563bfeaf0e6758d52c59c (diff) | |
Merge remote-tracking branch 'hyperbole/master' into externals/hyperbolescratch/hyperbole-lexbind
Diffstat (limited to 'kotl/kfill.el')
| -rw-r--r-- | kotl/kfill.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kotl/kfill.el b/kotl/kfill.el index 238d7f5..27a8b6c 100644 --- a/kotl/kfill.el +++ b/kotl/kfill.el @@ -4,7 +4,7 @@ ;; ;; Orig-Date: 23-Jan-94 ;; -;; Copyright (C) 1994-2017 Free Software Foundation, Inc. +;; Copyright (C) 1994-2019 Free Software Foundation, Inc. ;; See the "../HY-COPY" file for license information. ;; ;; This file is part of GNU Hyperbole. @@ -95,7 +95,7 @@ number of lines that could not be moved, otherwise 0." (forward-visible-line n) (if (< n 0) nil - (skip-chars-forward "[\n\r]")) + (skip-chars-forward "\n\r")) ; (- (abs n) (count-matches "\n" opoint (point))) 0)) @@ -106,6 +106,7 @@ number of lines that could not be moved, otherwise 0." ;; Need this or Emacs ignores fill-prefix when inside a ;; comment. (comment-multi-line t) + (fill-paragraph-handle-comment t) fill-prefix) (kfill:adapt nil) (do-auto-fill)) @@ -150,8 +151,8 @@ number of lines that could not be moved, otherwise 0." (if (not (derived-mode-p 'kotl-mode)) (apply orig-fun args) (setq prior-fill-prefix fill-prefix) - (if (equal prior-fill-prefix "") - (setq prior-fill-prefix nil)) + (when (equal prior-fill-prefix "") + (setq prior-fill-prefix nil)) (apply orig-fun args) (cond (fill-prefix (message "fill-prefix: \"%s\"; prior-fill-prefix: \"%s\"" |