HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs--rel--22
[bpt/emacs.git]
/
lisp
/
help-mode.el
diff --git
a/lisp/help-mode.el
b/lisp/help-mode.el
index
f7c33d8
..
075b893
100644
(file)
--- 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 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))))
(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")
(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
;; Make a back-reference in this buffer if appropriate.
(when help-xref-stack
- (insert "\n")
(help-insert-xref-button help-back-label 'help-back
(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
;; 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
(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)
(insert "\n")))
;; View mode steals RET from us.
(set (make-local-variable 'minor-mode-overriding-map-alist)