aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/allout.el
diff options
context:
space:
mode:
authorVibhav Pant2017-02-13 17:07:36 +0530
committerVibhav Pant2017-02-13 17:07:36 +0530
commitcb410433e069b5bb450193353c3fea8593a643a9 (patch)
treed2f4269781b4841e5a0c27ec57a5a4fbcec386c0 /lisp/allout.el
parente742450427007cdde242c11380dfe32a950fab61 (diff)
parent4b18ef7ba3dd8aae4f3c3bf931365ef7da883baf (diff)
downloademacs-feature/byte-switch.tar.gz
emacs-feature/byte-switch.zip
Merge branch 'master' into feature/byte-switchfeature/byte-switch
Diffstat (limited to 'lisp/allout.el')
-rw-r--r--lisp/allout.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/allout.el b/lisp/allout.el
index 4a0aeeedf6a..e837f83ed38 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -4462,7 +4462,7 @@ Topic exposure is marked with text-properties, to be used by
4462 (if (and (/= (current-column) 0) (not (eobp))) 4462 (if (and (/= (current-column) 0) (not (eobp)))
4463 (forward-char 1)) 4463 (forward-char 1))
4464 (if (not (eobp)) 4464 (if (not (eobp))
4465 (if (and (save-match-data (looking-at "\n")) 4465 (if (and (= (following-char) ?\n)
4466 (or (save-excursion 4466 (or (save-excursion
4467 (or (not (allout-next-heading)) 4467 (or (not (allout-next-heading))
4468 (= depth allout-recent-depth))) 4468 (= depth allout-recent-depth)))
@@ -6278,8 +6278,7 @@ It must also have content."
6278 (setq got nil 6278 (setq got nil
6279 done t) 6279 done t)
6280 (goto-char (setq got (match-beginning 0))) 6280 (goto-char (setq got (match-beginning 0)))
6281 (if (save-match-data (looking-at "\n")) 6281 (when (= (following-char) ?\n) (forward-char 1))
6282 (forward-char 1))
6283 (setq got (point))) 6282 (setq got (point)))
6284 6283
6285 (cond ((not got) 6284 (cond ((not got)