summaryrefslogtreecommitdiff
path: root/lisp/help-mode.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-07-09 08:00:55 +0000
committerMiles Bader <miles@gnu.org>2007-07-09 08:00:55 +0000
commit1011c48763982d02797a7058556d29f639f6efca (patch)
tree5f1b7529b4cc483b73475b89245633c5848b8a5e /lisp/help-mode.el
parent6f06dac7b57b8d73f4b26a855cd9862630192029 (diff)
parent69e4c7c4bacf19e9e004605fcb1c067e478beffe (diff)
downloademacs-1011c48763982d02797a7058556d29f639f6efca.tar.gz
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 803-805) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227
Diffstat (limited to 'lisp/help-mode.el')
-rw-r--r--lisp/help-mode.el13
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index f7c33d85286..075b893ad6f 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -487,7 +487,7 @@ that."
;; Skip a single blank line.
(and (eolp) (forward-line))
(end-of-line)
- (skip-chars-backward "^\t\n")
+ (skip-chars-backward "^ \t\n")
(if (and (>= (current-column) col)
(looking-at "\\(\\sw\\|-\\)+$"))
(let ((sym (intern-soft (match-string 0))))
@@ -500,16 +500,19 @@ that."
(while (and (not (bobp)) (bolp))
(delete-char -1))
(insert "\n")
+ (when (or help-xref-stack help-xref-forward-stack)
+ (insert "\n"))
;; Make a back-reference in this buffer if appropriate.
(when help-xref-stack
- (insert "\n")
(help-insert-xref-button help-back-label 'help-back
- (current-buffer))
- (insert "\t"))
+ (current-buffer)))
;; Make a forward-reference in this buffer if appropriate.
(when help-xref-forward-stack
+ (when help-xref-stack
+ (insert "\t"))
(help-insert-xref-button help-forward-label 'help-forward
- (current-buffer))
+ (current-buffer)))
+ (when (or help-xref-stack help-xref-forward-stack)
(insert "\n")))
;; View mode steals RET from us.
(set (make-local-variable 'minor-mode-overriding-map-alist)